chiark / gitweb /
configure.ac: fix cross compilation
authorPaul Bender <pebender@san.rr.com>
Wed, 2 Jun 2010 15:35:44 +0000 (17:35 +0200)
committerKay Sievers <kay.sievers@vrfy.org>
Wed, 2 Jun 2010 15:35:44 +0000 (17:35 +0200)
"Be aware that, like most Autoconf macros, they test a
feature of the host machine, and therefore, they die
when cross-compiling"

configure.ac

index 81233bf..df8a95b 100644 (file)
@@ -87,17 +87,21 @@ if test "x$enable_extras" = xyes; then
        PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82)
        AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)])
 
-       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])
+       if test "x$cross_compiling" = "xno" ; then
+               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])
+       fi
        AC_ARG_WITH(pci-ids-path,
-               AS_HELP_STRING([--with-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"
                else
                        AC_MSG_ERROR([pci.ids not found, try --with-pci-ids-path=])
                fi])
+       AC_MSG_CHECKING([for PCI database location])
+       AC_MSG_RESULT([$PCI_DATABASE])
        AC_SUBST(PCI_DATABASE)
 
        AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))