generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: NATIVE_WINDOWS no longer defined in config files

Browse Source
This commit is contained in:
Yang Tse 2012-04-12 13:08:48 +02:00
parent 9e24b9c7af
commit 38ae6ec1a2
6 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -57,10 +57,6 @@ set(OS "\"${CMAKE_SYSTEM_NAME}\"")
include_directories(${PROJECT_BINARY_DIR}/include/curl) include_directories(${PROJECT_BINARY_DIR}/include/curl)
include_directories( ${CURL_SOURCE_DIR}/include ) 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_EXE "Set to ON to build cURL executable." ON)
option(BUILD_CURL_TESTS "Set to ON to build cURL tests." 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) option(CURL_STATICLIB "Set to ON to build libcurl with static linking." OFF)

9
acinclude.m4
View File

@ -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 # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -228,12 +228,7 @@ AC_DEFUN([CURL_CHECK_NATIVE_WINDOWS], [
]) ])
fi fi
]) ])
case "$ac_cv_native_windows" in AM_CONDITIONAL(DOING_NATIVE_WINDOWS, test "x$ac_cv_native_windows" = xyes)
yes)
AC_DEFINE_UNQUOTED(NATIVE_WINDOWS, 1,
[Define to 1 if you are building a native Windows target.])
;;
esac
]) ])

3
lib/config-symbian.h
View File

@ -642,9 +642,6 @@
/* Define to 1 if you have the <x509.h> header file. */ /* Define to 1 if you have the <x509.h> header file. */
/* #undef HAVE_X509_H */ /* #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 */ /* Define to 1 if you need the lber.h header file even with ldap.h */
/* #undef NEED_LBER_H */ /* #undef NEED_LBER_H */

3
lib/config-vxworks.h
View File

@ -736,9 +736,6 @@
/* if you have the zlib.h header file */ /* if you have the zlib.h header file */
#define HAVE_ZLIB_H 1 #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 */ /* Define to 1 if you need the lber.h header file even with ldap.h */
/* #undef NEED_LBER_H */ /* #undef NEED_LBER_H */

3
lib/curl_config.h.cmake
View File

@ -721,9 +721,6 @@
*/ */
#cmakedefine LT_OBJDIR ${LT_OBJDIR} #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 */ /* If you lack a fine basename() prototype */
#cmakedefine NEED_BASENAME_PROTO ${NEED_BASENAME_PROTO} #cmakedefine NEED_BASENAME_PROTO ${NEED_BASENAME_PROTO}

6
tests/server/Makefile.am
View File

@ -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 # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # 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 -I$(top_srcdir)/lib
endif endif
if DOING_NATIVE_WINDOWS
AM_CPPFLAGS = -DCURL_STATICLIB
endif
# Makefile.inc provides neat definitions # Makefile.inc provides neat definitions
include Makefile.inc include Makefile.inc