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 /docs/examples/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 'docs/examples/Makefile.am')
| -rw-r--r-- | docs/examples/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am index 735942e78..a71014d7c 100644 --- a/docs/examples/Makefile.am +++ b/docs/examples/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 @@ -40,12 +40,12 @@ INCLUDES = -I$(top_builddir)/include/curl \ LIBDIR = $(top_builddir)/lib -if STATICLIB -# we need this define when building with a static lib on Windows -STATICCPPFLAGS = -DCURL_STATICLIB -endif +AM_CPPFLAGS = -DCURL_NO_OLDIES -CPPFLAGS = -DCURL_NO_OLDIES $(STATICCPPFLAGS) +# Mostly for Windows build targets, when using static libcurl +if USE_CPPFLAG_CURL_STATICLIB +AM_CPPFLAGS += -DCURL_STATICLIB +endif # Dependencies LDADD = $(LIBDIR)/libcurl.la |