diff options
Diffstat (limited to '')
| -rwxr-xr-x | configure | 31 | ||||
| -rw-r--r-- | configure.ac | 13 |
2 files changed, 41 insertions, 3 deletions
@@ -633,6 +633,8 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +UDEV_FALSE +UDEV_TRUE BOOST_FALSE BOOST_TRUE EGREP @@ -5385,7 +5387,8 @@ fi done -ac_config_files="$ac_config_files Makefile src/Makefile" +ac_config_files="$ac_config_files Makefile src/Makefile udev/Makefile" + if test "$HAVE_BOOST_REGEX" = yes; then @@ -5397,6 +5400,27 @@ else fi +# UDEV +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking For Udev" >&5 +$as_echo_n "checking For Udev... " >&6; } + if test -d "/etc/udev/rules.d" ; then + UDEV_TRUE= + UDEV_FALSE='#' +else + UDEV_TRUE='#' + UDEV_FALSE= +fi + +if test -z "$UDEV_TRUE"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"yes\"" >&5 +$as_echo "\"yes\"" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"no\"" >&5 +$as_echo "\"no\"" >&6; } +fi + + + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -5538,6 +5562,10 @@ if test -z "${BOOST_TRUE}" && test -z "${BOOST_FALSE}"; then as_fn_error $? "conditional \"BOOST\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${UDEV_TRUE}" && test -z "${UDEV_FALSE}"; then + as_fn_error $? "conditional \"UDEV\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -6135,6 +6163,7 @@ do "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "udev/Makefile") CONFIG_FILES="$CONFIG_FILES udev/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index 5e50b3c..5c9e857 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ([2.69]) AC_CONFIG_AUX_DIR([build-aux]) -AC_INIT([AeroUp], [0.2], [laurentba<at>larueluberlu.net], , [https://github.com/LaurentBa/AeroUp]) +AC_INIT([AeroUp], [0.3.0], [laurentba<at>larueluberlu.net], , [https://github.com/LaurentBa/AeroUp]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([src/global.hpp]) AC_CONFIG_HEADERS([src/config.h]) @@ -78,10 +78,19 @@ AC_CHECK_FUNCS([memset regcomp strtol]) AC_CHECK_FUNCS([bzero memset strtol]) AC_CONFIG_FILES([Makefile - src/Makefile]) + src/Makefile + udev/Makefile]) + AM_CONDITIONAL([BOOST], [test "$HAVE_BOOST_REGEX" = yes]) +# UDEV +AC_MSG_CHECKING([For Udev]) +AM_CONDITIONAL([UDEV], [test -d "/etc/udev/rules.d" ]) +AM_COND_IF([UDEV], [AC_MSG_RESULT(["yes"])], [AC_MSG_RESULT(["no"])]) + + + AC_OUTPUT echo \ |