hal ChangeLog,1.283,1.284 configure.in,1.37,1.38

[David Zeuthen]

Update of /cvs/hal/hal
In directory gabe:/tmp/cvs-serv3896

Modified Files:
	ChangeLog configure.in 
Log Message:
2004-09-07  David Zeuthen  <david at fubar.dk>

	Patch from Sjoerd Simons <sjoerd at luon.net>

	* configure.in: 
	* hald/Makefile.am: 
	All binaries generated by hal currently have -lexpat in their
	LDFLAGS. Which by itself is not a problem, except that libtool
	puts it as a library dependency in libhal.la. Which is ofcourse
	unnecessary. Attached patch fixes this by using the expat link
	option only for the hald binary.  No screenshot for this one
	though :)



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -d -r1.283 -r1.284
--- ChangeLog	3 Sep 2004 18:28:56 -0000	1.283
+++ ChangeLog	7 Sep 2004 19:12:55 -0000	1.284
@@ -1,3 +1,16 @@
+2004-09-07  David Zeuthen  <david at fubar.dk>
+
+	Patch from Sjoerd Simons <sjoerd at luon.net>
+
+	* configure.in: 
+	* hald/Makefile.am: 
+	All binaries generated by hal currently have -lexpat in their
+	LDFLAGS. Which by itself is not a problem, except that libtool
+	puts it as a library dependency in libhal.la. Which is ofcourse
+	unnecessary. Attached patch fixes this by using the expat link
+	option only for the hald binary.  No screenshot for this one
+	though :)
+
 2004-09-03  David Zeuthen  <david at fubar.dk>
 
 	Patch from Martin Pitt <martin at piware.de>.

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- configure.in	29 Aug 2004 22:31:39 -0000	1.37
+++ configure.in	7 Sep 2004 19:12:55 -0000	1.38
@@ -189,6 +189,7 @@
 pkg_modules="glib-2.0 >= 2.2.2, gobject-2.0 >= 2.2.2, dbus-glib-1 >= 0.20, $dbus_module"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 
+EXPAT_LIB=""
 AC_ARG_WITH(expat, [  --with-expat=<dir>      Use expat from here],
                       [
                       expat=$withval
@@ -197,7 +198,8 @@
                       ]
                       )
 AC_CHECK_HEADERS(expat.h)
-AC_CHECK_LIB(expat,XML_ParserCreate)
+AC_CHECK_LIB(expat,XML_ParserCreate, EXPAT_LIB="-lexpat")
+AC_SUBST(EXPAT_LIB)
 
 dnl DBUS API is subject to changes
 AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, ,DBUS API is subject to change)