From 7e38e77c605ee3e0b3ea3fa2d7e9bf9e9730d3b5 Mon Sep 17 00:00:00 2001 From: zacheiss Date: Tue, 30 Apr 2002 02:00:59 +0000 Subject: [PATCH] Include link line for Oracle 8 Pro*C. Regenerate configure. --- configure | 133 ++++++++++++++++++++++++++------------------------- configure.in | 5 +- 2 files changed, 72 insertions(+), 66 deletions(-) diff --git a/configure b/configure index 2fb96642..5098aea6 100755 --- a/configure +++ b/configure @@ -1979,9 +1979,12 @@ echo "configure:1976: checking Pro*C version" >&5 2.0.6.0.0) SQL_LIBS="-L$oracle/lib -lsql $oracle/lib/osntab.o -lsqlnet -lora -lsqlnet -lnlsrtl -lcv6 -lcore -lnlsrtl -lcore -lm" ;; - *) + 2.2.4.0.0) SQL_LIBS="-L$oracle/lib -lclntsh -lxa -lsql -lsqlnet -lncr -lsqlnet -lclient -lcommon -lgeneric -lsqlnet -lncr -lsqlnet -lclient -lcommon -lgeneric -lepc -lnlsrtl3 -lc3v6 -lcore3 -lnlsrtl3 -lcore3 -lnlsrtl3 `cat $oracle/rdbms/lib/sysliblist` -lm -lthread" ;; + *) + SQL_LIBS="-L$oracle/lib -lclntsh -lsql8 -lclient8 -lcommon8 -lgeneric8 -lnls8 -lcore8 `cat $oracle/lib/sysliblist` -lm -lthread" + ;; esac SVRSUBDIRS='$(SVRDIRS)' SERVER_OUTPUT_FILES="db/Makefile server/Makefile backup/Makefile dbck/Makefile dcm/Makefile gen/Makefile incremental/Makefile reg_svr/Makefile regtape/Makefile" @@ -1998,7 +2001,7 @@ fi # Java support, for webmoira echo $ac_n "checking for Java""... $ac_c" 1>&6 -echo "configure:2002: checking for Java" >&5 +echo "configure:2005: checking for Java" >&5 # Check whether --with-java or --without-java was given. if test "${with_java+set}" = set; then withval="$with_java" @@ -2037,7 +2040,7 @@ fi # LDAP support echo $ac_n "checking for LDAP""... $ac_c" 1>&6 -echo "configure:2041: checking for LDAP" >&5 +echo "configure:2044: checking for LDAP" >&5 # Check whether --with-ldap or --without-ldap was given. if test "${with_ldap+set}" = set; then withval="$with_ldap" @@ -2078,7 +2081,7 @@ fi # AFS support echo $ac_n "checking for AFS""... $ac_c" 1>&6 -echo "configure:2082: checking for AFS" >&5 +echo "configure:2085: checking for AFS" >&5 # Check whether --with-afs or --without-afs was given. if test "${with_afs+set}" = set; then withval="$with_afs" @@ -2096,12 +2099,12 @@ if test "$afs" != no -a "$oracle" != no; then AFS_DIR=$afs fi echo $ac_n "checking for insque""... $ac_c" 1>&6 -echo "configure:2100: checking for insque" >&5 +echo "configure:2103: checking for insque" >&5 if eval "test \"`echo '$''{'ac_cv_func_insque'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_insque=yes" else @@ -2142,7 +2145,7 @@ if eval "test \"`echo '$ac_cv_func_'insque`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for insque in -lcompat""... $ac_c" 1>&6 -echo "configure:2146: checking for insque in -lcompat" >&5 +echo "configure:2149: checking for insque in -lcompat" >&5 ac_lib_var=`echo compat'_'insque | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2150,7 +2153,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcompat $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2185,12 +2188,12 @@ fi fi echo $ac_n "checking for sigvec""... $ac_c" 1>&6 -echo "configure:2189: checking for sigvec" >&5 +echo "configure:2192: checking for sigvec" >&5 if eval "test \"`echo '$''{'ac_cv_func_sigvec'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sigvec=yes" else @@ -2231,7 +2234,7 @@ if eval "test \"`echo '$ac_cv_func_'sigvec`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sigvec in -lucb""... $ac_c" 1>&6 -echo "configure:2235: checking for sigvec in -lucb" >&5 +echo "configure:2238: checking for sigvec in -lucb" >&5 ac_lib_var=`echo ucb'_'sigvec | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2239,7 +2242,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lucb -L/usr/ucblib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2274,7 +2277,7 @@ fi fi echo $ac_n "checking for pioctl in -lsys""... $ac_c" 1>&6 -echo "configure:2278: checking for pioctl in -lsys" >&5 +echo "configure:2281: checking for pioctl in -lsys" >&5 ac_lib_var=`echo sys'_'pioctl | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2282,7 +2285,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsys $AFS_LIBS -lrx -llwp -lsys $AFS_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2344,14 +2347,14 @@ fi # GNU readline echo "checking for GNU readline..." 1>&6 -echo "configure:2348: checking for GNU readline..." >&5 +echo "configure:2351: checking for GNU readline..." >&5 # Check whether --with-readline or --without-readline was given. if test "${with_readline+set}" = set; then withval="$with_readline" readline="$withval"; echo "$ac_t""$withval" 1>&6 else echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:2355: checking for readline in -lreadline" >&5 +echo "configure:2358: checking for readline in -lreadline" >&5 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2359,7 +2362,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline -ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2391,7 +2394,7 @@ else if test "$athena" = true; then unset ac_cv_lib_readline_readline echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:2395: checking for readline in -lreadline" >&5 +echo "configure:2398: checking for readline in -lreadline" >&5 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2399,7 +2402,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline -L/mit/gnu/lib -ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2450,9 +2453,9 @@ fi # Curses curses=curses echo "checking for curses" 1>&6 -echo "configure:2454: checking for curses" >&5 +echo "configure:2457: checking for curses" >&5 echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6 -echo "configure:2456: checking for main in -lcurses" >&5 +echo "configure:2459: checking for main in -lcurses" >&5 ac_lib_var=`echo curses'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2460,14 +2463,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2486,7 +2489,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6 -echo "configure:2490: checking for main in -lncurses" >&5 +echo "configure:2493: checking for main in -lncurses" >&5 ac_lib_var=`echo ncurses'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2494,14 +2497,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2527,12 +2530,12 @@ if test -n "$curses"; then OLDLIBS=$LIBS LIBS=-l$curses echo "checking if curses needs termcap" 1>&6 -echo "configure:2531: checking if curses needs termcap" >&5 +echo "configure:2534: checking if curses needs termcap" >&5 if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < main(int argc, char **argv) @@ -2542,7 +2545,7 @@ else return 0; } EOF -if { (eval echo configure:2546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then CURSES_LIBS="-l$curses" else @@ -2554,7 +2557,7 @@ else : else cat > conftest.$ac_ext < main(int argc, char **argv) @@ -2564,7 +2567,7 @@ else return 0; } EOF -if { (eval echo configure:2568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then CURSES_LIBS="-l$curses -ltermcap" else @@ -2586,14 +2589,14 @@ if test -n "$CURSES_LIBS"; then OLDLIBS=$LIBS LIBS=$CURSES_LIBS cat > conftest.$ac_ext < int main() { WINDOW *w; getmaxx(w); ; return 0; } EOF -if { (eval echo configure:2597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* : else @@ -2601,14 +2604,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { WINDOW *w; w->_maxx; ; return 0; } EOF -if { (eval echo configure:2612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* CURSES_CPPFLAGS="-D'getmaxx(w)=w->_maxx'" else @@ -2621,14 +2624,14 @@ rm -f conftest* fi rm -f conftest* cat > conftest.$ac_ext < int main() { newterm(NULL, NULL, NULL); ; return 0; } EOF -if { (eval echo configure:2632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CURSES_CPPFLAGS="$CURSES_CPPFLAGS -DCURSES_HAS_NEWTERM" else @@ -2650,12 +2653,12 @@ fi for ac_func in getusershell strlcpy strlcat uname strvis do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2654: checking for $ac_func" >&5 +echo "configure:2657: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2704,12 +2707,12 @@ done echo $ac_n "checking for sigaction""... $ac_c" 1>&6 -echo "configure:2708: checking for sigaction" >&5 +echo "configure:2711: checking for sigaction" >&5 if eval "test \"`echo '$''{'ac_cv_func_sigaction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sigaction=yes" else @@ -2756,7 +2759,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2760: checking how to run the C preprocessor" >&5 +echo "configure:2763: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2771,13 +2774,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2788,13 +2791,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2798: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2805,13 +2808,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2839,17 +2842,17 @@ for ac_hdr in unistd.h getopt.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2843: checking for $ac_hdr" >&5 +echo "configure:2846: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2878,17 +2881,17 @@ done ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6 -echo "configure:2882: checking for netinet/in.h" >&5 +echo "configure:2885: checking for netinet/in.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2916,9 +2919,9 @@ fi if test "$no_netinet_in" != "yes"; then echo $ac_n "checking for in_addr_t defined in netinet/in.h""... $ac_c" 1>&6 -echo "configure:2920: checking for in_addr_t defined in netinet/in.h" >&5 +echo "configure:2923: checking for in_addr_t defined in netinet/in.h" >&5 cat > conftest.$ac_ext < EOF diff --git a/configure.in b/configure.in index e52675d0..f341e2ab 100755 --- a/configure.in +++ b/configure.in @@ -244,9 +244,12 @@ if test "$oracle" != no; then 2.0.6.0.0) SQL_LIBS="-L$oracle/lib -lsql $oracle/lib/osntab.o -lsqlnet -lora -lsqlnet -lnlsrtl -lcv6 -lcore -lnlsrtl -lcore -lm" ;; - *) + 2.2.4.0.0) SQL_LIBS="-L$oracle/lib -lclntsh -lxa -lsql -lsqlnet -lncr -lsqlnet -lclient -lcommon -lgeneric -lsqlnet -lncr -lsqlnet -lclient -lcommon -lgeneric -lepc -lnlsrtl3 -lc3v6 -lcore3 -lnlsrtl3 -lcore3 -lnlsrtl3 `cat $oracle/rdbms/lib/sysliblist` -lm -lthread" ;; + *) + SQL_LIBS="-L$oracle/lib -lclntsh -lsql8 -lclient8 -lcommon8 -lgeneric8 -lnls8 -lcore8 `cat $oracle/lib/sysliblist` -lm -lthread" + ;; esac SVRSUBDIRS='$(SVRDIRS)' SERVER_OUTPUT_FILES="db/Makefile server/Makefile backup/Makefile dbck/Makefile dcm/Makefile gen/Makefile incremental/Makefile reg_svr/Makefile regtape/Makefile" -- 2.45.2