diff options
Diffstat (limited to '')
| -rwxr-xr-x | heimdall/configure | 92 | ||||
| -rw-r--r-- | heimdall/configure.ac | 2 |
2 files changed, 74 insertions, 20 deletions
diff --git a/heimdall/configure b/heimdall/configure index a82a4aa..c30bd66 100755 --- a/heimdall/configure +++ b/heimdall/configure @@ -746,6 +746,8 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +UDEVADM_FALSE +UDEVADM_TRUE LINUXTARGET_FALSE LINUXTARGET_TRUE MAINT @@ -829,6 +831,7 @@ build_os build_vendor build_cpu build +udevadminstalled DEPS_LIBS DEPS_CFLAGS PKG_CONFIG_LIBDIR @@ -2583,6 +2586,43 @@ else $as_echo "yes" >&6; } fi +# Extract the first word of "udevadm", so it can be a program name with args. +set dummy udevadm; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_udevadminstalled+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$udevadminstalled"; then + ac_cv_prog_udevadminstalled="$udevadminstalled" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_udevadminstalled="" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +udevadminstalled=$ac_cv_prog_udevadminstalled +if test -n "$udevadminstalled"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $udevadminstalled" >&5 +$as_echo "$udevadminstalled" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -5166,13 +5206,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5169: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5209: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5172: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5212: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5175: output\"" >&5) + (eval echo "\"\$as_me:5215: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6378,7 +6418,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6381 "configure"' > conftest.$ac_ext + echo '#line 6421 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8430,11 +8470,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8433: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8473: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8437: \$? = $ac_status" >&5 + echo "$as_me:8477: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8769,11 +8809,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8772: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8812: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8776: \$? = $ac_status" >&5 + echo "$as_me:8816: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8874,11 +8914,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8877: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8917: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8881: \$? = $ac_status" >&5 + echo "$as_me:8921: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8929,11 +8969,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8932: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8972: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8936: \$? = $ac_status" >&5 + echo "$as_me:8976: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11313,7 +11353,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11316 "configure" +#line 11356 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11409,7 +11449,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11412 "configure" +#line 11452 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13365,11 +13405,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13368: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13408: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13372: \$? = $ac_status" >&5 + echo "$as_me:13412: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13464,11 +13504,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13467: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13507: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13471: \$? = $ac_status" >&5 + echo "$as_me:13511: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13516,11 +13556,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13519: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13559: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13523: \$? = $ac_status" >&5 + echo "$as_me:13563: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14557,6 +14597,14 @@ else LINUXTARGET_FALSE= fi + if test x$udevadmninstalled = xtrue; then + UDEVADM_TRUE= + UDEVADM_FALSE='#' +else + UDEVADM_TRUE='#' + UDEVADM_FALSE= +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } @@ -14913,6 +14961,10 @@ if test -z "${LINUXTARGET_TRUE}" && test -z "${LINUXTARGET_FALSE}"; then as_fn_error $? "conditional \"LINUXTARGET\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${UDEVADM_TRUE}" && test -z "${UDEVADM_FALSE}"; then + as_fn_error $? "conditional \"UDEVADM\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : ${CONFIG_STATUS=./config.status} diff --git a/heimdall/configure.ac b/heimdall/configure.ac index 7bda280..712731a 100644 --- a/heimdall/configure.ac +++ b/heimdall/configure.ac @@ -1,6 +1,7 @@ AC_INIT([Heimdall], [0.1], [bug-report@glassechidna.com.au], [heimdall], [http://www.glassechidna.com.au/]) AC_PREREQ([2.59]) PKG_CHECK_MODULES([DEPS], [libusb-1.0 >= 1.0.8]) +AC_PROGRAM_CHECK(udevadminstalled, udevadm) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([1.10 -Wall no-define foreign]) AC_CONFIG_MACRO_DIR([m4]) @@ -38,6 +39,7 @@ case $target in esac AM_CONDITIONAL([LINUXTARGET], [test x$linuxtarget = xtrue]) +AM_CONDITIONAL([UDEVADM], [test x$udevadmninstalled = xtrue]) AC_C_BIGENDIAN |