X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=5d1be3f851bea5e1edf78d0e4178aee93e2195d9;hp=28d7286c8338f7d7a5fd521c0755f2082448f4eb;hb=a9c55a882f021318fa728af78f398f4fb7ad7c85;hpb=01ec23582dc0523831059fc05bedde16efd06576

diff --git a/configure.ac b/configure.ac
index 28d7286c8..5d1be3f85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -705,8 +705,8 @@ AM_CONDITIONAL(HAVE_MYHOSTNAME, [test "$have_myhostname" = "yes"])
 # ------------------------------------------------------------------------------
 AC_ARG_WITH(firmware-path,
        AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]],
-          [Firmware search path (default=ROOTPREFIX/lib/firmware/updates:ROOTPREFIX/lib/firmware)]),
-       [], [with_firmware_path="$rootprefix/lib/firmware/updates:$rootprefix/lib/firmware"])
+          [Firmware search path (default="")]),
+       [], [with_firmware_path=""])
 OLD_IFS=$IFS
 IFS=:
 for i in $with_firmware_path; do
@@ -717,7 +717,8 @@ for i in $with_firmware_path; do
        fi
 done
 IFS=$OLD_IFS
-AC_SUBST([FIRMWARE_PATH], [$FIRMWARE_PATH])
+AC_SUBST(FIRMWARE_PATH)
+AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"])
 
 # ------------------------------------------------------------------------------
 AC_ARG_ENABLE([gudev],
@@ -939,7 +940,7 @@ AC_MSG_RESULT([
         Extra stop script:       ${RC_LOCAL_SCRIPT_PATH_STOP}
 
         CFLAGS:                  ${OUR_CFLAGS} ${CFLAGS}
-        CPPLAGS:                 ${OUR_CPPFLAGS} ${CPPFLAGS}
+        CPPFLAGS:                ${OUR_CPPFLAGS} ${CPPFLAGS}
         LDFLAGS:                 ${OUR_LDFLAGS} ${LDFLAGS}
         PYTHON_CFLAGS:           ${PYTHON_CFLAGS}
         PYTHON_LIBS:             ${PYTHON_LIBS}