aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2007-11-17 10:22:44 +0000
committerDaniel Stenberg <daniel@haxx.se>2007-11-17 10:22:44 +0000
commitbff962398d0f572b4ea689053e020080565944d5 (patch)
tree3b799b6dc60b90d59f58b4875b0cc622a9fc97fa
parent2b15823dab89d504eee57bf91f3757a90ab3497b (diff)
Andres Garcia made the examples build fine on Windows (mingw + msys) when
the lib was built staticly.
-rw-r--r--CHANGES3
-rw-r--r--configure.ac2
-rw-r--r--docs/examples/Makefile.am8
3 files changed, 12 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 8f373be59..c221766d4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,9 @@ Daniel S (17 Nov 2007)
- Michal Marek made the test suite remember what test servers that fail to
start so that subsequent tries are simply skipped.
+- Andres Garcia made the examples build fine on Windows (mingw + msys) when
+ the lib was built staticly.
+
Daniel S (16 Nov 2007)
- Ates Goral identified a problem in http.c:add_buffer_send() when a debug
callback was used, as it could wrongly pass on a bad size for the outgoing
diff --git a/configure.ac b/configure.ac
index 2be648541..70566cfbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,6 +174,7 @@ case $host in
esac
AC_MSG_RESULT($mimpure)
AM_CONDITIONAL(MIMPURE, test x$mimpure = xyes)
+AM_CONDITIONAL(STATICLIB, false)
AC_MSG_CHECKING([if we need BUILDING_LIBCURL])
case $host in
@@ -185,6 +186,7 @@ case $host in
then
AC_DEFINE(CURL_STATICLIB, 1, [when not building a shared library])
AC_MSG_RESULT(yes)
+ AM_CONDITIONAL(STATICLIB, true)
else
AC_MSG_RESULT(no)
fi
diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am
index 9127c3d5a..73383131e 100644
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -9,7 +9,13 @@ EXTRA_DIST = README Makefile.example makefile.dj $(COMPLICATED_EXAMPLES)
INCLUDES = -I$(top_srcdir)/include
LIBDIR = $(top_builddir)/lib
-CPPFLAGS = -DCURL_NO_OLDIES
+
+if STATICLIB
+# we need this define when building with a static lib on Windows
+STATICCPPFLAGS = -DCURL_STATICLIB
+endif
+
+CPPFLAGS = -DCURL_NO_OLDIES $(STATICCPPFLAGS)
# Dependencies
LDADD = $(LIBDIR)/libcurl.la