From 2d1d45f31396f35716e0ffaf62986fdf134a6270 Mon Sep 17 00:00:00 2001
From: ygrek <ygrek@autistici.org>
Date: Sun, 10 Mar 2013 16:59:07 +0800
Subject: [PATCH] configure: more robust test for libcurl

Use pkg-config, fallback to curl-config.
Do not strip -L options from linking flags (ocamlmklib understands them fine)
---
 configure    | 29 +++++++++++++++++++----------
 configure.in | 17 ++++++++++-------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/configure b/configure
index 277d500..4b92184 100755
--- a/configure
+++ b/configure
@@ -585,8 +585,6 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 INSTALLDIR
 CURLLIBS
-CURLFLAGS
-CURLDIR
 ac_prefix_program
 OCAMLFIND
 OCAMLBUILD
@@ -1792,12 +1790,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-CURLDIR=`curl-config --cflags`
-CURLFLAGS=`curl-config --libs | cut -d ' ' -f 1`
-CURLLIBS=`curl-config --libs | cut -d ' ' -f 2-`
-
-CFLAGS=$CURLDIR
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2587,6 +2579,25 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl cflags" >&5
+$as_echo_n "checking for libcurl cflags... " >&6; }
+CFLAGS=`pkg-config libcurl --cflags || curl-config --cflags`
+if  test "$?" ; then :
+  as_fn_error $? "libcurl was not found" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CFLAGS" >&5
+$as_echo "$CFLAGS" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl libs" >&5
+$as_echo_n "checking for libcurl libs... " >&6; }
+CURLLIBS=`pkg-config libcurl --libs || curl-config --libs`
+if  test "$?" ; then :
+  as_fn_error $? "libcurl was not found" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURLLIBS" >&5
+$as_echo "$CURLLIBS" >&6; }
+
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   if test -f "$ac_dir/install-sh"; then
@@ -3905,8 +3916,6 @@ fi
 
 
 
-
-
 ac_fn_c_check_decl "$LINENO" "CURLOPT_FILE" "ac_cv_have_decl_CURLOPT_FILE" "
 #include \"curl/curl.h\"
 
diff --git a/configure.in b/configure.in
index a8ddb62..aa5f318 100644
--- a/configure.in
+++ b/configure.in
@@ -4,13 +4,18 @@ dnl
 
 AC_INIT(ocurl,0.5.5)
 
-CURLDIR=`curl-config --cflags`
-CURLFLAGS=`curl-config --libs | cut -d ' ' -f 1`
-CURLLIBS=`curl-config --libs | cut -d ' ' -f 2-`
+AC_PROG_CC()
 
-CFLAGS=$CURLDIR
+AC_MSG_CHECKING([for libcurl cflags])
+CFLAGS=`pkg-config libcurl --cflags || curl-config --cflags`
+AS_IF([ test "$?" ], [AC_MSG_ERROR([libcurl was not found])] )
+AC_MSG_RESULT([$CFLAGS])
+
+AC_MSG_CHECKING([for libcurl libs])
+CURLLIBS=`pkg-config libcurl --libs || curl-config --libs`
+AS_IF([ test "$?" ], [AC_MSG_ERROR([libcurl was not found])] )
+AC_MSG_RESULT([$CURLLIBS])
 
-AC_PROG_CC()
 AC_PROG_INSTALL()
 AC_PROG_OCAML()
 AC_PROG_FINDLIB()
@@ -19,8 +24,6 @@ INSTALLDIR=$OCAMLLIB/curl
 
 AC_PREFIX_PROGRAM(ocamlc)
 
-AC_SUBST(CURLDIR)
-AC_SUBST(CURLFLAGS)
 AC_SUBST(CURLLIBS)
 AC_SUBST(OCAMLLIB)
 AC_SUBST(INSTALLDIR)
-- 
2.11.4.GIT