rules: suse - use NAME for mapper/control

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e81d999d9ea637dc3d8ad611f01114a1927f06ed..3afb94a82cf068a79a38ede6e206bf59b6d6f8fd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,12 @@
-AC_INIT([udev], [143], [linux-hotplug@vger.kernel.org])
+AC_INIT([udev], [147], [linux-hotplug@vger.kernel.org])
 AC_PREREQ(2.60)
-AM_INIT_AUTOMAKE([check-news foreign 1.9 dist-bzip2])
+AM_INIT_AUTOMAKE([check-news foreign 1.9 dist-bzip2 subdir-objects])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_DISABLE_STATIC
 AC_USE_SYSTEM_EXTENSIONS
-dnl AM_SILENT_RULES
 AC_SYS_LARGEFILE
 AC_CONFIG_MACRO_DIR([m4])
-AC_PROG_LIBTOOL
+LT_INIT
 AC_PROG_AWK
 GTK_DOC_CHECK(1.10)
 AC_PREFIX_DEFAULT([/usr])
@@ -15,7 +15,7 @@ AC_PATH_PROG([XSLTPROC], [xsltproc])
 AC_ARG_WITH([rootlibdir],
        AS_HELP_STRING([--with-rootlibdir=DIR], [rootfs directory to install shared libraries]),
        [], [with_rootlibdir=$libdir])
-AC_SUBST([rootlibdir], [$with_rootlibdir])
+AC_SUBST([rootlib_execdir], [$with_rootlibdir])
 
 AC_ARG_WITH([selinux],
        AS_HELP_STRING([--with-selinux], [enable SELinux support]),
@@ -51,6 +51,9 @@ AC_ARG_ENABLE([extras],
        [], [enable_extras=yes])
 if test "x$enable_extras" = xyes; then
        AC_PATH_PROG([GPERF], [gperf])
+       if test -z "$GPERF"; then
+               AC_MSG_ERROR([gperf is needed])
+       fi
 
        PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0])
        AC_SUBST([GLIB_CFLAGS])
@@ -98,34 +101,13 @@ AM_CONDITIONAL([ENABLE_INTROSPECTION], [test "x$enable_introspection" = xyes])
 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
-       extras/ata_id/Makefile
-       extras/cdrom_id/Makefile
-       extras/edd_id/Makefile
-       extras/path_id/Makefile
-       extras/firmware/Makefile
-       extras/collect/Makefile
-       extras/floppy/Makefile
-       extras/fstab_import/Makefile
-       extras/rule_generator/Makefile
-       extras/scsi_id/Makefile
-       extras/usb_id/Makefile
-       extras/v4l_id/Makefile
-       extras/hid2hci/Makefile
-       extras/udev-acl/Makefile
-       extras/usb-db/Makefile
-       extras/gudev/Makefile
+       udev/udev.pc
        extras/gudev/gudev-1.0.pc
        extras/gudev/docs/Makefile
        extras/gudev/docs/version.xml
-       extras/keymap/Makefile
-       extras/modem-modeswitch/Makefile
 ])
 
 AC_OUTPUT
@@ -137,7 +119,7 @@ AC_MSG_RESULT([
        sysconfdir:             ${sysconfdir}
        sbindir:                ${sbindir}
        libdir:                 ${libdir}
-       rootlibdir:             ${rootlibdir}
+       rootlibdir:             ${rootlib_execdir}
        libexecdir:             ${libexecdir}
 
        datarootdir:            ${datarootdir}