hal ChangeLog,1.372.2.22,1.372.2.23 configure.in,1.57.2.6,1.57.2.7

[Joe Shaw]

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

Modified Files:
      Tag: hal-0_4-stable-branch
	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.372.2.22
retrieving revision 1.372.2.23
diff -u -d -r1.372.2.22 -r1.372.2.23
--- ChangeLog	7 Jan 2005 03:52:16 -0000	1.372.2.22
+++ ChangeLog	7 Jan 2005 19:18:07 -0000	1.372.2.23
@@ -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.
+
 2005-01-06  David Zeuthen  <david at fubar.dk>
 
 	* configure.in: Bump to 0.4.4

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.57.2.6
retrieving revision 1.57.2.7
diff -u -d -r1.57.2.6 -r1.57.2.7
--- configure.in	7 Jan 2005 03:52:16 -0000	1.57.2.6
+++ configure.in	7 Jan 2005 19:18:07 -0000	1.57.2.7
@@ -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)