X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=configure.ac;h=dd6161738aab53fc1bff14861dfbf2659d5592eb;hb=ce1d6d7fb47582588cfbcf0baba0c58e42a90ca6;hp=0ec8e204e3b03406eed6dd06ed55ac94048301a4;hpb=01618658fd82dbc5e6315b639f00e87c6fee3c54;p=elogind.git

diff --git a/configure.ac b/configure.ac
index 0ec8e204e..dd6161738 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,32 +1,29 @@
-AC_INIT(udev,
-	126,
-	kay.sievers@vrfy.org)
-
+AC_INIT([udev],
+	[143],
+	[linux-hotplug@vger.kernel.org])
 AC_PREREQ(2.60)
-AC_CONFIG_SRCDIR(udev/udevd.c)
-AM_INIT_AUTOMAKE([check-news foreign -Wall 1.9 dist-bzip2])
-AC_GNU_SOURCE
+AM_INIT_AUTOMAKE([check-news foreign 1.9 dist-bzip2])
 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 /* libvolume_id version */
-VOLID_LT_CURRENT=0
-VOLID_LT_REVISION=86
-VOLID_LT_AGE=0
-AC_SUBST(VOLID_LT_CURRENT)
-AC_SUBST(VOLID_LT_REVISION)
-AC_SUBST(VOLID_LT_AGE)
-
-AC_PATH_PROG([XSLTPROC], [xsltproc])
+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_CHECK_LIB(c, inotify_init,
-	[AC_DEFINE([HAVE_INOTIFY], 1, [inotify available])],
-	[AC_MSG_WARN([inotify support disabled])])
+dnl /* libudev version */
+LIBUDEV_LT_CURRENT=4
+LIBUDEV_LT_REVISION=0
+LIBUDEV_LT_AGE=4
+AC_SUBST(LIBUDEV_LT_CURRENT)
+AC_SUBST(LIBUDEV_LT_REVISION)
+AC_SUBST(LIBUDEV_LT_AGE)
 
-AC_CHECK_LIB(c, strlcpy,
-	[AC_DEFINE([HAVE_STRLCPY], 1, [strlcpy available])],
-	[])
+AC_PATH_PROG([XSLTPROC], [xsltproc])
 
 AC_ARG_WITH(udev-prefix,
 	AS_HELP_STRING([--with-udev-prefix=DIR], [add prefix to internal udev path names]),
@@ -41,7 +38,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
@@ -49,31 +46,33 @@ 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_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([
 	Makefile
+	libudev/Makefile
+	libudev/libudev.pc
+	libudev/docs/Makefile
+	libudev/docs/version.xml
 	udev/Makefile
 	rules/Makefile
 	extras/Makefile
@@ -88,13 +87,10 @@ 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
 ])
-AC_OUTPUT
 
-echo "
+AC_OUTPUT
+AC_MSG_RESULT([
 	udev $VERSION
 	========
 
@@ -115,4 +111,4 @@ echo "
 	ldflags:		${LDFLAGS}
 
 	xsltproc:		${XSLTPROC}
-"
+])