aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt4
-rw-r--r--acinclude.m49
-rw-r--r--lib/config-symbian.h3
-rw-r--r--lib/config-vxworks.h3
-rw-r--r--lib/curl_config.h.cmake3
-rw-r--r--tests/server/Makefile.am6
6 files changed, 7 insertions, 21 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b3ffe3ca..e571e5561 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,10 +57,6 @@ set(OS "\"${CMAKE_SYSTEM_NAME}\"")
include_directories(${PROJECT_BINARY_DIR}/include/curl)
include_directories( ${CURL_SOURCE_DIR}/include )
-if(WIN32)
- set(NATIVE_WINDOWS ON)
-endif()
-
option(BUILD_CURL_EXE "Set to ON to build cURL executable." ON)
option(BUILD_CURL_TESTS "Set to ON to build cURL tests." ON)
option(CURL_STATICLIB "Set to ON to build libcurl with static linking." OFF)
diff --git a/acinclude.m4 b/acinclude.m4
index 3a3122d58..930574542 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -228,12 +228,7 @@ AC_DEFUN([CURL_CHECK_NATIVE_WINDOWS], [
])
fi
])
- case "$ac_cv_native_windows" in
- yes)
- AC_DEFINE_UNQUOTED(NATIVE_WINDOWS, 1,
- [Define to 1 if you are building a native Windows target.])
- ;;
- esac
+ AM_CONDITIONAL(DOING_NATIVE_WINDOWS, test "x$ac_cv_native_windows" = xyes)
])
diff --git a/lib/config-symbian.h b/lib/config-symbian.h
index d70498fa9..e7cef5020 100644
--- a/lib/config-symbian.h
+++ b/lib/config-symbian.h
@@ -642,9 +642,6 @@
/* Define to 1 if you have the <x509.h> header file. */
/* #undef HAVE_X509_H */
-/* Define to 1 if you are building a native Windows target. */
-/* #undef NATIVE_WINDOWS */
-
/* Define to 1 if you need the lber.h header file even with ldap.h */
/* #undef NEED_LBER_H */
diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h
index 83cf72375..42a770700 100644
--- a/lib/config-vxworks.h
+++ b/lib/config-vxworks.h
@@ -736,9 +736,6 @@
/* if you have the zlib.h header file */
#define HAVE_ZLIB_H 1
-/* Define to 1 if you are building a native Windows target. */
-/* #undef NATIVE_WINDOWS */
-
/* Define to 1 if you need the lber.h header file even with ldap.h */
/* #undef NEED_LBER_H */
diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index 68251e4a7..303eea91b 100644
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -721,9 +721,6 @@
*/
#cmakedefine LT_OBJDIR ${LT_OBJDIR}
-/* Define to 1 if you are building a native Windows target. */
-#cmakedefine NATIVE_WINDOWS ${NATIVE_WINDOWS}
-
/* If you lack a fine basename() prototype */
#cmakedefine NEED_BASENAME_PROTO ${NEED_BASENAME_PROTO}
diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am
index 60a399ec0..9d58e085f 100644
--- a/tests/server/Makefile.am
+++ b/tests/server/Makefile.am
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -50,6 +50,10 @@ INCLUDES = -I$(top_builddir)/include/curl \
-I$(top_srcdir)/lib
endif
+if DOING_NATIVE_WINDOWS
+AM_CPPFLAGS = -DCURL_STATICLIB
+endif
+
# Makefile.inc provides neat definitions
include Makefile.inc