Apply flags to full build, added missing quote.

diff --git a/configure.ac b/configure.ac
index 3935625..427c82a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -207,7 +207,7 @@ int i = 0;
        # restore master flags
        CPPFLAGS="$save_CPPFLAGS"
        LDFLAGS="$save_LDFLAGS"
-       LIBS= $save_LIBS"
+       LIBS="$save_LIBS"
 
        AC_LANG(C)
 
@@ -242,13 +242,13 @@ int i = 0;
        AC_MSG_RESULT($SSLLIBS)
        XMLSEC_LIBS="$XMLSEC_LIBS $SSLLIBS"
 
-    # save and append master flags
-    save_CPPFLAGS="$CPPFLAGS"
-    save_LDFLAGS="$LDFLAGS"
-    save_LIBS="$LIBS"
-    CPPFLAGS="$XMLSEC_CPPFLAGS $CPPFLAGS"
-    LDFLAGS="$XMLSEC_LDFLAGS $LDFLAGS"
-    LIBS="$XMLSEC_LIBS $LIBS"
+       # save and append master flags
+       save_CPPFLAGS="$CPPFLAGS"
+       save_LDFLAGS="$LDFLAGS"
+       save_LIBS="$LIBS"
+       CPPFLAGS="$XMLSEC_CPPFLAGS $CPPFLAGS"
+       LDFLAGS="$XMLSEC_LDFLAGS $LDFLAGS"
+       LIBS="$XMLSEC_LIBS $LIBS"
        
        AC_CHECK_HEADER([openssl/pem.h],,
                        AC_MSG_ERROR([unable to find openssl header files]))

diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index 63d025f..34b4964 100644 (file)
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -182,6 +182,8 @@ libxmltooling_lite_la_SOURCES = \
 libxmltooling_lite_la_LDFLAGS = -version-info 1:0:0
 
 if BUILD_XMLSEC
+libxmltooling_CPPFLAGS = "$(CPPFLAGS) $(XMLSEC_CPPFLAGS)"
+libxmltooling_LDFLAGS = "$(LDFLAGS) $(XMLSEC_LDFLAGS) $(XMLSEC_LIBS)"
 libxmltooling_la_SOURCES = \
        ${common_sources} \
        ${xmlsec_sources} \