From de272d81e8b0322b6ee93b7814c9592c34288cac Mon Sep 17 00:00:00 2001
From: Chris Frey <cdfrey@foursquare.net>
Date: Tue, 7 Dec 2010 22:02:03 -0500
Subject: [PATCH] Minor build system cleanup

---
 Makefile.am     |  3 +++
 configure.ac    | 36 +++---------------------------------
 src/Makefile.am | 33 ++++++++++++++++++---------------
 3 files changed, 24 insertions(+), 48 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7a7c73d7..0867aa5f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,9 @@ endif
 if WITH_BACKUP
 pkgconfig_DATA += libbarrybackup-0.pc
 endif
+if WITH_ALX
+pkgconfig_DATA += libbarryalx-0.pc
+endif
 
 all-local:
 	rm -f $(top_builddir)/barry
diff --git a/configure.ac b/configure.ac
index ad84375e..6e0cd984 100644
--- a/configure.ac
+++ b/configure.ac
@@ -218,7 +218,7 @@ PKG_CHECK_MODULES([LIBXMLXX], [libxml++-2.6],
 	[LIBXMLXX_FOUND=1],
 	[
 		echo "*****************************************************************"
-		echo "WARNING: expat not found... ALX parser will not supported"
+		echo "WARNING: libxml++ not found... ALX parser not included"
 		echo "*****************************************************************"
 		LIBXMLXX_FOUND=0
 	]
@@ -227,33 +227,6 @@ PKG_CHECK_MODULES([LIBXMLXX], [libxml++-2.6],
 AM_CONDITIONAL([WITH_ALX],  [test "$LIBXMLXX_FOUND" = "1"])
 
 
-#AC_ARG_WITH(expat,
-#	AC_HELP_STRING(--with-expat, [force usage of expat, and halt if not available]),
-#	force_expat=$withval, force_expat=no )
-#
-#AC_CHECK_LIB(expat, [open], 
-#	[
-#	 	EXPAT_FOUND=1
-#		AC_DEFINE([HAVE_EXPAT], [1], [Use expat library])
-#		AC_ARG_VAR([EXPAT_LIBS], [Linker options for expat])
-#	 	EXPAT_LIBS="-lexpat"
-#	],
-#	[
-#		echo "*****************************************************************"
-#		echo "WARNING: expat not found... ALX parser will not supported"
-#		echo "*****************************************************************"
-#		AC_ARG_VAR([EXPAT_LIBS], [Linker options for expat])
-#		EXPAT_LIBS=""
-#		if test "x$force_expat" != xno ; then
-#			AC_MSG_FAILURE([--with-expat specified, but expat not found])
-#		fi
-#	]
-#	)
-#AC_CHECK_HEADERS([expat.h])
-#
-#AM_CONDITIONAL([WITH_ALX],  [test "$EXPAT_FOUND" = "1"])
-
-
 AM_ICONV
 
 
@@ -310,11 +283,8 @@ AC_CONFIG_FILES([Makefile po/Makefile.in
 		 libbarrydp-0.pc
 		 libbarryjdwp-0.pc
 		 libbarrysync-0.pc
-		 libbarrybackup-0.pc])
-
-if test "$LIBXMLXX_FOUND" = "1"; then
-AC_CONFIG_FILES([libbarryalx-0.pc])
-fi
+		 libbarrybackup-0.pc
+		 libbarryalx-0.pc])
 
 #
 # nested packages
diff --git a/src/Makefile.am b/src/Makefile.am
index 35afd5cb..dc573bb4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -73,13 +73,16 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 # libbarrysync - utility functions and classes for syncing and vformats
 # libbarrybackup - utility classes for reading/writing Barry backup files
 #
-lib_LTLIBRARIES = libbarry.la libbarrydp.la libbarryjdwp.la libbarryalx.la
+lib_LTLIBRARIES = libbarry.la libbarrydp.la libbarryjdwp.la
 if WITH_SYNC
 lib_LTLIBRARIES += libbarrysync.la
 endif
 if WITH_BACKUP
 lib_LTLIBRARIES += libbarrybackup.la
 endif
+if WITH_ALX
+lib_LTLIBRARIES += libbarryalx.la
+endif
 
 include_barry_HEADERS = barry.h barrysync.h barrybackup.h \
 	dll.h \
@@ -232,20 +235,6 @@ libbarry_la_SOURCES = dll.h \
 libbarry_la_LIBADD = $(LTLIBOBJS) $(LIBUSB_LIBS) $(ZLIB_LIBS) @LTLIBICONV@
 libbarry_la_LDFLAGS = -version-info ${LIB_BARRY_VERSION}
 
-if WITH_ALX
-libbarryalx_la_SOURCES = \
-	xmlparser.h xmlparser.cc \
-	a_common.h \
-	a_codsection.h a_codsection.cc \
-	a_library.h a_library.cc \
-	a_application.h a_application.cc \
-	a_osloader.h a_osloader.cc \
-	a_alxparser.h a_alxparser.cc
-libbarryalx_la_CXXFLAGS = $(AM_CXXFLAGS) $(LIBXMLXX_CFLAGS)
-libbarryalx_la_LIBADD = $(LIBXMLXX_LIBS)
-libbarryalx_la_LDFLAGS = -version-info ${LIB_BARRY_VERSION}
-endif
-
 libbarrydp_la_SOURCES = \
 	dp_parser.h dp_parser.cc \
 	dp_codinfo.h dp_codinfo.cc
@@ -290,6 +279,20 @@ libbarrybackup_la_LIBADD = libbarry.la $(LIBTAR_LIBS) $(LIBZ_LIBS)
 libbarrybackup_la_LDFLAGS = -version-info ${LIB_BARRY_VERSION}
 endif
 
+if WITH_ALX
+libbarryalx_la_SOURCES = \
+	xmlparser.h xmlparser.cc \
+	a_common.h \
+	a_codsection.h a_codsection.cc \
+	a_library.h a_library.cc \
+	a_application.h a_application.cc \
+	a_osloader.h a_osloader.cc \
+	a_alxparser.h a_alxparser.cc
+libbarryalx_la_CXXFLAGS = $(AM_CXXFLAGS) $(LIBXMLXX_CFLAGS)
+libbarryalx_la_LIBADD = $(LIBXMLXX_LIBS)
+libbarryalx_la_LDFLAGS = -version-info ${LIB_BARRY_VERSION}
+endif
+
 ##if DO_TEST
 ##	bin_PROGRAMS += test-base64 test-data test-time
 ##
-- 
2.11.4.GIT