hal ChangeLog,1.381,1.382 configure.in,1.59,1.60

[Joe Shaw]

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

Modified Files:
	ChangeLog configure.in 
Log Message:
2005-01-07  Joe Shaw  <joeshaw at novell.com>

	* configure.in: Check for popt when building fstab-sync and error
	out if it's not found.

	* tools/Makefile.am: Build fstab-sync conditionally based on
	whether --enable-fstab-sync is passed in.

Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -d -r1.381 -r1.382
--- ChangeLog	16 Dec 2004 21:11:53 -0000	1.381
+++ ChangeLog	7 Jan 2005 19:21:14 -0000	1.382
@@ -1,3 +1,11 @@
+2005-01-07  Joe Shaw  <joeshaw at novell.com>
+
+	* configure.in: Check for popt when building fstab-sync and error
+	out if it's not found.
+
+	* tools/Makefile.am: Build fstab-sync conditionally based on
+	whether --enable-fstab-sync is passed in.
+
 2004-12-16  David Zeuthen  <davidz at redhat.com>
 
 	* fdi/20freedesktop/Makefile.am: Add the two new .fdi files to _DATA

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- configure.in	16 Dec 2004 04:55:28 -0000	1.59
+++ configure.in	7 Jan 2005 19:21:14 -0000	1.60
@@ -65,6 +65,10 @@
 
 AC_ARG_ENABLE(fstab-sync,         [  --enable-fstab-sync     Install fstab-sync callout],enable_fstab_sync=yes,enable_fstab_sync=no)
 if test "x$enable_fstab_sync" = "xyes" ; then
+   # fstab-sync needs popt, so check for it here
+   AC_CHECK_HEADERS(popt.h,, [AC_MSG_ERROR([You need popt to build fstab-sync])])
+   AC_CHECK_LIB(popt, poptGetContext,, [AC_MSG_ERROR([You need popt to build fstab-sync])])
+
    AC_DEFINE(FSTAB_SYNC_ENABLED,1,[Whether fstab-sync callout should be installed])
 fi
 AC_SUBST(FSTAB_SYNC_ENABLED)