Check for required libnautilus version, and conditionally enable nautilus

2004-01-28  Christian Persch  <chpe@cvs.gnome.org>

	* configure.in:
	* src/Makefile.am:

	Check for required libnautilus version, and conditionally enable
	nautilus view.

3 files changed, 25 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 2acf85443..16b3d1861 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-28  Christian Persch  <chpe@cvs.gnome.org>
+
+	* configure.in:
+	* src/Makefile.am:
+
+	Check for required libnautilus version, and conditionally enable
+	nautilus view.
+
 2004-01-27 Piers Cornwell  <piers@myrealbox.com>
 
 	* help/C/epiphany.xml:
diff --git a/configure.in b/configure.in
index c377cc1f0..9af90b4b5 100644
--- a/configure.in
+++ b/configure.in
@@ -24,6 +24,7 @@ LIBBONOBOUI_REQUIRED=2.1.1
 LIBXML_REQUIRED=2.6.0
 LIBGNOMEVFS_REQUIRED=2.3.1
 LIBGLADE_REQUIRED=2.3.1
+LIBNAUTILUS_REQUIRED=2.5
 
 AC_SUBST(GLIB_REQUIRED)
 AC_SUBST(GTK_REQUIRED)
@@ -31,6 +32,7 @@ AC_SUBST(LIBBONOBOUI_REQUIRED)
 AC_SUBST(LIBXML_REQUIRED)
 AC_SUBST(LIBGNOMEVFS_REQUIRED)
 AC_SUBST(LIBGLADE_REQUIRED)
+AC_SUBST(LIBNAUTILUS_REQUIRED)
 
 AC_ENABLE_SHARED(yes)
 AC_ENABLE_STATIC(no)
@@ -71,11 +73,15 @@ if test "x$enable_nautilus_view" = "xauto"; then
      enable_nautilus_view=yes
   fi
 fi
+AC_MSG_RESULT($enable_nautilus_view)
+
 if test "x$enable_nautilus_view" = "xyes"; then
-  AC_DEFINE(ENABLE_NAUTILUS_VIEW, 1, [Define if the nautilus view has to be built])
-  nautilusview_pkgs=libnautilus
+  PKG_CHECK_MODULES(NAUTILUS_DEPENDENCY, libnautilus >= $LIBNAUTILUS_REQUIRED, \
+  		    [AC_DEFINE(ENABLE_NAUTILUS_VIEW, 1, [Define if the nautilus view has to be built])], \
+		    [enable_nautilus_view=no])
 fi
-AC_MSG_RESULT($enable_nautilus_view)
+AC_SUBST(NAUTILUS_DEPENDENCY_CFLAGS)
+AC_SUBST(NAUTILUS_DEPENDENCY_LIBS)
 AM_CONDITIONAL(ENABLE_NAUTILUS_VIEW, test "x$enable_nautilus_view" = "xyes")
 
 PKG_CHECK_MODULES(EPIPHANY_DEPENDENCY, \
@@ -90,7 +96,6 @@ PKG_CHECK_MODULES(EPIPHANY_DEPENDENCY, \
 		  gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED \
 		  gnome-vfs-module-2.0 \
 		  gconf-2.0 \
-		  $nautilusview_pkgs \
 		 )
 AC_SUBST(EPIPHANY_DEPENDENCY_CFLAGS)
 AC_SUBST(EPIPHANY_DEPENDENCY_LIBS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 2e3839335..fb6bf9912 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,6 +13,10 @@ INCLUDES = \
 	-DPIXMAP_DIR=\""$(datadir)/pixmaps"\" 		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
 
+if ENABLE_NAUTILUS_VIEW
+INCLUDES += $(NAUTILUS_DEPENDENCY_CFLAGS)
+endif
+
 if MAINTAINER_MODE
 INCLUDES += -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
 	-DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED $(WARN_CFLAGS)
@@ -129,6 +133,10 @@ epiphany_bin_LDADD = \
 	$(EPIPHANY_DEPENDENCY_LIBS) \
 	$(INTLLIBS)
 
+if ENABLE_NAUTILUS_VIEW
+epiphany_bin_LDADD += $(NAUTILUS_DEPENDENCY_CFLAGS)
+endif
+
 BUILT_SOURCES = $(CORBA_SOURCE)
 
 CLEANFILES = $(CORBA_SOURCE)