X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fxmltooling.git;a=blobdiff_plain;f=configure.ac;fp=configure.ac;h=e8e1d3b42bf1f2820c91e5a1724aace6af998c9f;hp=d14baf6c058f87046cacb65b796244b3d2a7ac90;hb=2a8c6d0b6305525c1d4125ca58cd35a2a31e5e27;hpb=2339ae08f66ada91a3c02c121ab57093147e4328

diff --git a/configure.ac b/configure.ac
index d14baf6..e8e1d3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,6 +175,54 @@ AC_ARG_WITH(xmlsec,
             [with_xmlsec=/usr])
 
 if test x_$with_xmlsec != x_no; then
+
+    # OpenSSL settings (need to do this first in case it's in a different spot from xmlsec)
+    AC_ARG_WITH(openssl,
+        AC_HELP_STRING([--with-openssl=PATH], [where openssl is installed]),
+        [if test x_$with_openssl != x_/usr; then
+            SSLFLAGS="-I${with_openssl}/include"
+            SSLLIBS="-L${with_openssl}/lib -lcrypto -lssl"
+        else
+            SSLLIBS="-lcrypto -lssl"
+        fi])
+    
+    if test "x$SSLLIBS" = "x" ; then
+        AC_PATH_PROG(PKG_CONFIG, pkg-config)
+        if test "x$PKG_CONFIG" != x && test "x$PKG_CONFIG" != "xno" ; then
+            if pkg-config openssl ; then
+                SSLLIBS="`$PKG_CONFIG --libs openssl`"
+                SSLFLAGS="`$PKG_CONFIG --cflags openssl`"
+            else
+                AC_MSG_ERROR([OpenSSL not supported by pkg-config, try --with-openssl instead])
+            fi
+        fi
+    fi
+    
+    if test "x$SSLLIBS" = "x" ; then
+        SSLLIBS="-lcrypto -lssl"
+    fi
+    
+    AC_MSG_CHECKING(for OpenSSL cflags)
+    AC_MSG_RESULT($SSLFLAGS)
+    CPPFLAGS="$CPPFLAGS $SSLFLAGS"
+    AC_MSG_CHECKING(for OpenSSL libraries)
+    AC_MSG_RESULT($SSLLIBS)
+    XMLSEC_LIBS="$XMLSEC_LIBS $SSLLIBS"
+
+    # save and append master libs
+    save_LIBS="$LIBS"
+    LIBS="$XMLSEC_LIBS $LIBS"
+    
+    AC_CHECK_HEADER([openssl/pem.h],,
+                    AC_MSG_ERROR([unable to find openssl header files]))
+    AC_MSG_CHECKING(for ERR_load_CRYPTO_string)
+    AC_TRY_LINK_FUNC([ERR_load_CRYPTO_strings],,
+                 AC_MSG_ERROR([unable to link with openssl libraries]))
+    AC_MSG_RESULT(yes)
+
+    # restore master libs
+    LIBS="$save_LIBS"
+
     if test x_$with_xmlsec != x_/usr; then
         CPPFLAGS="-I${with_xmlsec}/include $CPPFLAGS"
         LDFLAGS="-L${with_xmlsec}/lib $LDFLAGS"
@@ -235,53 +283,6 @@ int i = 0;
 	# restore master libs
 	LIBS="$save_LIBS"
 
-	# OpenSSL settings
-	AC_ARG_WITH(openssl,
-	    AC_HELP_STRING([--with-openssl=PATH], [where openssl is installed]),
-	    [if test x_$with_openssl != x_/usr; then
-            SSLFLAGS="-I${with_openssl}/include"
-	        SSLLIBS="-L${with_openssl}/lib -lcrypto -lssl"
-        else
-            SSLLIBS="-lcrypto -lssl"
-	    fi])
-	
-	if test "x$SSLLIBS" = "x" ; then
-	    AC_PATH_PROG(PKG_CONFIG, pkg-config)
-	    if test "x$PKG_CONFIG" != x && test "x$PKG_CONFIG" != "xno" ; then
-	        if pkg-config openssl ; then
-	            SSLLIBS="`$PKG_CONFIG --libs openssl`"
-	            SSLFLAGS="`$PKG_CONFIG --cflags openssl`"
-	        else
-	            AC_MSG_ERROR([OpenSSL not supported by pkg-config, try --with-openssl instead])
-	        fi
-	    fi
-	fi
-	
-	if test "x$SSLLIBS" = "x" ; then
-	    SSLLIBS="-lcrypto -lssl"
-	fi
-	
-	AC_MSG_CHECKING(for OpenSSL cflags)
-	AC_MSG_RESULT($SSLFLAGS)
-	CPPFLAGS="$CPPFLAGS $SSLFLAGS"
-	AC_MSG_CHECKING(for OpenSSL libraries)
-	AC_MSG_RESULT($SSLLIBS)
-	XMLSEC_LIBS="$XMLSEC_LIBS $SSLLIBS"
-
-	# save and append master libs
-	save_LIBS="$LIBS"
-	LIBS="$XMLSEC_LIBS $LIBS"
-	
-	AC_CHECK_HEADER([openssl/pem.h],,
-	                AC_MSG_ERROR([unable to find openssl header files]))
-	AC_MSG_CHECKING(for ERR_load_CRYPTO_string)
-	AC_TRY_LINK_FUNC([ERR_load_CRYPTO_strings],,
-	             AC_MSG_ERROR([unable to link with openssl libraries]))
-	AC_MSG_RESULT(yes)
-
-	# restore master libs
-	LIBS="$save_LIBS"
-
 	AC_SUBST(XMLSEC_LIBS)
 else
     AC_MSG_WARN([xmlsec disabled, building without signature/encryption support])