From: Marcel Holtmann Date: Tue, 11 Dec 2012 14:05:24 +0000 (+0100) Subject: build: Add option for providing the udev directory X-Git-Tag: android-x86-4.4-r3~10315 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a7d4c2296f05787c5318236a467c3716ef4675ac;p=android-x86%2Fexternal-bluetooth-bluez.git build: Add option for providing the udev directory --- diff --git a/configure.ac b/configure.ac index 354c8fa84..e71dc3414 100644 --- a/configure.ac +++ b/configure.ac @@ -127,23 +127,23 @@ if (test "${enable_tools}" != "no" && test "${enable_udev}" != "no"); then AC_CHECK_LIB(udev, udev_hwdb_new, AC_DEFINE(HAVE_UDEV_HWDB_NEW, 1, [Define to 1 if you have the udev_hwdb_new() function.])) - UDEV_DATADIR="`$PKG_CONFIG --variable=udevdir udev`" - if (test -z "${UDEV_DATADIR}"); then - UDEV_DATADIR="${sysconfdir}/udev/rules.d" - else - UDEV_DATADIR="${UDEV_DATADIR}/rules.d" - fi - AC_SUBST(UDEV_DATADIR) - UDEV_DIR="`$PKG_CONFIG --variable=udevdir udev`" - if (test -z "${UDEV_DIR}"); then - UDEV_DIR="${libdir}/udev" - fi - AC_SUBST(UDEV_DIR) fi AC_SUBST(UDEV_CFLAGS) AC_SUBST(UDEV_LIBS) AM_CONDITIONAL(UDEV, test "${enable_udev}" != "no") +AC_ARG_WITH([udevdir], AC_HELP_STRING([--with-udevdir=DIR], + [path to udev directory]), [path_udevdir=${withval}]) +if (test "${enable_udev}" != "no" && test -z "${path_udevdir}"); then + AC_MSG_CHECKING([udev directory]) + path_udevdir="`$PKG_CONFIG --variable=udevdir udev`" + if (test -z "${path_udevdir}"); then + AC_MSG_ERROR(udev directory is required) + fi + AC_MSG_RESULT([${path_udevdir}]) + AC_SUBST(UDEV_DIR, [${path_udevdir}]) +fi + AM_CONDITIONAL(HID2HCI, test "${enable_tools}" != "no" && test "${enable_udev}" != "no" && test "${enable_usb}" != "no")