You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
60 lines
1.6 KiB
60 lines
1.6 KiB
https://bugs.gentoo.org/552474
|
|
|
|
--- raptor2-2.0.15/configure.ac
|
|
+++ raptor2-2.0.15/configure.ac
|
|
@@ -524,49 +524,12 @@
|
|
fi
|
|
fi
|
|
|
|
-dnl curl
|
|
-AC_ARG_WITH(curl-config, [ --with-curl-config=PATH Location of libcurl curl-config []], curl_config="$withval", curl_config="")
|
|
-
|
|
-if test "X$curl_config" != "Xno" ; then
|
|
- if test "X$curl_config" != "X" ; then
|
|
- AC_MSG_CHECKING(for $curl_config)
|
|
-
|
|
- if test -f $curl_config ; then
|
|
- CURL_CONFIG=$curl_config
|
|
- AC_MSG_RESULT(yes)
|
|
- else
|
|
- AC_MSG_RESULT(no - searching PATH)
|
|
- fi
|
|
- fi
|
|
- if test "X$CURL_CONFIG" = "X" ; then
|
|
- AC_CHECK_PROGS(CURL_CONFIG, curl-config)
|
|
- fi
|
|
-fi
|
|
-
|
|
libcurl_source=no
|
|
-if test "X$CURL_CONFIG" != "X"; then
|
|
- LIBCURL_CFLAGS=`$CURL_CONFIG --cflags`
|
|
- LIBCURL_LIBS=`$CURL_CONFIG --libs`
|
|
-
|
|
- CPPFLAGS="$LIBCURL_CFLAGS $CPPFLAGS"
|
|
- LIBS="$LIBS $LIBCURL_LIBS"
|
|
- AC_CHECK_HEADER(curl/curl.h)
|
|
- AC_CHECK_FUNC(curl_easy_init, have_curl_easy_init=yes, have_curl_easy_init=no)
|
|
-
|
|
- AC_MSG_CHECKING(for libcurl via curl-config)
|
|
- if test $have_curl_easy_init = yes; then
|
|
- libcurl_source="curl-config"
|
|
- LIBCURL_VERSION=`$CURL_CONFIG --version | sed -e 's/^libcurl *//'`
|
|
- fi
|
|
- CPPFLAGS="$oCPPFLAGS"
|
|
- LIBS="$oLIBS"
|
|
-else
|
|
- PKG_CHECK_MODULES([LIBCURL],[libcurl],[
|
|
- LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion`
|
|
- libcurl_source="pkg-config"
|
|
- ], [:])
|
|
- AC_MSG_CHECKING(for libcurl via pkg-config)
|
|
-fi
|
|
+PKG_CHECK_MODULES([LIBCURL],[libcurl],[
|
|
+ LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion`
|
|
+ libcurl_source="pkg-config"
|
|
+], [:])
|
|
+AC_MSG_CHECKING(for libcurl via pkg-config)
|
|
|
|
if test "$libcurl_source" = "no"; then
|
|
AC_MSG_RESULT(no - not found)
|