projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 3.3.0
[debian/amanda]
/
config
/
amanda
/
libs.m4
diff --git
a/config/amanda/libs.m4
b/config/amanda/libs.m4
index 0c513ad6cf80e31f546439bbd8461a1cc3101a0d..1cee766753bca0f603fef60bca5ddb450506dcb9 100644
(file)
--- a/
config/amanda/libs.m4
+++ b/
config/amanda/libs.m4
@@
-211,7
+211,8
@@
AC_DEFUN([LIBCURL_CHECK_CONFIG],
AH_TEMPLATE([LIBCURL_PROTOCOL_TFTP],[Defined if libcurl supports TFTP])
AC_ARG_WITH(libcurl,
AH_TEMPLATE([LIBCURL_PROTOCOL_TFTP],[Defined if libcurl supports TFTP])
AC_ARG_WITH(libcurl,
- AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]),
+ AC_HELP_STRING([--with-libcurl=PREFIX],
+ [look for the curl library in PREFIX/lib and headers in PREFIX/include]),
[_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])])
if test "$_libcurl_with" != "no" ; then
[_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])])
if test "$_libcurl_with" != "no" ; then
@@
-225,9
+226,9
@@
AC_DEFUN([LIBCURL_CHECK_CONFIG],
if test -d "$_libcurl_with" ; then
LIBCURL_CPPFLAGS="-I$withval/include"
_libcurl_ldflags="-L$withval/lib"
if test -d "$_libcurl_with" ; then
LIBCURL_CPPFLAGS="-I$withval/include"
_libcurl_ldflags="-L$withval/lib"
- AC_PATH_PROG([_libcurl_config],[curl-config],[
"$withval/bin"
],["$withval/bin"])
+ AC_PATH_PROG([_libcurl_config],[curl-config],[],["$withval/bin"])
else
else
- AC_PATH_PROG([_libcurl_config],[curl-config])
+ AC_PATH_PROG([_libcurl_config],[curl-config]
,[],[$PATH]
)
fi
if test x$_libcurl_config != "x" ; then
fi
if test x$_libcurl_config != "x" ; then