ObjFW/ObjOpenSSL
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

configure: Avoid adding flags twice

Browse source 
FossilOrigin-Name: f428f5f216875d7abe353b7b3a43816dfd0345f20dd8d0c0e25edc8cccdfe6a3
This commit is contained in:
Jonathan Schleifer 2020-08-29 14:36:25 +00:00
parent 1511972ac1
commit 0862369941
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
configure.ac
View file

@ -1,9 +1,14 @@
AC_INIT(ObjOpenSSL, 0.1, js@nil.im)
AC_CONFIG_SRCDIR(src)
AC_CONFIG_AUX_DIR(build-aux)
AC_CONFIG_MACRO_DIR(build-aux/m4)
for i in configure.ac build-aux/m4/*; do
AS_IF([test $i -nt configure], [
AC_MSG_ERROR([$i is newer than configure! Run ./autogen.sh!])
])
done
AC_CHECK_TOOL(OBJFW_CONFIG, objfw-config)
AS_IF([test x"$OBJFW_CONFIG" = x""], [
AC_MSG_ERROR(You need ObjFW and objfw-config installed!)
@ -47,10 +52,10 @@ AS_IF([test x"$enable_static" = x"yes" -o x"$enable_shared" = x"no"], [
AC_ARG_WITH(openssl, AS_HELP_STRING([--with-openssl=PREFIX],
[build with OpenSSL in the specified prefix]))
AS_IF([test x"$with_openssl" != x"no" -a x"$with_openssl" != x""], [
OPENSSL_CPPFLAGS="$CPPFLAGS -I$with_openssl/include"
OPENSSL_LIBS="$LIBS -L$with_openssl/lib"
CPPFLAGS="$CPPFLAGS $OPENSSL_CPPFLAGS"
LIBS="$LIBS $OPENSSL_LIBS"
OPENSSL_CPPFLAGS="$OPENSSL_CFLAGS -I$with_openssl/include"
OPENSSL_LIBS="$OPENSSL_LIBS -L$with_openssl/lib"
CPPFLAGS="$CPPFLAGS -I$with_openssl/include"
LIBS="$LIBS -L$with_openssl/lib"
])
AC_CHECK_LIB(ssl, main, [