jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of some duplicated flags during build and in pkg-config

Browse Source
This commit is contained in:
cg25
2009-04-06 19:05:08 +00:00
parent 426e653213
commit c23fda2e2a
3 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
m4/check_ssl.m4
View File

@@ -51,18 +51,14 @@ dnl [ AC_MSG_RESULT(yes)
ssldir="$dir"
if test -f "$dir/include/openssl/ssl.h"; then
found_ssl="yes";
SSL_CFLAGS="$CFLAGS -I$ssldir/include/openssl -DHAVE_SSL";
AC_SUBST(SSL_CFLAGS)
SSL_CXXFLAGS="$CXXFLAGS -I$ssldir/include/openssl -DHAVE_SSL";
AC_SUBST(SSL_CXXFLAGS)
SSL_CFLAGS="-I$ssldir/include/openssl -DHAVE_SSL";
SSL_CXXFLAGS="-I$ssldir/include/openssl -DHAVE_SSL";
break;
fi
if test -f "$dir/include/ssl.h"; then
found_ssl="yes";
SSL_CFLAGS="$CFLAGS -I$ssldir/include/ -DHAVE_SSL";
AC_SUBST(SSL_CFLAGS)
SSL_CXXFLAGS="$CXXFLAGS -I$ssldir/include/ -DHAVE_SSL";
AC_SUBST(SSL_CXXFLAGS)
SSL_CFLAGS="-I$ssldir/include/ -DHAVE_SSL";
SSL_CXXFLAGS="-I$ssldir/include/ -DHAVE_SSL";
break
fi
done
@@ -70,12 +66,14 @@ dnl [ AC_MSG_RESULT(yes)
AC_MSG_ERROR(Cannot find ssl libraries)
else
printf "OpenSSL found in $ssldir\n";
SSL_LIBS="$LIBS -lssl -lcrypto";
AC_SUBST(SSL_LIBS)
SSL_LDFLAGS="$LDFLAGS -L$ssldir/lib";
AC_SUBST(SSL_LDFLAGS)
SSL_LIBS="-lssl -lcrypto";
SSL_LDFLAGS="-L$ssldir/lib";
HAVE_SSL=yes
fi
AC_SUBST(SSL_CFLAGS)
AC_SUBST(SSL_CXXFLAGS)
AC_SUBST(SSL_LIBS)
AC_SUBST(SSL_LDFLAGS)
AC_SUBST(HAVE_SSL)
dnl ],
dnl [