X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=9571c902f8746f732eb56e184d2d59c232cea97d;hp=cdd85efb2d8fd46a19c7c988e28886662bb3ff4e;hb=af23b83ea714756aa4bfed7f7501739c69428e40;hpb=3e18fb062f16e99cd3b308089f1459f4eeb33003

diff --git a/configure.ac b/configure.ac
index cdd85efb2..9571c902f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,36 +1,22 @@
 AC_INIT([udev],
-	[136],
+	[143],
 	[linux-hotplug@vger.kernel.org])
 AC_PREREQ(2.60)
-AC_CONFIG_SRCDIR([udev/udevd.c])
 AM_INIT_AUTOMAKE([check-news foreign 1.9 dist-bzip2])
-AC_GNU_SOURCE
 AC_DISABLE_STATIC
+AC_USE_SYSTEM_EXTENSIONS
+dnl AM_SILENT_RULES
 AC_SYS_LARGEFILE
+AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_LIBTOOL
+GTK_DOC_CHECK(1.10)
 
-dnl /* libudev version */
-LIBUDEV_LT_CURRENT=0
-LIBUDEV_LT_REVISION=6
-LIBUDEV_LT_AGE=0
-AC_SUBST(LIBUDEV_LT_CURRENT)
-AC_SUBST(LIBUDEV_LT_REVISION)
-AC_SUBST(LIBUDEV_LT_AGE)
-
-dnl /* libvolume_id version */
-VOLID_LT_CURRENT=1
-VOLID_LT_REVISION=6
-VOLID_LT_AGE=0
-AC_SUBST(VOLID_LT_CURRENT)
-AC_SUBST(VOLID_LT_REVISION)
-AC_SUBST(VOLID_LT_AGE)
+dnl /* prefix is /usr, exec_prefix is /, if overridden exec_prefix follows prefix */
+AC_PREFIX_DEFAULT([/usr])
+test "$prefix" = NONE && test "$exec_prefix" = NONE && exec_prefix=
 
 AC_PATH_PROG([XSLTPROC], [xsltproc])
 
-AC_CHECK_LIB(c, inotify_init,
-	[AC_DEFINE([HAVE_INOTIFY], 1, [inotify available])],
-	[AC_MSG_WARN([inotify support disabled])])
-
 AC_ARG_WITH(udev-prefix,
 	AS_HELP_STRING([--with-udev-prefix=DIR], [add prefix to internal udev path names]),
 	[], [with_udev_prefix='${exec_prefix}'])
@@ -44,7 +30,7 @@ libdir_name=$with_libdir_name
 AC_SUBST(libdir_name)
 
 AC_ARG_WITH(selinux,
-	AS_HELP_STRING([--with-selinux], [compile with SELinux support]),
+	AS_HELP_STRING([--with-selinux], [enable SELinux support]),
 	[], with_selinux=no)
 if test "x$with_selinux" = xyes; then
 	LIBS_save=$LIBS
@@ -52,34 +38,44 @@ if test "x$with_selinux" = xyes; then
 		[],
 		AC_MSG_ERROR([SELinux selected but libselinux not found]))
 	LIBS=$LIBS_save
-	AC_DEFINE(USE_SELINUX, [1] ,[compile with SELinux support])
-	SELINUX_LIBS="-lselinux"
+	SELINUX_LIBS="-lselinux -lsepol"
+	AC_DEFINE(WITH_SELINUX, [1] ,[SELinux support.])
 fi
 AC_SUBST([SELINUX_LIBS])
-AM_CONDITIONAL(USE_SELINUX, [test "x$with_selinux" = xyes], [compile with SELinux support])
+AM_CONDITIONAL(WITH_SELINUX, [test "x$with_selinux" = xyes])
 
 AC_ARG_ENABLE(debug,
-	AS_HELP_STRING([--enable-debug], [turn on debugging]),
+	AS_HELP_STRING([--enable-debug], [enable debug messages]),
 	[], enable_debug=no)
 if test "x$enable_debug" = "xyes"; then
-	AC_DEFINE(DEBUG, [1] ,[Compile in debug messages])
-	DEBUG_CFLAGS="-DDEBUG"
+	AC_DEFINE(ENABLE_DEBUG, [1], [Debug messages.])
 fi
-AC_SUBST(DEBUG_CFLAGS)
 
 AC_ARG_ENABLE(logging,
-	AS_HELP_STRING([--disable-logging], [turn off logging/syslog]),
+	AS_HELP_STRING([--disable-logging], [disable system logging]),
 	[], enable_logging=yes)
-if test "x$enable_logging" != "xno"; then
-	AC_DEFINE(USE_LOG, [1] ,[Use logging/syslog])
+if test "x$enable_logging" = "xyes"; then
+	AC_DEFINE(ENABLE_LOGGING, [1], [System logging.])
+fi
+
+AC_ARG_ENABLE([extras],
+	AS_HELP_STRING([--enable-extras], [enable extras with external dependencies]),
+	[], [enable_extras=no])
+if test "x$enable_extras" = xyes; then
+	PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0])
+	AC_SUBST([GLIB_CFLAGS])
+	AC_SUBST([GLIB_LIBS])
 fi
+AM_CONDITIONAL([ENABLE_EXTRAS], [test "x$enable_extras" = xyes])
 
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([
 	Makefile
+	libudev/Makefile
+	libudev/libudev.pc
+	libudev/docs/Makefile
+	libudev/docs/version.xml
 	udev/Makefile
-	udev/lib/Makefile
-	udev/lib/libudev.pc
 	rules/Makefile
 	extras/Makefile
 	extras/ata_id/Makefile
@@ -93,13 +89,11 @@ AC_CONFIG_FILES([
 	extras/rule_generator/Makefile
 	extras/scsi_id/Makefile
 	extras/usb_id/Makefile
-	extras/volume_id/Makefile
-	extras/volume_id/lib/Makefile
-	extras/volume_id/lib/libvolume_id.pc
+	extras/udev-acl/Makefile
 ])
-AC_OUTPUT
 
-echo "
+AC_OUTPUT
+AC_MSG_RESULT([
 	udev $VERSION
 	========
 
@@ -119,5 +113,7 @@ echo "
 	cflags:			${CFLAGS}
 	ldflags:		${LDFLAGS}
 
+	extras:			${enable_extras}
+
 	xsltproc:		${XSLTPROC}
-"
+])