keymap: move force-release directory

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index bba82ee7bd1b5ecf973323e16098f19de61d5f16..08df0a9dec17dd46eaaf8380aee13dd12a56e412 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,37 +1,25 @@
-AC_INIT([udev],
-       [143],
-       [linux-hotplug@vger.kernel.org])
+AC_INIT([udev], [151], [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)
-
-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_ARG_WITH(udev-prefix,
-       AS_HELP_STRING([--with-udev-prefix=DIR], [add prefix to internal udev path names]),
-       [], [with_udev_prefix='${exec_prefix}'])
-udev_prefix=$with_udev_prefix
-AC_SUBST(udev_prefix)
-
-AC_ARG_WITH(libdir-name,
-       AS_HELP_STRING([--with-libdir-name=DIR], [name of the arch lib directory]),
-       [], [with_libdir_name=lib])
-libdir_name=$with_libdir_name
-AC_SUBST(libdir_name)
+AC_ARG_WITH([rootlibdir],
+       AS_HELP_STRING([--with-rootlibdir=DIR], [rootfs directory to install shared libraries]),
+       [], [with_rootlibdir=$libdir])
+AC_SUBST([rootlib_execdir], [$with_rootlibdir])
 
-AC_ARG_WITH(selinux,
+AC_ARG_WITH([selinux],
        AS_HELP_STRING([--with-selinux], [enable SELinux support]),
-       [], with_selinux=no)
+       [], [with_selinux=no])
 if test "x$with_selinux" = xyes; then
        LIBS_save=$LIBS
        AC_CHECK_LIB(selinux, getprevcon,
@@ -44,14 +32,14 @@ fi
 AC_SUBST([SELINUX_LIBS])
 AM_CONDITIONAL(WITH_SELINUX, [test "x$with_selinux" = xyes])
 
-AC_ARG_ENABLE(debug,
+AC_ARG_ENABLE([debug],
        AS_HELP_STRING([--enable-debug], [enable debug messages]),
-       [], enable_debug=no)
+       [], [enable_debug=no])
 if test "x$enable_debug" = "xyes"; then
        AC_DEFINE(ENABLE_DEBUG, [1], [Debug messages.])
 fi
 
-AC_ARG_ENABLE(logging,
+AC_ARG_ENABLE([logging],
        AS_HELP_STRING([--disable-logging], [disable system logging]),
        [], enable_logging=yes)
 if test "x$enable_logging" = "xyes"; then
@@ -62,6 +50,11 @@ AC_ARG_ENABLE([extras],
        AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]),
        [], [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])
        AC_SUBST([GLIB_LIBS])
@@ -92,45 +85,26 @@ fi
 AM_CONDITIONAL([ENABLE_EXTRAS], [test "x$enable_extras" = xyes])
 
 AC_ARG_ENABLE([introspection],
-       AS_HELP_STRING([--enable-introspection], [enable GObject introspection]),
-       [], [enable_introspection=no])
+       AS_HELP_STRING([--disable-introspection], [disable GObject introspection]),
+       [], [enable_introspection=yes])
 if test "x$enable_introspection" = xyes; then
        PKG_CHECK_MODULES([INTROSPECTION], [gobject-introspection-1.0 >= 0.6.2])
        AC_DEFINE([ENABLE_INTROSPECTION], [1], [enable GObject introspection support])
        AC_SUBST([G_IR_SCANNER], [$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)])
        AC_SUBST([G_IR_COMPILER], [$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)])
        AC_SUBST([G_IR_GENERATE], [$($PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0)])
-       AC_SUBST([GIRDIR], [$($PKG_CONFIG --variable=girdir gobject-introspection-1.0)])
-       AC_SUBST([GIRTYPELIBDIR], [$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)])
+       AC_SUBST([GIRDIR], [$($PKG_CONFIG --define-variable=datadir=${datadir} --variable=girdir gobject-introspection-1.0)])
+       AC_SUBST([GIRTYPELIBDIR], [$($PKG_CONFIG --define-variable=libdir=${libdir} --variable=typelibdir gobject-introspection-1.0)])
 fi
 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
@@ -142,10 +116,12 @@ AC_MSG_RESULT([
        ========
 
        prefix:                 ${prefix}
-       exec_prefix:            ${exec_prefix}
-       udev_prefix:            ${udev_prefix}
+       sysconfdir:             ${sysconfdir}
+       sbindir:                ${sbindir}
        libdir:                 ${libdir}
-       libdir_name:            ${libdir_name}
+       rootlibdir:             ${rootlib_execdir}
+       libexecdir:             ${libexecdir}
+
        datarootdir:            ${datarootdir}
        mandir:                 ${mandir}
        includedir:             ${includedir}
@@ -165,4 +141,5 @@ AC_MSG_RESULT([
        pci.ids:                ${PCI_DATABASE}
 
        xsltproc:               ${XSLTPROC}
+       gperf:                  ${GPERF}
 ])