diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-04-14 19:52:33 +0200 |
---|---|---|
committer | Kay Sievers <kay.sievers@vrfy.org> | 2009-04-14 19:52:33 +0200 |
commit | 655193fdbe876506009dbb4d87e4cc9bf3ab32d1 (patch) | |
tree | 65b2973e866860dfc15105950429f54a27f38f0f /configure.ac | |
parent | a06e510fb08293c0e2b4bdd42e42f85f0107f387 (diff) |
sync with and depend on recent udev
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 77 |
1 files changed, 16 insertions, 61 deletions
diff --git a/configure.ac b/configure.ac index 48d6a2d..bd09005 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([udev-extras], - [20090226], + [20090414], [linux-hotplug@vger.kernel.org]) AC_PREREQ(2.60) AM_INIT_AUTOMAKE([check-news foreign 1.9 subdir-objects dist-bzip2]) @@ -17,57 +17,16 @@ dnl prefix is /usr, exec_prefix in /, if overridden exec_prefix follows prefix AC_PREFIX_DEFAULT([/usr]) test "$prefix" = NONE && test "$exec_prefix" = NONE && exec_prefix= -dnl ensure that when the Automake generated makefile calls aclocal, -dnl it honours the $ACLOCAL_FLAGS environment variable -ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" -if test -n "$ac_macro_dir"; then - ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" -fi -AC_SUBST([ACLOCAL_AMFLAGS]) - PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12) AC_SUBST(LIBUSB_CFLAGS) AC_SUBST(LIBUSB_LIBS) -AC_ARG_WITH(usb-db, AC_HELP_STRING([--with-usb-db], [Build modem prober]),[],[with_usb_db=yes]) -AM_CONDITIONAL(WITH_USB_DB, test "x$with_usb_db" = "xyes") -if test "x$with_usb_db" = "xyes"; then - PKG_CHECK_MODULES(LIBUDEV, libudev) - AC_SUBST(LIBUDEV_CFLAGS) - AC_SUBST(LIBUDEV_LIBS) -fi +PKG_CHECK_MODULES(LIBUDEV, libudev >= 141) +AC_SUBST(LIBUDEV_CFLAGS) +AC_SUBST(LIBUDEV_LIBS) AC_PATH_PROG([XSLTPROC], [xsltproc]) -AC_ARG_ENABLE(more-warnings, -AS_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings]), set_more_warnings="$enableval",set_more_warnings=yes) -AC_MSG_CHECKING(for more warnings, including -Werror) -if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then - AC_MSG_RESULT(yes) - CFLAGS="-Wall -Werror $CFLAGS" - - for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \ - -Wdeclaration-after-statement -Wstrict-prototypes \ - -Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \ - -fno-strict-aliasing; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - if test $has_option = no; then - CFLAGS="$SAVE_CFLAGS" - fi - AC_MSG_RESULT($has_option) - unset has_option - unset SAVE_CFLAGS - done - unset option -else - AC_MSG_RESULT(no) -fi - AC_ARG_WITH(udev-prefix, AS_HELP_STRING([--with-udev-prefix=DIR], [add prefix to internal udev path names]), [], [with_udev_prefix='${exec_prefix}']) @@ -79,31 +38,27 @@ AC_DEFINE(LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE, 1, [I know the API is sub AC_CHECK_FILES([/usr/share/usb.ids], [usbids=/usr/share/usb.ids]) AC_CHECK_FILES([/usr/share/hwdata/usb.ids], [usbids=/usr/share/hwdata/usb.ids]) AC_CHECK_FILES([/usr/share/misc/usb.ids], [usbids=/usr/share/misc/usb.ids]) - AC_ARG_WITH(usb-ids-path, AS_HELP_STRING([--usb-ids-path=DIR], [Path to usb.ids file]), [USB_DATABASE=${withval}], - [if test -n "$usbids" ; then - USB_DATABASE="$usbids" - else - AC_MSG_ERROR([usb.ids not found, try --with-usb-ids-path=]) - fi]) - + [if test -n "$usbids" ; then + USB_DATABASE="$usbids" + else + AC_MSG_ERROR([usb.ids not found, try --with-usb-ids-path=]) + fi]) AC_SUBST(USB_DATABASE) AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids]) 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]), [PCI_DATABASE=${withval}], - [if test -n "$pciids" ; then - PCI_DATABASE="$pciids" - else - AC_MSG_ERROR([pci.ids not found, try --with-pci-ids-path=]) - fi]) - + [if test -n "$pciids" ; then + PCI_DATABASE="$pciids" + else + AC_MSG_ERROR([pci.ids not found, try --with-pci-ids-path=]) + fi]) AC_SUBST(PCI_DATABASE) AC_CONFIG_FILES([ @@ -125,8 +80,8 @@ echo " datarootdir: ${datarootdir} mandir: ${mandir} - usb.ids: ${USB_DATABASE} - pci.ids: ${PCI_DATABASE} + usb.ids: ${USB_DATABASE} + pci.ids: ${PCI_DATABASE} compiler: ${CC} cflags: ${CFLAGS} |