From 08623699416158a45bf2bd69b83474c2c87abff4 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sat, 29 Aug 2020 14:36:25 +0000 Subject: [PATCH] configure: Avoid adding flags twice FossilOrigin-Name: f428f5f216875d7abe353b7b3a43816dfd0345f20dd8d0c0e25edc8cccdfe6a3 --- configure.ac | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 09dc23b..b45784a 100644 --- a/configure.ac +++ b/configure.ac @@ -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, [