[cpp-xmltooling] branch master updated: Apply autoconf corrections from Debian team to xmltooling.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-xmltooling.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-xmltooling.git;a=commit;h=1375707a84a94b94ec82aa985cbc73a81ec04a51

The following commit(s) were added to refs/heads/master by this push:
       new  1375707   Apply autoconf corrections from Debian team to xmltooling.
1375707 is described below

commit 1375707a84a94b94ec82aa985cbc73a81ec04a51
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Oct 12 14:38:48 2018 -0400

    Apply autoconf corrections from Debian team to xmltooling.
---
 configure.ac               | 38 +++++++++-----------------------------
 xmltooling/Makefile.am     | 17 +++++++++++++++--
 xmltoolingtest/Makefile.am |  9 ++++++++-
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/configure.ac b/configure.ac
index 06292ed..ddbeb27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,8 +5,6 @@ AC_CONFIG_SRCDIR(xmltooling)
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_MACRO_DIR(m4)
 AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-zip subdir-objects nostdinc])
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
 PKG_INSTALLDIR
 
 # Doxygen features
@@ -22,15 +20,12 @@ DX_PS_FEATURE(OFF)
 DX_INIT_DOXYGEN(xmltooling, doxygen.cfg, doc/api)
 
 AC_ARG_ENABLE(debug,
-    AS_HELP_STRING([--enable-debug],[Have GCC compile with symbols (Default = no)]),
+    AS_HELP_STRING([--enable-debug],[Produce debug variant (Default = no)]),
     enable_debug=$enableval, enable_debug=no)
 
 if test "$enable_debug" = "yes" ; then
-    GCC_CFLAGS="$CFLAGS -g -D_DEBUG"
-    GCC_CXXFLAGS="$CXXFLAGS -g -D_DEBUG"
-else
-    GCC_CFLAGS="$CFLAGS -O2 -DNDEBUG"
-    GCC_CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
+    AM_CFLAGS="-D_DEBUG"
+    AM_CXXFLAGS="-D_DEBUG"
 fi
 
 AC_CONFIG_HEADERS([config.h xmltooling/config_pub.h])
@@ -39,31 +34,16 @@ AC_CONFIG_FILES([Makefile xmltooling/Makefile xmltoolingtest/Makefile schemas/Ma
 
 AC_PROG_CC([gcc gcc3 cc])
 AC_PROG_CXX([g++ g++3 c++ CC])
-AC_CANONICAL_HOST
 
 if test "$GCC" = "yes" ; then
-#    AC_HAVE_GCC_VERSION(4,0,0,0,
-#        [
-#        AC_DEFINE(GCC_HASCLASSVISIBILITY,1,
-#            [Define to enable class visibility control in gcc.])
-#        GCC_CFLAGS="$GCC_CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
-#        GCC_CXXFLAGS="$GCC_CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
-#        ])
-    CFLAGS="-Wall $GCC_CFLAGS"
-    CXXFLAGS="-Wall $GCC_CXXFLAGS"
+    AM_CFLAGS="$AM_CFLAGS -Wall -W"
+    AM_CXXFLAGS="$AM_CXXFLAGS -Wall -W"
 fi
 
-# Fix for Sun Workshop compiler in debug mode, may be Sun case #6360993
-# Also enables POSIX semantics for some functions.
-case "${host_cpu}-${host_os}" in
-    *solaris*)
-	CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS"
-	CXXFLAGS="$CXXFLAGS -D_POSIX_PTHREAD_SEMANTICS"
-	if test "$CXX" = "CC" ; then
-		CXXFLAGS="$CXXFLAGS -Qoption ccfe -stabs=no%dfltlit+no%dflthlp"
-	fi
-    ;;
-esac
+AC_SUBST([AM_CFLAGS])
+AC_SUBST([AM_CXXFLAGS])
+
+LT_INIT([disable-static])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index 1ffb6cb..9317c5c 100644
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -213,8 +213,21 @@ common_sources = \
 	validation/ValidatorSuite.cpp \
 	$(thread_sources)
 
-common_CXXFLAGS = $(xerces_CFLAGS) $(zlib_CFLAGS) $(log4shib_CFLAGS) $(log4cpp_CFLAGS) $(PTHREAD_CFLAGS) $(BOOST_CPPFLAGS)
-common_LIBADD   = $(xerces_LIBS) $(zlib_LIBS) $(log4shib_LIBS) $(log4cpp_LIBS) $(PTHREAD_LIBS) $(dlopen_LIBS)
+common_CXXFLAGS = \
+	$(AM_CXXFLAGS) \
+	$(xerces_CFLAGS) \
+	$(zlib_CFLAGS) \
+	$(log4shib_CFLAGS) \
+	$(log4cpp_CFLAGS) \
+	$(PTHREAD_CFLAGS) \
+	$(BOOST_CPPFLAGS)
+common_LIBADD =
+	$(xerces_LIBS) \
+	$(zlib_LIBS) \
+	$(log4shib_LIBS) \
+	$(log4cpp_LIBS) \
+	$(PTHREAD_LIBS) \
+	$(dlopen_LIBS)
 
 AM_LDFLAGS = -version-info 8:3:0
 
diff --git a/xmltoolingtest/Makefile.am b/xmltoolingtest/Makefile.am
index f4ba52c..8567e7e 100644
--- a/xmltoolingtest/Makefile.am
+++ b/xmltoolingtest/Makefile.am
@@ -4,7 +4,14 @@ TESTS = xmltoolingtest
 
 check_PROGRAMS = xmltoolingtest
 
-xmltoolingtest_CXXFLAGS = $(CXXTESTFLAGS) $(xerces_CFLAGS) $(log4shib_CFLAGS) $(log4cpp_CFLAGS) $(BOOST_CPPFLAGS)
+xmltoolingtest_CXXFLAGS = \
+	$(AM_CXXFLAGS) \
+	$(CXXTESTFLAGS) \
+	$(xerces_CFLAGS) \
+	$(log4shib_CFLAGS) \
+	$(log4cpp_CFLAGS) \
+	$(BOOST_CPPFLAGS)
+
 if BUILD_XMLSEC
 xmltoolingtest_CXXFLAGS += $(XMLSEC_CFLAGS)
 xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling.la $(XMLSEC_LIBS)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.