diff options
author | Yang Tse <yangsita@gmail.com> | 2012-04-09 21:24:16 +0200 |
---|---|---|
committer | Yang Tse <yangsita@gmail.com> | 2012-04-09 21:24:16 +0200 |
commit | 21423497efe36c70615d0a54e040f76043823345 (patch) | |
tree | 28baa5aa512f4352ef7a0dfd34bd6fc7c6f8d7b3 /lib/Makefile.am | |
parent | 01b0f1061da2bd7a8703f4c8aa846a9088d7ab3e (diff) | |
download | curl-21423497efe36c70615d0a54e040f76043823345.tar.gz |
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
Diffstat (limited to 'lib/Makefile.am')
-rw-r--r-- | lib/Makefile.am | 14 |
1 files changed, 13 insertions, 1 deletions
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, <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 @@ -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 |