gamin r336 - trunk

[veillard svn gnome org]

Author: veillard
Date: Mon Oct 20 15:41:06 2008
New Revision: 336
URL: http://svn.gnome.org/viewvc/gamin?rev=336&view=rev

Log:
* Makefile.am configure.in: add configure switches to restrict
  building the server or the libs, as Gentoo had a dependancy
  problem, default behaviour of building both unchanged,
  patch from RÃmi Cardona #530635
daniel


Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Mon Oct 20 15:41:06 2008
@@ -1,14 +1,27 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = lib libgamin server tests doc
+SUBDIRS = lib doc
 
+if BUILD_LIBGAMIN
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gamin.pc
 
+SUBDIRS += libgamin
+
 if WITH_PYTHON
 SUBDIRS += python
 endif
 
+endif
+
+if BUILD_SERVER
+SUBDIRS += lib server
+endif
+
+if BUILD_TESTS
+SUBDIRS += tests
+endif
+
 #if BUILD_DOCS
 #install-data-local:
 #	-doxygen

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Oct 20 15:41:06 2008
@@ -94,16 +94,44 @@
 AC_CHECK_FUNCS(usleep setsid setenv putenv getlogin_r)
 AC_STRUCT_ST_MTIM_NSEC
 
+
+dnl
+dnl libgamin/libfam configuration
+dnl
+AC_ARG_ENABLE(libgamin,
+	AC_HELP_STRING([--enable-libgamin], [Build libgamin/libfam (default=yes)]),
+	[enable_libgamin="$enableval"], [enable_libgamin=yes])
+AM_CONDITIONAL(BUILD_LIBGAMIN, test x$enable_libgamin = xyes)
+
+
+dnl
+dnl Server configuration
+dnl
+AC_ARG_ENABLE(server,
+	AC_HELP_STRING([--enable-server], [Build gam_server (default=yes)]),
+	[enable_server="$enableval"], [enable_server=yes])
+
+if test x$enable_server = xyes ; then
+	PKG_CHECK_MODULES(DAEMON, glib-2.0)
+	AC_SUBST(DAEMON_CFLAGS)
+	AC_SUBST(DAEMON_LIBS)
+fi
+AM_CONDITIONAL(BUILD_SERVER, test x$enable_server = xyes)
+
+
 dnl
-dnl Start of pkg-config checks
+dnl Tests
 dnl
-PKG_CHECK_MODULES(DAEMON, glib-2.0)
-AC_SUBST(DAEMON_CFLAGS)
-AC_SUBST(DAEMON_LIBS)
-
-PKG_CHECK_MODULES(TEST, glib-2.0)
-AC_SUBST(TEST_LIBS)
-AC_SUBST(TEST_CFLAGS)
+enable_tests="no"
+if test x$enable_server = xyes && test x$enable_libgamin = xyes ; then
+	PKG_CHECK_MODULES(TEST, glib-2.0)
+	AC_SUBST(TEST_LIBS)
+	AC_SUBST(TEST_CFLAGS)
+	enable_tests="yes"
+
+fi
+AM_CONDITIONAL(BUILD_TESTS, test x$enable_tests = xyes)
+
 
 AC_ARG_ENABLE(more-warnings,
 	AC_HELP_STRING([--disable-more-warnings], [Minimum compiler warnings]),
@@ -487,13 +515,13 @@
 else
     PYTHON=
 fi
-AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
 if test "$PYTHON_INCLUDES" != ""
 then
-    enable_python="yes"
+    enable_python="$enable_libgamin"
 else
     enable_python="no"
 fi
+AM_CONDITIONAL(WITH_PYTHON, test "$enable_python" = "yes")
 AC_SUBST(pythondir)
 AC_SUBST(PYTHON_VERSION)
 AC_SUBST(PYTHON_INCLUDES)
@@ -569,6 +597,11 @@
         source code location:     ${srcdir}
         compiler:                 ${CC}
         compiler flags:           ${AM_CFLAGS} ${CFLAGS}
+
+	build gam_server:         ${enable_server}
+	build libgamin/libfam:    ${enable_libgamin}
+	build python bindings:    ${enable_python}
+	build tests:              ${enable_tests}
                                                                                 
 	backends:                 ${backends}
 	build documentation:      ${build_docs}