diff options
author | Jonathan McCrohan <jmccrohan@gmail.com> | 2020-07-29 23:11:46 +0100 |
---|---|---|
committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2020-07-29 23:11:46 +0100 |
commit | 8deb3660926fe8278948b898b9c1b772eed2e61e (patch) | |
tree | cc46239969468c1f4017da7aac5420664b5bbd22 /configure | |
parent | 1fc41b776f712f321c1f355d391c6a5eaf79ebfa (diff) | |
download | wavemon-8deb3660926fe8278948b898b9c1b772eed2e61e.tar.gz |
New upstream version 0.9.1upstream/0.9.1upstream
Diffstat (limited to '')
-rwxr-xr-x | configure | 67 | ||||
-rw-r--r-- | configure.ac | 20 |
2 files changed, 54 insertions, 33 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for wavemon 0.8.2. +# Generated by GNU Autoconf 2.69 for wavemon 0.9.1. # # Report bugs to <https://github.com/uoaerg/wavemon>. # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='wavemon' PACKAGE_TARNAME='wavemon-current' -PACKAGE_VERSION='0.8.2' -PACKAGE_STRING='wavemon 0.8.2' +PACKAGE_VERSION='0.9.1' +PACKAGE_STRING='wavemon 0.9.1' PACKAGE_BUGREPORT='https://github.com/uoaerg/wavemon' PACKAGE_URL='https://github.com/uoaerg/wavemon' @@ -670,6 +670,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -692,6 +693,7 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +with_libcap ' ac_precious_vars='build_alias host_alias @@ -747,6 +749,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -999,6 +1002,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1136,7 +1148,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1249,7 +1261,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wavemon 0.8.2 to adapt to many kinds of systems. +\`configure' configures wavemon 0.9.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1289,6 +1301,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1314,10 +1327,15 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wavemon 0.8.2:";; + short | recursive ) echo "Configuration of wavemon 0.9.1:";; esac cat <<\_ACEOF +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --without-libcap disable support for libcap + Some influential environment variables: CC C compiler command CFLAGS C compiler flags @@ -1407,7 +1425,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wavemon configure 0.8.2 +wavemon configure 0.9.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1830,7 +1848,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wavemon $as_me 0.8.2, which was +It was created by wavemon $as_me 0.9.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2212,19 +2230,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ac_config_files="$ac_config_files Makefile" -# allow BUILD_DATE to be externally set for build reproducibility -if test "$BUILD_DATE"; then - cat >>confdefs.h <<_ACEOF -#define BUILD_DATE "$BUILD_DATE" -_ACEOF - -else - -cat >>confdefs.h <<_ACEOF -#define BUILD_DATE "`/bin/date`" -_ACEOF - -fi CFLAGS="-O2 -Wall" @@ -3920,7 +3925,20 @@ else as_fn_error $? "pthread library not found" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cap_get_flag in -lcap" >&5 + +# libcap - allow to disable, since e.g. OpenWrt does not use it. +# https://github.com/uoaerg/wavemon/issues/54 + +# Check whether --with-libcap was given. +if test "${with_libcap+set}" = set; then : + withval=$with_libcap; +else + with_libcap=yes +fi + + +if test "x$with_libcap" != xno; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cap_get_flag in -lcap" >&5 $as_echo_n "checking for cap_get_flag in -lcap... " >&6; } if ${ac_cv_lib_cap_cap_get_flag+:} false; then : $as_echo_n "(cached) " >&6 @@ -3965,6 +3983,7 @@ _ACEOF fi +fi # Testing library functions for ac_func in gettimeofday ether_ntohost @@ -4955,7 +4974,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wavemon $as_me 0.8.2, which was +This file was extended by wavemon $as_me 0.9.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5009,7 +5028,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -wavemon config.status 0.8.2 +wavemon config.status 0.9.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 323b96c..c70e825 100644 --- a/configure.ac +++ b/configure.ac @@ -1,19 +1,12 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.64) -AC_INIT([wavemon], [0.8.2], [https://github.com/uoaerg/wavemon], [wavemon-current], +AC_INIT([wavemon], [0.9.1], [https://github.com/uoaerg/wavemon], [wavemon-current], [https://github.com/uoaerg/wavemon]) # Variables AC_CONFIG_AUX_DIR([config]) AC_CONFIG_FILES([Makefile]) -# allow BUILD_DATE to be externally set for build reproducibility -if test "$BUILD_DATE"; then - AC_DEFINE_UNQUOTED(BUILD_DATE, ["$BUILD_DATE"]) -else - AC_DEFINE_UNQUOTED([BUILD_DATE], ["`/bin/date`"], - [date wavemon was last configured and built]) -fi CFLAGS="-O2 -Wall" @@ -62,7 +55,16 @@ AC_CHECK_LIB([m], [pow], [], [AC_MSG_ERROR(math library not found)] AC_CHECK_LIB([ncurses], [waddstr], [], [AC_MSG_ERROR(ncurses library not found)]) AC_CHECK_LIB([pthread], [pthread_create], [CFLAGS="$CFLAGS -pthread"], [AC_MSG_ERROR(pthread library not found)]) -AC_CHECK_LIB([cap], [cap_get_flag]) + +# libcap - allow to disable, since e.g. OpenWrt does not use it. +# https://github.com/uoaerg/wavemon/issues/54 +AC_ARG_WITH([libcap], + [AS_HELP_STRING([--without-libcap], + [disable support for libcap])], + [], + [with_libcap=yes]) + +AS_IF([test "x$with_libcap" != xno], AC_CHECK_LIB([cap], [cap_get_flag])) # Testing library functions AC_CHECK_FUNCS([gettimeofday ether_ntohost], [], |