[Rasta-commits] rev 211 - trunk

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2003-09-24 18:50:20 -0500 (Wed, 24 Sep 2003)
New Revision: 211

Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/acconfig.h
   trunk/configure.in
Log:
liblockfile checks

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2003-06-10 23:31:04 UTC (rev 210)
+++ trunk/ChangeLog	2003-09-24 23:50:20 UTC (rev 211)
@@ -1,3 +1,9 @@
+2003-09-24	Joel Becker	<joel.becker at oracle.com>
+
+	* Makefile;am: Add variable for CGIRASTA.
+	* configure.in: Test for liblockfile and switch on cgirasta.
+	* acconfig.h: Add HAVE_LOCKFILE
+
 2003-06-10	Joel Becker	<joel.becker at oracle.com>
 
 	* Makefile.am: Add redhat/rasta.spec.in to DIST_FILES

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2003-06-10 23:31:04 UTC (rev 210)
+++ trunk/Makefile.am	2003-09-24 23:50:20 UTC (rev 211)
@@ -3,7 +3,7 @@
 	librasta	\
 	clrasta		\
 	gtkrasta	\
-	cgirasta	\
+	$(CGIRASTA)	\
 	tools		\
 	documentation	\
 	tests		\

Modified: trunk/acconfig.h
===================================================================
--- trunk/acconfig.h	2003-06-10 23:31:04 UTC (rev 210)
+++ trunk/acconfig.h	2003-09-24 23:50:20 UTC (rev 211)
@@ -1,6 +1,9 @@
 /* Define if we have readline */
 #undef HAVE_READLINE
 
+/* Define if liblockfile is present */
+#undef HAVE_LOCKFILE
+
 /* Define the LIBDIR */
 #define _RASTA_DIR "/usr/local/lib/rasta"
 

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2003-06-10 23:31:04 UTC (rev 210)
+++ trunk/configure.in	2003-09-24 23:50:20 UTC (rev 211)
@@ -118,6 +118,17 @@
     AC_CHECK_LIB(44bsd, strerror, LIBS="-l44bsd $LIBS")
 )
 
+# Check for liblockfile
+CGIRASTA=
+ldflags_orig=$LDFLAGS
+LDFLAGS="$LDFLAGS -llockfile"
+AC_CHECK_LIB(lockfile, lockfile_check, [
+    AC_CHECK_HEADER(lockfile.h, [
+        AC_DEFINE(HAVE_LOCKFILE)
+        CGIRASTA=cgirasta])])
+AC_SUBST(CGIRASTA)
+LDFLAGS=$ldflags_orig
+
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.11 gmodule-2.0,,
     AC_MSG_ERROR([
 *** GLIB 1.3.11 or better is required.  The latest version of GLIB