configure.ac - fix typo in --with-pci-ids-path option

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a318768cd066c322726ff6130a2a591a085525d6..492fa022429bf096c2b4415b805c51c8c86969d7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,12 @@
-AC_INIT([udev], [146], [linux-hotplug@vger.kernel.org])
+AC_INIT([udev], [152], [linux-hotplug@vger.kernel.org])
 AC_PREREQ(2.60)
-AM_INIT_AUTOMAKE([check-news foreign 1.9 dist-bzip2 subdir-objects])
+AM_INIT_AUTOMAKE([check-news foreign 1.10 dist-bzip2 subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_DISABLE_STATIC
 AC_USE_SYSTEM_EXTENSIONS
 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])
@@ -73,7 +73,7 @@ if test "x$enable_extras" = xyes; then
        AC_CHECK_FILES([/usr/share/hwdata/pci.ids], [pciids=/usr/share/hwdata/pci.ids])
        AC_CHECK_FILES([/usr/share/misc/pci.ids], [pciids=/usr/share/misc/pci.ids])
        AC_ARG_WITH(pci-ids-path,
-               AS_HELP_STRING([--pci-ids-path=DIR], [Path to pci.ids file]),
+               AS_HELP_STRING([--with-pci-ids-path=DIR], [Path to pci.ids file]),
                [PCI_DATABASE=${withval}],
                [if test -n "$pciids" ; then
                        PCI_DATABASE="$pciids"
@@ -81,20 +81,23 @@ if test "x$enable_extras" = xyes; then
                        AC_MSG_ERROR([pci.ids not found, try --with-pci-ids-path=])
                fi])
        AC_SUBST(PCI_DATABASE)
+
+       AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))
+       AC_SUBST([INCLUDE_PREFIX], [$(echo '#include <linux/input.h>' | eval $ac_cpp -E - | sed -n '/linux\/input.h/ {s:.*"\(.*\)/linux/input.h".*:\1:; p; q}')])
 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])
 
@@ -105,11 +108,9 @@ AC_CONFIG_FILES([
        libudev/docs/Makefile
        libudev/docs/version.xml
        udev/udev.pc
-       extras/gudev/Makefile
        extras/gudev/gudev-1.0.pc
        extras/gudev/docs/Makefile
        extras/gudev/docs/version.xml
-       extras/keymap/Makefile
 ])
 
 AC_OUTPUT
@@ -128,6 +129,8 @@ AC_MSG_RESULT([
        mandir:                 ${mandir}
        includedir:             ${includedir}
 
+       include_prefix:         ${INCLUDE_PREFIX}
+
        logging:                ${enable_logging}
        debug:                  ${enable_debug}
        selinux:                ${with_selinux}