1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
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)
|
GitWeb
