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 --- docs/examples/Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'docs') 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, , 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 @@ -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 -- cgit v1.2.3