X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Frlm_ippool%2Fconfigure;h=38f49ce93b0d1d9beba1815874c6d4dd93361de2;hb=254f0dfedf4dc550f10e09e50f7769a62ff1a3e6;hp=f81422af89ffc3cdc06a8ee0d8156255b409c4dc;hpb=393752a770db1610700589f7f89a0e6871f98c16;p=freeradius.git diff --git a/src/modules/rlm_ippool/configure b/src/modules/rlm_ippool/configure index f81422a..38f49ce 100755 --- a/src/modules/rlm_ippool/configure +++ b/src/modules/rlm_ippool/configure @@ -157,7 +157,7 @@ $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 as_fn_exit 255 fi # We don't want this to propagate to other subprocesses. - { _as_can_reexec=; unset _as_can_reexec;} + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -238,7 +238,7 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : export CONFIG_SHELL - # We cannot yet assume a decent shell, so we have to provide a + # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also # works around shells that cannot unset nonexistent variables. # Preserve -v and -x to the replacement shell. @@ -1214,9 +1214,9 @@ Configuration: Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1259,10 +1259,10 @@ Some influential environment variables: CC C compiler command CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory + nonstandard directory LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if - you have headers in a nonstandard directory + you have headers in a nonstandard directory CPP C preprocessor Use these variables to override the choices made by `configure' or to help @@ -1987,7 +1987,7 @@ else fi if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -2209,7 +2209,7 @@ $as_echo "$ac_try_echo"; } >&5 if test -s conftest.err; then sed '10a\ ... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 + 10q' conftest.err >conftest.er1 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err @@ -2820,15 +2820,28 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_safe=`echo "gdbm.h" | sed 'y%./+-%__pm%'` -old_CFLAGS="$CFLAGS" +old_CPPFLAGS="$CPPFLAGS" smart_include= -smart_include_dir= +smart_include_dir="/usr/local/include /opt/include" -if test "x$smart_try_dir" != "x"; then - for try in $smart_try_dir; do +_smart_try_dir= +_smart_include_dir= + +for _prefix in $smart_prefix ""; do + for _dir in $smart_try_dir; do + _smart_try_dir="${_smart_try_dir} ${_dir}/${_prefix}" + done + + for _dir in $smart_include_dir; do + _smart_include_dir="${_smart_include_dir} ${_dir}/${_prefix}" + done +done + +if test "x$_smart_try_dir" != "x"; then + for try in $_smart_try_dir; do { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdbm.h in $try" >&5 $as_echo_n "checking for gdbm.h in $try... " >&6; } - CFLAGS="$old_CFLAGS -isystem $try" + CPPFLAGS="-isystem $try $old_CPPFLAGS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -2857,16 +2870,52 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done - CFLAGS="$old_CFLAGS" + CPPFLAGS="$old_CPPFLAGS" +fi + +if test "x$smart_include" = "x"; then + for _prefix in $smart_prefix; do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${_prefix}/gdbm.h" >&5 +$as_echo_n "checking for ${_prefix}/gdbm.h... " >&6; } + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include +int +main () +{ +int a = 1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + smart_include="-isystem ${_prefix}/" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + break + +else + + smart_include= + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done fi if test "x$smart_include" = "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdbm.h" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdbm.h" >&5 $as_echo_n "checking for gdbm.h... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include + #include int main () { @@ -2877,15 +2926,15 @@ int a = 1; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - smart_include=" " - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + smart_include=" " + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - break + break else - smart_include= - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + smart_include= + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2894,36 +2943,67 @@ fi if test "x$smart_include" = "x"; then + for prefix in $smart_prefix; do + + +if test "x$LOCATE" != "x"; then + DIRS= + file="${_prefix}/${1}" + + for x in `${LOCATE} $file 2>/dev/null`; do + base=`echo $x | sed "s%/${file}%%"` + if test "x$x" = "x$base"; then + continue; + fi + + dir=`${DIRNAME} $x 2>/dev/null` + exclude=`echo ${dir} | ${GREP} /home` + if test "x$exclude" != "x"; then + continue + fi + + already=`echo \$_smart_include_dir ${DIRS} | ${GREP} ${dir}` + if test "x$already" = "x"; then + DIRS="$DIRS $dir" + fi + done +fi + +eval "_smart_include_dir=\"\$_smart_include_dir $DIRS\"" + + done + if test "x$LOCATE" != "x"; then - DIRS= + DIRS= file=gdbm.h for x in `${LOCATE} $file 2>/dev/null`; do - base=`echo $x | sed "s%/${file}%%"` + base=`echo $x | sed "s%/${file}%%"` if test "x$x" = "x$base"; then continue; fi dir=`${DIRNAME} $x 2>/dev/null` - exclude=`echo ${dir} | ${GREP} /home` + exclude=`echo ${dir} | ${GREP} /home` if test "x$exclude" != "x"; then continue fi - already=`echo \$smart_include_dir ${DIRS} | ${GREP} ${dir}` + already=`echo \$_smart_include_dir ${DIRS} | ${GREP} ${dir}` if test "x$already" = "x"; then DIRS="$DIRS $dir" fi done fi -eval "smart_include_dir=\"\$smart_include_dir $DIRS\"" +eval "_smart_include_dir=\"\$_smart_include_dir $DIRS\"" - for try in $smart_include_dir /usr/local/include /opt/include; do + + for try in $_smart_include_dir; do { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdbm.h in $try" >&5 $as_echo_n "checking for gdbm.h in $try... " >&6; } - CFLAGS="$old_CFLAGS -isystem $try" + CPPFLAGS="-isystem $try $old_CPPFLAGS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -2952,29 +3032,34 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done - CFLAGS="$old_CFLAGS" + CPPFLAGS="$old_CPPFLAGS" fi if test "x$smart_include" != "x"; then eval "ac_cv_header_$ac_safe=yes" - CFLAGS="$old_CFLAGS $smart_include" - SMART_CFLAGS="$SMART_CFLAGS $smart_include" + CPPFLAGS="$smart_include $old_CPPFLAGS" + SMART_CPPFLAGS="$smart_include $SMART_CPPFLAGS" fi +smart_prefix= + sm_lib_safe=`echo "gdbm" | sed 'y%./+-%__p_%'` sm_func_safe=`echo "gdbm_open" | sed 'y%./+-%__p_%'` old_LIBS="$LIBS" +old_CPPFLAGS="$CPPFLAGS" smart_lib= +smart_ldflags= smart_lib_dir= if test "x$smart_try_dir" != "x"; then for try in $smart_try_dir; do { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdbm_open in -lgdbm in $try" >&5 $as_echo_n "checking for gdbm_open in -lgdbm in $try... " >&6; } - LIBS="-L$try -lgdbm $old_LIBS -Wl,-rpath,$try" + LIBS="-lgdbm $old_LIBS" + CPPFLAGS="-L$try -Wl,-rpath,$try $old_CPPFLAGS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ extern char gdbm_open(); @@ -2988,7 +3073,8 @@ gdbm_open() _ACEOF if ac_fn_c_try_link "$LINENO"; then : - smart_lib="-L$try -lgdbm -Wl,-rpath,$try" + smart_lib="-lgdbm" + smart_ldflags="-L$try -Wl,-rpath,$try" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } break @@ -3001,6 +3087,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext done LIBS="$old_LIBS" + CPPFLAGS="$old_CPPFLAGS" fi if test "x$smart_lib" = "x"; then @@ -3020,8 +3107,8 @@ gdbm_open() _ACEOF if ac_fn_c_try_link "$LINENO"; then : - smart_lib="-lgdbm" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + smart_lib="-lgdbm" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else @@ -3037,22 +3124,22 @@ if test "x$smart_lib" = "x"; then if test "x$LOCATE" != "x"; then - DIRS= + DIRS= file=libgdbm${libltdl_cv_shlibext} for x in `${LOCATE} $file 2>/dev/null`; do - base=`echo $x | sed "s%/${file}%%"` + base=`echo $x | sed "s%/${file}%%"` if test "x$x" = "x$base"; then continue; fi dir=`${DIRNAME} $x 2>/dev/null` - exclude=`echo ${dir} | ${GREP} /home` + exclude=`echo ${dir} | ${GREP} /home` if test "x$exclude" != "x"; then continue fi - already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}` + already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}` if test "x$already" = "x"; then DIRS="$DIRS $dir" fi @@ -3064,22 +3151,22 @@ eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\"" if test "x$LOCATE" != "x"; then - DIRS= + DIRS= file=libgdbm.a for x in `${LOCATE} $file 2>/dev/null`; do - base=`echo $x | sed "s%/${file}%%"` + base=`echo $x | sed "s%/${file}%%"` if test "x$x" = "x$base"; then continue; fi dir=`${DIRNAME} $x 2>/dev/null` - exclude=`echo ${dir} | ${GREP} /home` + exclude=`echo ${dir} | ${GREP} /home` if test "x$exclude" != "x"; then continue fi - already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}` + already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}` if test "x$already" = "x"; then DIRS="$DIRS $dir" fi @@ -3092,7 +3179,8 @@ eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\"" for try in $smart_lib_dir /usr/local/lib /opt/lib; do { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdbm_open in -lgdbm in $try" >&5 $as_echo_n "checking for gdbm_open in -lgdbm in $try... " >&6; } - LIBS="-L$try -lgdbm $old_LIBS -Wl,-rpath,$try" + LIBS="-lgdbm $old_LIBS" + CPPFLAGS="-L$try -Wl,-rpath,$try $old_CPPFLAGS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ extern char gdbm_open(); @@ -3106,7 +3194,8 @@ gdbm_open() _ACEOF if ac_fn_c_try_link "$LINENO"; then : - smart_lib="-L$try -lgdbm -Wl,-rpath,$try" + smart_lib="-lgdbm" + smart_ldflags="-L$try -Wl,-rpath,$try" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } break @@ -3119,12 +3208,13 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext done LIBS="$old_LIBS" + CPPFLAGS="$old_CPPFLAGS" fi if test "x$smart_lib" != "x"; then eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes" - LIBS="$smart_lib $old_LIBS" - SMART_LIBS="$smart_lib $SMART_LIBS" + LIBS="$smart_ldflags $smart_lib $old_LIBS" + SMART_LIBS="$smart_ldflags $smart_lib $SMART_LIBS" fi if test "x$ac_cv_lib_gdbm_gdbm_open" != "xyes"; then @@ -3334,8 +3424,8 @@ if test x"$targetname" != x""; then ippool_install="rlm_ippool_install" fi -mod_ldflags=$SMART_LIBS -mod_cflags=$SMART_CFLAGS +mod_ldflags="$SMART_LIBS" +mod_cflags="$SMART_CPPFLAGS" @@ -3419,11 +3509,11 @@ $as_echo "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else - case $cache_file in #( - */* | ?:*) + case $cache_file in #( + */* | ?:*) mv -f confcache "$cache_file"$$ && mv -f "$cache_file"$$ "$cache_file" ;; #( - *) + *) mv -f confcache "$cache_file" ;; esac fi @@ -3897,13 +3987,13 @@ Usage: $0 [OPTION]... [TAG]... -V, --version print version number and configuration settings, then exit --config print configuration, then exit -q, --quiet, --silent - do not print progress messages + do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + instantiate the configuration file FILE --header=FILE[:TEMPLATE] - instantiate the configuration header FILE + instantiate the configuration header FILE Configuration files: $config_files