Changeset 698

Timestamp:

11/11/06 10:18:29 (2 years ago)

Author:

common

Message:

nepenthes

• configure.ac
  
  • use curl-config to get all required flags when linking curl (uclibc fix)
    

Files:

• nepenthes/trunk/configure.ac (modified) (2 diffs)

nepenthes/trunk/configure.ac

@@ -345 +345 @@
-
-if test xyes = "xyes"; then
-
-
+
+
+
+
+
+
+
-    if test "x$curl_inc" != xno; then
-      CPPFLAGS="-I$curl_inc $CPPFLAGS"
-    fi
-
-    orig_ldflags=$LDFLAGS
-    if test "x$curl_lib" != "xno"; then
-        LDFLAGS="-L$curl_lib $LDFLAGS"
-    fi
+
+    orig_cppflags=$CPPFLAGS
+    orig_libs=$LIBS
+    
+    CPPFLAGS="$CPPFLAGS `curl-config --cflags`"
+    LIBS="$LIBS `curl-config --libs`"
+    
-
-    AC_CHECK_LIB([curl], [curl_version],
-             [AC_DEFINE(HAVE_LIBCURL, 1,
-                       [Define if you want to use libcurl])
--lcurl
+`curl-config --cflags`
-             [AC_MSG_ERROR([libcurl is missing - install it please])
-             ])
+
+    CPPFLAGS=$orig_cppflags
+    LIBS=$orig_libs
-fi
-          
@@ -425 +439 @@
-    fi
-
+    
+    orig_libs=$LIBS
+    LIBS="-lz $LIBS"
-
-    AC_CHECK_LIB([magic], [magic_open],
-             [AC_DEFINE(HAVE_LIBMAGIC, 1,
-                       [Define if you want to use libmagic])
-
+ -lz
-             [AC_MSG_ERROR([libmagic is missing - install it please])
-             ])
+
+    LIBS=$orig_libs
+
-    AC_CHECK_HEADERS(magic.h)
-fi