File gnubiff-gamin.diff of Package gnubiff

Overview Repositories Revisions Requests Users Attributes Meta

File gnubiff-gamin.diff of Package gnubiff (Revision 41c7a943a33df20ab5744ac4d7a24405)

Currently displaying revision 41c7a943a33df20ab5744ac4d7a24405 , Show latest

configure.ac    |   23 ++++++++++++++++++++---
 src/Makefile.am |    3 ++-
 2 files changed, 22 insertions(+), 4 deletions(-)

Index: gnubiff-CVS/configure.ac
===================================================================
--- gnubiff-CVS.orig/configure.ac
+++ gnubiff-CVS/configure.ac
@@ -64,12 +64,29 @@ AC_CHECK_LIB([popt],[main], ,
 	])
 )
 
-AC_CHECK_LIB([fam],[main], ,
+AC_CHECK_LIB([fam], [main], [
+	FAM_LIBS="-lfam"
+	AC_DEFINE([HAVE_LIBFAM], [1], [libfam])
+	AC_DEFINE([HAVE_FAM_H], [1], [fam.h])
+])
+if test -z "$FAM_LIBS" ; then
+	PKG_CHECK_MODULES(FAM, gamin >= 0.1.0)
+else
+	dnl From pkg.m4:
+	dnl # Note that if there is a possibility the first call to
+	dnl # PKG_CHECK_MODULES might not happen, you should be sure to
+	dnl # include an explicit call to PKG_PROG_PKG_CONFIG in your
+	dnl # configure.ac
+	PKG_PROG_PKG_CONFIG
+fi
+if test -z "$FAM_LIBS" ; then
 	AC_MSG_ERROR([
 	Cannot find fam (File Alteration Monitor) library
 	Please consider installing it before installing gnubiff
-    ])
-)
+	])
+fi
+AC_SUBST(FAM_CFLAGS)
+AC_SUBST(FAM_LIBS)
 
 AC_CHECK_LIB([ssl],[main])
 
Index: gnubiff-CVS/src/Makefile.am
===================================================================
--- gnubiff-CVS.orig/src/Makefile.am
+++ gnubiff-CVS/src/Makefile.am
@@ -1,4 +1,5 @@
 INCLUDES = \
+	$(FAM_CFLAGS) \
 	$(GNUBIFF_DEP_CFLAGS)							\
 	$(GNOME_PANEL_DEP_CFLAGS)						\
 	-DGNUBIFF_LOCALEDIR=\""$(datadir)/locale"\"		\
@@ -77,7 +78,7 @@ gnubiff$(EXEEXT): $(gnubiff_OBJECTS) $(g
 
 gnubiff_SOURCES = $(common_sources)
 
-gnubiff_LDADD = $(INTLLIBS) $(GNUBIFF_DEP_LIBS)
+gnubiff_LDADD = $(INTLLIBS) $(GNUBIFF_DEP_LIBS) $(FAM_LIBS)
 
 serverdir       = $(libdir)/bonobo/servers
 server_in_files =

Places

File gnubiff-gamin.diff of Package gnubiff (Revision 41c7a943a33df20ab5744ac4d7a24405)

Places