generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

when --with-gnutls is used, we assume a bin/libgnutls-config file in the

Browse Source 
given prefix. Building something with gnutls without it just is too error-
prone.
This commit is contained in:
Daniel Stenberg
2005-04-19 22:12:34 +00:00
parent 21337f4776
commit 313f1a1e83
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@@ -1006,14 +1006,15 @@ if test "$OPENSSL_ENABLED" != "1"; then
gtlsprefix=`libgnutls-config --prefix` gtlsprefix=`libgnutls-config --prefix`
fi fi
else else
addlib="-L$OPT_GNUTLS/lib -lgnutls" addlib=`$OPT_GNUTLS/bin/libgnutls-config --libs`
addcflags="-I$OPT_GNUTLS/include" addcflags=`$OPT_GNUTLS/bin/libgnutls-config --cflags`
version=`$OPT_GNUTLS/bin/libgnutls-config --version 2>/dev/null` version=`$OPT_GNUTLS/bin/libgnutls-config --version 2>/dev/null`
gtlsprefix=$OPT_GNUTLS gtlsprefix=$OPT_GNUTLS
if test -z "$version"; then if test -z "$version"; then
version="unknown" version="unknown"
fi fi
fi fi
if test -n "$addlib"; then
CLEANLDFLAGS="$LDFLAGS" CLEANLDFLAGS="$LDFLAGS"
CLEANCPPFLAGS="$CPPFLAGS" CLEANCPPFLAGS="$CPPFLAGS"
@@ -1046,6 +1047,9 @@ if test "$OPENSSL_ENABLED" != "1"; then
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlsprefix/lib$libsuff" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlsprefix/lib$libsuff"
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
fi fi
fi
fi dnl GNUTLS not disabled fi dnl GNUTLS not disabled
if test X"$USE_GNUTLS" != "Xyes"; then if test X"$USE_GNUTLS" != "Xyes"; then