X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Frlm_sql%2Fdrivers%2Frlm_sql_firebird%2Fconfigure;fp=src%2Fmodules%2Frlm_sql%2Fdrivers%2Frlm_sql_firebird%2Fconfigure;h=9b9fe6611ee8e99aed2445c5175b66708a7b0a51;hb=14a87b81409ef1b07f589b05f013b4e2356b75a3;hp=4ac061631810f9a05398017525475dffd2de98d6;hpb=4ca09576d948b5b74d83a3d981a3b121b87bae20;p=freeradius.git diff --git a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure index 4ac0616..9b9fe66 100755 --- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure +++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/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 @@ -237,7 +237,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. @@ -1210,9 +1210,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 @@ -1255,19 +1255,19 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-firebird-include-dir=DIR - Directory where the firebird includes may be found + Directory where the firebird includes may be found --with-firebird-lib-dir=DIR - Directory where the firebird libraries may be found + Directory where the firebird libraries may be found --with-firebird-dir=DIR Base directory where firebird is installed 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 Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1941,7 +1941,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 @@ -2163,7 +2163,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 @@ -2639,14 +2639,17 @@ sm_lib_safe=`echo "fbclient" | sed 'y%./+-%__p_%'` sm_func_safe=`echo "isc_attach_database" | 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 isc_attach_database in -lfbclient in $try" >&5 $as_echo_n "checking for isc_attach_database in -lfbclient in $try... " >&6; } - LIBS="-L$try -lfbclient $old_LIBS -Wl,-rpath,$try" + LIBS="-lfbclient $old_LIBS" + CPPFLAGS="-L$try -Wl,-rpath,$try $old_CPPFLAGS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ extern char isc_attach_database(); @@ -2660,7 +2663,8 @@ isc_attach_database() _ACEOF if ac_fn_c_try_link "$LINENO"; then : - smart_lib="-L$try -lfbclient -Wl,-rpath,$try" + smart_lib="-lfbclient" + smart_ldflags="-L$try -Wl,-rpath,$try" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } break @@ -2673,6 +2677,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 @@ -2692,8 +2697,8 @@ isc_attach_database() _ACEOF if ac_fn_c_try_link "$LINENO"; then : - smart_lib="-lfbclient" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + smart_lib="-lfbclient" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else @@ -2709,22 +2714,22 @@ if test "x$smart_lib" = "x"; then if test "x$LOCATE" != "x"; then - DIRS= + DIRS= file=libfbclient${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 @@ -2736,22 +2741,22 @@ eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\"" if test "x$LOCATE" != "x"; then - DIRS= + DIRS= file=libfbclient.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 @@ -2764,7 +2769,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 isc_attach_database in -lfbclient in $try" >&5 $as_echo_n "checking for isc_attach_database in -lfbclient in $try... " >&6; } - LIBS="-L$try -lfbclient $old_LIBS -Wl,-rpath,$try" + LIBS="-lfbclient $old_LIBS" + CPPFLAGS="-L$try -Wl,-rpath,$try $old_CPPFLAGS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ extern char isc_attach_database(); @@ -2778,7 +2784,8 @@ isc_attach_database() _ACEOF if ac_fn_c_try_link "$LINENO"; then : - smart_lib="-L$try -lfbclient -Wl,-rpath,$try" + smart_lib="-lfbclient" + smart_ldflags="-L$try -Wl,-rpath,$try" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } break @@ -2791,12 +2798,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_fbclient_isc_attach_database" != xyes; then @@ -2807,15 +2815,28 @@ fi ac_safe=`echo "ibase.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 ibase.h in $try" >&5 $as_echo_n "checking for ibase.h in $try... " >&6; } - CFLAGS="$old_CFLAGS -isystem $try" + CPPFLAGS="-isystem $try $old_CPPFLAGS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -2844,16 +2865,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}/ibase.h" >&5 +$as_echo_n "checking for ${_prefix}/ibase.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 ibase.h" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ibase.h" >&5 $as_echo_n "checking for ibase.h... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include + #include int main () { @@ -2864,15 +2921,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 @@ -2881,36 +2938,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=ibase.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 ibase.h in $try" >&5 $as_echo_n "checking for ibase.h in $try... " >&6; } - CFLAGS="$old_CFLAGS -isystem $try" + CPPFLAGS="-isystem $try $old_CPPFLAGS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -2939,15 +3027,17 @@ $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= + if test "x$ac_cv_header_ibase_h" != xyes; then fail="$fail ibase.h" fi @@ -2971,7 +3061,7 @@ $as_echo "$as_me: WARNING: FAILURE: rlm_sql_firebird requires:$fail." >&2;}; fi mod_ldflags="$SMART_LIBS" -mod_cflags="$SMART_CFLAGS" +mod_cflags="$SMART_CPPFLAGS" @@ -3051,11 +3141,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 @@ -3561,11 +3651,11 @@ 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 Configuration files: $config_files