[patch] Unnecessary dependencies in libhal.la

[Sjoerd Simons]

Hi,

  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 :)

  Sjoerd
-- 
Power corrupts.  And atomic power corrupts atomically.
-------------- next part --------------
Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.37
diff -u -u -r1.37 configure.in
--- configure.in	29 Aug 2004 22:31:39 -0000	1.37
+++ configure.in	6 Sep 2004 21:46:26 -0000
@@ -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)
Index: hald/Makefile.am
===================================================================
RCS file: /cvs/hal/hal/hald/Makefile.am,v
retrieving revision 1.32
diff -u -u -r1.32 Makefile.am
--- hald/Makefile.am	3 Sep 2004 18:28:56 -0000	1.32
+++ hald/Makefile.am	6 Sep 2004 21:46:26 -0000
@@ -74,7 +74,7 @@
 	linux/volume_id/volume_id.h	linux/volume_id/volume_id.c	\
 	linux/drive_id/drive_id.h	linux/drive_id/drive_id.c
 
-hald_LDADD = @PACKAGE_LIBS@ -lcap
+hald_LDADD = @PACKAGE_LIBS@ -lcap @EXPAT_LIB@
 
 #### Init scripts fun
 SCRIPT_IN_FILES=haldaemon.in
-------------- next part --------------
_______________________________________________
hal mailing list
hal at freedesktop.org
http://freedesktop.org/mailman/listinfo/hal