X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=5684cf4d64c9ad65caf3b4fec00819a27f5cbd0e;hb=00eb828dc438a799606eb50b1f9e5027283d2e05;hp=427c82a97bb76fa369b5c22a15f4e3510b1f2f47;hpb=cd42ea3623bccfeab211e19b0a1edd02aae3bb5b;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/configure.ac b/configure.ac
index 427c82a..5684cf4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,11 +23,11 @@ AC_ARG_ENABLE(debug,
     enable_debug=$enableval, enable_debug=no)
 
 if test "$enable_debug" = "yes" ; then
-    GCC_CFLAGS="$CFLAGS -Wall -g -D_DEBUG"
-    GCC_CXXFLAGS="$CXXFLAGS -Wall -g -D_DEBUG"
+    GCC_CFLAGS="$CFLAGS -g -D_DEBUG"
+    GCC_CXXFLAGS="$CXXFLAGS -g -D_DEBUG"
 else
-    GCC_CFLAGS="$CFLAGS -Wall -O2 -DNDEBUG"
-    GCC_CXXFLAGS="$CXXFLAGS -Wall -O2 -DNDEBUG"
+    GCC_CFLAGS="$CFLAGS -O2 -DNDEBUG"
+    GCC_CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
 fi
 
 AC_PROG_CC([gcc gcc3 cc])
@@ -42,8 +42,8 @@ if test "$GCC" = "yes" ; then
 #        GCC_CFLAGS="$GCC_CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
 #        GCC_CXXFLAGS="$GCC_CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
 #        ])
-    CFLAGS="$GCC_CFLAGS"
-    CXXFLAGS="$GCC_CXXFLAGS"
+    CFLAGS="-Wall $GCC_CFLAGS"
+    CXXFLAGS="-Wall $GCC_CXXFLAGS"
 else
 # Fix for Sun Workshop compiler in debug mode, may be Sun case #6360993
 	case "${host_cpu}-${host_os}" in
@@ -81,30 +81,6 @@ fi
 
 AC_CHECK_FUNCS([pthread_rwlock_init])
 
-# libcurl settings
-AC_PATH_PROG(CURL_CONFIG,curl-config)
-AC_ARG_WITH(curl,
-    AC_HELP_STRING([--with-curl=PATH], [where curl-config is installed]),
-    [
-    CURL_CONFIG="${with_curl}"
-    if ! test -f "${CURL_CONFIG}" ; then
-    	CURL_CONFIG="${with_curl}/bin/curl-config"
-    fi
-    ])
-if test -f "${CURL_CONFIG}" ; then
-    LDFLAGS="`${CURL_CONFIG} --libs` $LDFLAGS"
-    CPPFLAGS="`${CURL_CONFIG} --cflags` $CPPFLAGS"
-else
-    AC_MSG_ERROR([curl-config not found, may need to use --with-curl option])
-fi
-AC_CHECK_HEADER([curl/curl.h],,AC_MSG_ERROR([unable to find libcurl header files]))
-AC_CHECK_LIB([curl],[curl_global_init],,AC_MSG_ERROR([unable to link with libcurl]))
-AC_MSG_CHECKING([for CURLOPT_SSL_CTX_FUNCTION in curl.h])
-AC_EGREP_HEADER([CURLOPT_SSL_CTX_FUNCTION], [curl/curl.h],
-		[AC_MSG_RESULT(yes)],
-		[AC_MSG_ERROR([need libcurl that supports CURLOPT_SSL_CTX_FUNCTION])])
-
-
 AC_LANG(C++)
 
 # C++ requirements
@@ -175,17 +151,13 @@ AC_ARG_WITH(xmlsec,
 
 if test x_$with_xmlsec != x_no; then
     if test x_$with_xmlsec != x_/usr; then
-        XMLSEC_CPPFLAGS="-I${with_xmlsec}/include"
-        XMLSEC_LDFLAGS="-L${with_xmlsec}/lib"
+        CPPFLAGS="-I${with_xmlsec}/include $CPPFLAGS"
+        LDFLAGS="-L${with_xmlsec}/lib $LDFLAGS"
     fi        
     XMLSEC_LIBS="-lxml-security-c"
     
-    # save and append master flags
-    save_CPPFLAGS="$CPPFLAGS"
-    save_LDFLAGS="$LDFLAGS"
+    # save and append master libs
     save_LIBS="$LIBS"
-    CPPFLAGS="$XMLSEC_CPPFLAGS $CPPFLAGS"
-    LDFLAGS="$XMLSEC_LDFLAGS $LDFLAGS"
     LIBS="$XMLSEC_LIBS $LIBS"
     
     AC_CHECK_HEADER([xsec/utils/XSECPlatformUtils.hpp],,AC_MSG_ERROR([unable to find XML-Security header files]))
@@ -204,13 +176,42 @@ int i = 0;
             [XSECPlatformUtils::Initialise()],,
             [AC_MSG_ERROR([unable to link with XML-Sec])])
 
-	# restore master flags
-	CPPFLAGS="$save_CPPFLAGS"
-	LDFLAGS="$save_LDFLAGS"
+	# restore master libs
 	LIBS="$save_LIBS"
 
 	AC_LANG(C)
 
+	# libcurl settings
+	AC_PATH_PROG(CURL_CONFIG,curl-config)
+	AC_ARG_WITH(curl,
+	    AC_HELP_STRING([--with-curl=PATH], [where curl-config is installed]),
+	    [
+	    CURL_CONFIG="${with_curl}"
+	    if ! test -f "${CURL_CONFIG}" ; then
+	    	CURL_CONFIG="${with_curl}/bin/curl-config"
+	    fi
+	    ])
+	if test -f "${CURL_CONFIG}" ; then
+	    CPPFLAGS="`${CURL_CONFIG} --cflags`"
+	    XMLSEC_LIBS="`${CURL_CONFIG} --libs` $XMLSEC_LIBS"
+	else
+	    AC_MSG_ERROR([curl-config not found, may need to use --with-curl option])
+	fi
+
+	# save and append master libs
+	save_LIBS="$LIBS"
+	LIBS="$XMLSEC_LIBS $LIBS"
+	
+	AC_CHECK_HEADER([curl/curl.h],,AC_MSG_ERROR([unable to find libcurl header files]))
+	AC_CHECK_LIB([curl],[curl_global_init],,AC_MSG_ERROR([unable to link with libcurl]))
+	AC_MSG_CHECKING([for CURLOPT_SSL_CTX_FUNCTION in curl.h])
+	AC_EGREP_HEADER([CURLOPT_SSL_CTX_FUNCTION], [curl/curl.h],
+			[AC_MSG_RESULT(yes)],
+			[AC_MSG_ERROR([need libcurl that supports CURLOPT_SSL_CTX_FUNCTION])])
+
+	# restore master libs
+	LIBS="$save_LIBS"
+
 	# OpenSSL settings
 	AC_ARG_WITH(openssl,
 	    AC_HELP_STRING([--with-openssl=PATH], [where openssl is installed]),
@@ -237,17 +238,13 @@ int i = 0;
 	
 	AC_MSG_CHECKING(for OpenSSL cflags)
 	AC_MSG_RESULT($SSLFLAGS)
-	XMLSEC_CPPFLAGS="$XMLSEC_CPPFLAGS $SSLFLAGS"
+	CPPFLAGS="$CPPFLAGS $SSLFLAGS"
 	AC_MSG_CHECKING(for OpenSSL libraries)
 	AC_MSG_RESULT($SSLLIBS)
 	XMLSEC_LIBS="$XMLSEC_LIBS $SSLLIBS"
 
-	# save and append master flags
-	save_CPPFLAGS="$CPPFLAGS"
-	save_LDFLAGS="$LDFLAGS"
+	# save and append master libs
 	save_LIBS="$LIBS"
-	CPPFLAGS="$XMLSEC_CPPFLAGS $CPPFLAGS"
-	LDFLAGS="$XMLSEC_LDFLAGS $LDFLAGS"
 	LIBS="$XMLSEC_LIBS $LIBS"
 	
 	AC_CHECK_HEADER([openssl/pem.h],,
@@ -257,13 +254,9 @@ int i = 0;
 	             AC_MSG_ERROR([unable to link with openssl libraries]))
 	AC_MSG_RESULT(yes)
 
-	# restore master flags
-	CPPFLAGS="$save_CPPFLAGS"
-	LDFLAGS="$save_LDFLAGS"
+	# restore master libs
 	LIBS="$save_LIBS"
 
-	AC_SUBST(XMLSEC_CPPFLAGS)
-	AC_SUBST(XMLSEC_LDFLAGS)
 	AC_SUBST(XMLSEC_LIBS)
 	
 	AC_LANG(C++)