X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=69c115dba925298f0525c77f08e9c5fca31ab8de;hp=e81d999d9ea637dc3d8ad611f01114a1927f06ed;hb=9193c7df9ae55fd2d22ccb32473ed65bdec39f8b;hpb=181368a3b26329f77a93b06a5d2b285d4bf5f8e3 diff --git a/configure.ac b/configure.ac index e81d999d9..69c115dba 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ -AC_INIT([udev], [143], [linux-hotplug@vger.kernel.org]) +AC_INIT([udev], [145], [linux-hotplug@vger.kernel.org]) AC_PREREQ(2.60) AM_INIT_AUTOMAKE([check-news foreign 1.9 dist-bzip2]) +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 @@ -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,11 +101,13 @@ AM_CONDITIONAL([ENABLE_INTROSPECTION], [test "x$enable_introspection" = xyes]) AC_CONFIG_HEADERS(config.h) AC_CONFIG_FILES([ Makefile + docs/Makefile libudev/Makefile libudev/libudev.pc libudev/docs/Makefile libudev/docs/version.xml udev/Makefile + udev/udev.pc rules/Makefile extras/Makefile extras/ata_id/Makefile @@ -137,7 +142,7 @@ AC_MSG_RESULT([ sysconfdir: ${sysconfdir} sbindir: ${sbindir} libdir: ${libdir} - rootlibdir: ${rootlibdir} + rootlibdir: ${rootlib_execdir} libexecdir: ${libexecdir} datarootdir: ${datarootdir}