Fix some syntax errors

git-svn-id: https://svn.middleware.georgetown.edu/cpp-xmltooling/trunk@320 de75baf8-a10c-0410-a50a-987c0e22f00f

diff --git a/configure.ac b/configure.ac
index 5a14755..3935625 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -181,12 +181,12 @@ if test x_$with_xmlsec != x_no; then
     XMLSEC_LIBS="-lxml-security-c"
     
     # 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_CPPFLAGS="$CPPFLAGS"
+    save_LDFLAGS="$LDFLAGS"
+    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]))
     AC_MSG_CHECKING([XML-Security version])
@@ -205,9 +205,9 @@ int i = 0;
             [AC_MSG_ERROR([unable to link with XML-Sec])])
 
        # restore master flags
-       CPPFLAGS = "$save_CPPFLAGS"
-       LDFLAGS = "$save_LDFLAGS"
-       LIBS = "$save_LIBS"
+       CPPFLAGS="$save_CPPFLAGS"
+       LDFLAGS="$save_LDFLAGS"
+       LIBS= $save_LIBS"
 
        AC_LANG(C)
 
@@ -243,12 +243,12 @@ int i = 0;
        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_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]))
@@ -258,9 +258,9 @@ int i = 0;
        AC_MSG_RESULT(yes)
 
        # restore master flags
-       CPPFLAGS = "$save_CPPFLAGS"
-       LDFLAGS = "$save_LDFLAGS"
-       LIBS = "$save_LIBS"
+       CPPFLAGS="$save_CPPFLAGS"
+       LDFLAGS="$save_LDFLAGS"
+       LIBS="$save_LIBS"
 
        AC_SUBST(XMLSEC_CPPFLAGS)
        AC_SUBST(XMLSEC_LDFLAGS)

diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index 63e6274..63d025f 100644 (file)
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -1,6 +1,10 @@
 AUTOMAKE_OPTIONS = foreign
 
+if BUILD_XMLSEC
 lib_LTLIBRARIES = libxmltooling-lite.la
+else
+lib_LTLIBRARIES = libxmltooling-lite.la libxmltooling.la
+endif
 
 libxmltoolingincludedir = $(includedir)/xmltooling
 
@@ -172,13 +176,12 @@ common_sources = \
        ${xmlsec_sources} \
        $(thread_sources)
 
-libxmltooling-lite_la_SOURCES = \
+libxmltooling_lite_la_SOURCES = \
        ${common_sources}
 
-libxmltooling-lite_la_LDFLAGS = -version-info 1:0:0
+libxmltooling_lite_la_LDFLAGS = -version-info 1:0:0
 
 if BUILD_XMLSEC
-lib_LTLIBRARIES = libxmltooling.la
 libxmltooling_la_SOURCES = \
        ${common_sources} \
        ${xmlsec_sources} \