Commit a379a4c1 authored by Yang Tse's avatar Yang Tse
Browse files

Fix libcurl.pc and curl-config generation for static MingW* cross builds

parent b061fed9

configure.ac

+3 −0
Original line number Diff line number Diff line
@@ -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"

curl-config.in

+9 −3
Original line number Diff line number Diff line
@@ -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

       	;;

libcurl.pc.in

+2 −2
Original line number Diff line number Diff line
@@ -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@