From 21423497efe36c70615d0a54e040f76043823345 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Mon, 9 Apr 2012 21:24:16 +0200 Subject: configure: Windows cross-compilation fixes BUILDING_LIBCURL and CURL_STATICLIB are no longer defined in curl_config.h, configure will generate appropriate conditionals so that mentioned symbols get defined and used in Makefiles at compilation time --- lib/Makefile.am | 14 +++++++++++++- lib/config-symbian.h | 15 ++++++++------- lib/config-tpf.h | 16 +++++----------- lib/config-vxworks.h | 16 +++++----------- 4 files changed, 31 insertions(+), 30 deletions(-) (limited to 'lib') diff --git a/lib/Makefile.am b/lib/Makefile.am index 52cbdd700..76fd66040 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -77,6 +77,18 @@ INCLUDES = -I$(top_builddir)/include/curl \ -I$(top_srcdir)/lib endif +AM_CPPFLAGS = + +# Mostly for Windows build targets, when building libcurl library +if USE_CPPFLAG_BUILDING_LIBCURL +AM_CPPFLAGS += -DBUILDING_LIBCURL +endif + +# Mostly for Windows build targets, when building static libcurl +if USE_CPPFLAG_CURL_STATICLIB +AM_CPPFLAGS += -DCURL_STATICLIB +endif + if SONAME_BUMP # # Bumping of SONAME conditionally may seem like a weird thing to do, and yeah diff --git a/lib/config-symbian.h b/lib/config-symbian.h index 24ed73327..b4dc03288 100644 --- a/lib/config-symbian.h +++ b/lib/config-symbian.h @@ -1,4 +1,5 @@ -/* config-symbian.h. Manually generated. */ +#ifndef HEADER_CURL_CONFIG_SYMBIAN_H +#define HEADER_CURL_CONFIG_SYMBIAN_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -6,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -21,8 +22,9 @@ * ***************************************************************************/ -/* when building libcurl itself */ -/* #undef BUILDING_LIBCURL */ +/* ================================================================ */ +/* Hand crafted config file for Symbian */ +/* ================================================================ */ /* Location of default ca bundle */ /* #define CURL_CA_BUNDLE "/etc/pki/tls/certs/ca-bundle.crt"*/ @@ -72,9 +74,6 @@ /* Use Windows LDAP implementation */ /* #undef CURL_LDAP_WIN */ -/* when not building a shared library */ -/* #undef CURL_STATICLIB */ - /* your Entropy Gathering Daemon socket pathname */ /* #undef EGD_SOCKET */ @@ -830,3 +829,5 @@ /* if OpenSSL is in use */ #define USE_OPENSSL #endif + +#endif /* HEADER_CURL_CONFIG_SYMBIAN_H */ diff --git a/lib/config-tpf.h b/lib/config-tpf.h index 673753100..0208ab835 100644 --- a/lib/config-tpf.h +++ b/lib/config-tpf.h @@ -1,5 +1,5 @@ -#ifndef __LIBCONFIGTPF_H -#define __LIBCONFIGTPF_H +#ifndef HEADER_CURL_CONFIG_TPF_H +#define HEADER_CURL_CONFIG_TPF_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -23,7 +23,7 @@ ***************************************************************************/ /* ================================================================ */ -/* lib/config-tpf.h - Hand crafted config file for TPF */ +/* Hand crafted config file for TPF */ /* ================================================================ */ /* ---------------------------------------------------------------- */ @@ -32,9 +32,6 @@ /* NOTE: Refer also to the .mak file for some of the flags below */ -/* when building libcurl itself */ -/* #undef BUILDING_LIBCURL */ - /* to disable cookies support */ /* #undef CURL_DISABLE_COOKIES */ @@ -65,9 +62,6 @@ /* to disable verbose strings */ /* #undef CURL_DISABLE_VERBOSE_STRINGS */ -/* when not building a shared library */ -/* #undef CURL_STATICLIB */ - /* lber dynamic library file */ /* #undef DL_LBER_FILE */ @@ -779,4 +773,4 @@ #endif -#endif /* __LIBCONFIGTPF_H */ +#endif /* HEADER_CURL_CONFIG_TPF_H */ diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h index 8e2d05a27..53266c021 100644 --- a/lib/config-vxworks.h +++ b/lib/config-vxworks.h @@ -1,5 +1,5 @@ -#ifndef __LIB_CONFIG_VXWORKS_H -#define __LIB_CONFIG_VXWORKS_H +#ifndef HEADER_CURL_CONFIG_VXWORKS_H +#define HEADER_CURL_CONFIG_VXWORKS_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -23,12 +23,9 @@ ***************************************************************************/ /* =============================================================== */ -/* lib/config-vxworks.h - Hand crafted config file for VxWorks */ +/* Hand crafted config file for VxWorks */ /* =============================================================== */ -/* when building libcurl itself */ -/* #undef BUILDING_LIBCURL */ - /* Location of default ca bundle */ /* #undef CURL_CA_BUNDLE */ @@ -83,9 +80,6 @@ /* Use Windows LDAP implementation */ /* #undef CURL_LDAP_WIN */ -/* when not building a shared library */ -/* #undef CURL_STATICLIB */ - /* your Entropy Gathering Daemon socket pathname */ /* #undef EGD_SOCKET */ @@ -952,4 +946,4 @@ /* the signed version of size_t */ /* #undef ssize_t */ -#endif /* __LIB_CONFIG_VXWORKS_H */ +#endif /* HEADER_CURL_CONFIG_VXWORKS_H */ -- cgit v1.2.3