diff options
| author | Yang Tse <yangsita@gmail.com> | 2012-05-25 23:59:38 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2012-05-26 00:01:00 +0200 |
| commit | a379a4c1637cfe266bfa95c2c878f9cc06ce2f6a (patch) | |
| tree | 885db05c5c1562a9b2d0323d86eff865ec490611 | |
| parent | b061fed981c97bef78679f193173ab55a4dce91e (diff) | |
| download | curl-a379a4c1637cfe266bfa95c2c878f9cc06ce2f6a.tar.gz | |
Fix libcurl.pc and curl-config generation for static MingW* cross builds
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | curl-config.in | 12 | ||||
| -rw-r--r-- | libcurl.pc.in | 4 |
3 files changed, 14 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 2300c8c8f..db40f1874 100644 --- a/configure.ac +++ b/configure.ac @@ -240,6 +240,7 @@ AM_CONDITIONAL(MIMPURE, test x$mimpure = xyes) AC_MSG_CHECKING([if we need BUILDING_LIBCURL]) use_cppflag_building_libcurl="no" use_cppflag_curl_staticlib="no" +CPPFLAG_CURL_STATICLIB="" case $host in *-*-mingw*) AC_MSG_RESULT(yes) @@ -249,6 +250,7 @@ case $host in then AC_MSG_RESULT(yes) use_cppflag_curl_staticlib="yes" + CPPFLAG_CURL_STATICLIB="-DCURL_STATICLIB" else AC_MSG_RESULT(no) fi @@ -259,6 +261,7 @@ case $host in esac AM_CONDITIONAL(USE_CPPFLAG_BUILDING_LIBCURL, test x$use_cppflag_building_libcurl = xyes) AM_CONDITIONAL(USE_CPPFLAG_CURL_STATICLIB, test x$use_cppflag_curl_staticlib = xyes) +AC_SUBST(CPPFLAG_CURL_STATICLIB) # Determine whether all dependent libraries must be specified when linking if test "X$enable_shared" = "Xyes" -a "X$link_all_deplibs" = "Xno" diff --git a/curl-config.in b/curl-config.in index 3d02a0337..a3ca8b55f 100644 --- a/curl-config.in +++ b/curl-config.in @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 2001 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 2001 - 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 @@ -24,6 +24,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ includedir=@includedir@ +cppflag_curl_staticlib=@CPPFLAG_CURL_STATICLIB@ usage() { @@ -128,10 +129,15 @@ while test $# -gt 0; do ;; --cflags) + if test "X$cppflag_curl_staticlib" = "X-DCURL_STATICLIB"; then + CPPFLAG_CURL_STATICLIB="-DCURL_STATICLIB " + else + CPPFLAG_CURL_STATICLIB="" + fi if test "X@includedir@" = "X/usr/include"; then - echo "" + echo "$(CPPFLAG_CURL_STATICLIB)" else - echo "-I@includedir@" + echo "$(CPPFLAG_CURL_STATICLIB)-I@includedir@" fi ;; diff --git a/libcurl.pc.in b/libcurl.pc.in index 2ba9c39a2..6e878c549 100644 --- a/libcurl.pc.in +++ b/libcurl.pc.in @@ -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 @@ -36,4 +36,4 @@ Description: Library to transfer files with ftp, http, etc. Version: @CURLVERSION@ Libs: -L${libdir} -lcurl @LIBS@ Libs.private: @LIBCURL_LIBS@ @LIBS@ -Cflags: -I${includedir} +Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@ |