firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 20:03:02 +01:00
Code Issues

Changed to make install work better.

Browse Source 
Fix build of shared library so global objects have thier constructors called
Added readline to isql
Added version numbers to libgds.so.2.0.0
Change install location and version to be driven from ./configure file
This commit is contained in:
skywalker 2001-08-27 15:29:18 +00:00
parent 570289f7b6
commit c1bcc741ab
28 changed files with 646 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

312
configure vendored
View File

@ -11,6 +11,7 @@
ac_help=
ac_default_prefix=/usr/local
# Any additions from configure.in:
ac_default_prefix=/usr/local/firebird
# Initialize some variables set by options.
# The variables have the same names as the options, with
@ -544,7 +545,7 @@ if eval "test \"`echo '$''{'ac_cv_prog_make_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
echo "configure:548: checking whether ${MAKE-make} sets \${MAKE}" >&5
echo "configure:549: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -576,6 +577,10 @@ fi
# possibly needed if we use install-sh program
#AC_CONFIG_AUX_DIR(`pwd`)
# Do some error checking and defaulting for the host and target type.
# The inputs are:
# configure --host=HOST --target=TARGET --build=BUILD NONOPT
@ -603,7 +608,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
echo "configure:607: checking host system type" >&5
echo "configure:612: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@ -624,7 +629,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$host" 1>&6
echo $ac_n "checking target system type""... $ac_c" 1>&6
echo "configure:628: checking target system type" >&5
echo "configure:633: checking target system type" >&5
target_alias=$target
case "$target_alias" in
@ -642,7 +647,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$target" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6
echo "configure:646: checking build system type" >&5
echo "configure:651: checking build system type" >&5
build_alias=$build
case "$build_alias" in
@ -670,7 +675,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:674: checking for $ac_word" >&5
echo "configure:679: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -702,7 +707,7 @@ done
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:706: checking for $ac_word" >&5
echo "configure:711: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -732,7 +737,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:736: checking for $ac_word" >&5
echo "configure:741: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -783,7 +788,7 @@ fi
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:787: checking for $ac_word" >&5
echo "configure:792: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -815,7 +820,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
echo "configure:819: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
echo "configure:824: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@ -826,12 +831,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
#line 830 "configure"
#line 835 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
if { (eval echo configure:835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@ -857,12 +862,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
echo "configure:861: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "configure:866: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
echo "configure:866: checking whether we are using GNU C" >&5
echo "configure:871: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -871,7 +876,7 @@ else
yes;
#endif
EOF
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@ -890,7 +895,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
echo "configure:894: checking whether ${CC-cc} accepts -g" >&5
echo "configure:899: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -926,7 +931,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:930: checking for $ac_word" >&5
echo "configure:935: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -958,7 +963,7 @@ test -n "$CXX" || CXX="gcc"
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
echo "configure:962: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
echo "configure:967: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@ -969,12 +974,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext << EOF
#line 973 "configure"
#line 978 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
if { (eval echo configure:978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@ -1000,12 +1005,12 @@ if test $ac_cv_prog_cxx_works = no; then
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
echo "configure:1004: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "configure:1009: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
echo "configure:1009: checking whether we are using GNU C++" >&5
echo "configure:1014: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -1014,7 +1019,7 @@ else
yes;
#endif
EOF
if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1018: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
@ -1033,7 +1038,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
echo "configure:1037: checking whether ${CXX-g++} accepts -g" >&5
echo "configure:1042: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -1067,7 +1072,7 @@ fi
# Extract the first word of "flex", so it can be a program name with args.
set dummy flex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1071: checking for $ac_word" >&5
echo "configure:1076: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -1101,7 +1106,7 @@ then
*) ac_lib=l ;;
esac
echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
echo "configure:1105: checking for yywrap in -l$ac_lib" >&5
echo "configure:1110: checking for yywrap in -l$ac_lib" >&5
ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -1109,7 +1114,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$ac_lib $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1113 "configure"
#line 1118 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@ -1120,7 +1125,7 @@ int main() {
yywrap()
; return 0; }
EOF
if { (eval echo configure:1124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:1129: \"$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
@ -1143,7 +1148,7 @@ fi
fi
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
echo "configure:1147: checking whether ln -s works" >&5
echo "configure:1152: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -1166,7 +1171,7 @@ fi
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1170: checking for $ac_word" >&5
echo "configure:1175: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -1198,7 +1203,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1202: checking for $ac_word" >&5
echo "configure:1207: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -1230,7 +1235,7 @@ test -n "$YACC" || YACC="yacc"
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
echo "configure:1234: checking how to run the C preprocessor" >&5
echo "configure:1239: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@ -1245,13 +1250,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
#line 1249 "configure"
#line 1254 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1260: \"$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
:
@ -1262,13 +1267,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
#line 1266 "configure"
#line 1271 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1277: \"$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
:
@ -1279,13 +1284,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
#line 1283 "configure"
#line 1288 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1294: \"$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
:
@ -1313,17 +1318,17 @@ for ac_hdr in assert.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1317: checking for $ac_hdr" >&5
echo "configure:1322: 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
#line 1322 "configure"
#line 1327 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1332: \"$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*
@ -1353,17 +1358,17 @@ for ac_hdr in unistd.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1357: checking for $ac_hdr" >&5
echo "configure:1362: 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
#line 1362 "configure"
#line 1367 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1372: \"$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*
@ -1393,17 +1398,17 @@ for ac_hdr in fcntl.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1397: checking for $ac_hdr" >&5
echo "configure:1402: 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
#line 1402 "configure"
#line 1407 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1407: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1412: \"$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*
@ -1433,17 +1438,17 @@ for ac_hdr in grp.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1437: checking for $ac_hdr" >&5
echo "configure:1442: 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
#line 1442 "configure"
#line 1447 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1447: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1452: \"$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*
@ -1473,17 +1478,17 @@ for ac_hdr in libio.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1477: checking for $ac_hdr" >&5
echo "configure:1482: 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
#line 1482 "configure"
#line 1487 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1487: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1492: \"$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*
@ -1513,17 +1518,17 @@ for ac_hdr in sys/types.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1517: checking for $ac_hdr" >&5
echo "configure:1522: 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
#line 1522 "configure"
#line 1527 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1532: \"$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*
@ -1553,17 +1558,17 @@ for ac_hdr in sys/stat.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1557: checking for $ac_hdr" >&5
echo "configure:1562: 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
#line 1562 "configure"
#line 1567 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1572: \"$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*
@ -1593,17 +1598,17 @@ for ac_hdr in sys/uio.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1597: checking for $ac_hdr" >&5
echo "configure:1602: 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
#line 1602 "configure"
#line 1607 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1607: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1612: \"$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*
@ -1633,17 +1638,17 @@ for ac_hdr in sys/wait.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1637: checking for $ac_hdr" >&5
echo "configure:1642: 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
#line 1642 "configure"
#line 1647 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1652: \"$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*
@ -1673,17 +1678,17 @@ for ac_hdr in time.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1677: checking for $ac_hdr" >&5
echo "configure:1682: 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
#line 1682 "configure"
#line 1687 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1687: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1692: \"$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*
@ -1713,17 +1718,17 @@ for ac_hdr in sys/time.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1717: checking for $ac_hdr" >&5
echo "configure:1722: 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
#line 1722 "configure"
#line 1727 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1732: \"$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*
@ -1753,17 +1758,17 @@ for ac_hdr in sys/param.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1757: checking for $ac_hdr" >&5
echo "configure:1762: 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
#line 1762 "configure"
#line 1767 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1767: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1772: \"$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*
@ -1793,17 +1798,17 @@ for ac_hdr in varargs.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1797: checking for $ac_hdr" >&5
echo "configure:1802: 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
#line 1802 "configure"
#line 1807 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1812: \"$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*
@ -1833,17 +1838,17 @@ for ac_hdr in stdarg.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1837: checking for $ac_hdr" >&5
echo "configure:1842: 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
#line 1842 "configure"
#line 1847 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1852: \"$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*
@ -1873,17 +1878,17 @@ for ac_hdr in stdlib.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1877: checking for $ac_hdr" >&5
echo "configure:1882: 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
#line 1882 "configure"
#line 1887 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1892: \"$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*
@ -1913,17 +1918,17 @@ for ac_hdr in ctype.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1917: checking for $ac_hdr" >&5
echo "configure:1922: 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
#line 1922 "configure"
#line 1927 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1932: \"$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*
@ -1953,17 +1958,17 @@ for ac_hdr in string.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1957: checking for $ac_hdr" >&5
echo "configure:1962: 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
#line 1962 "configure"
#line 1967 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1972: \"$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*
@ -1993,17 +1998,57 @@ for ac_hdr in signal.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1997: checking for $ac_hdr" >&5
echo "configure:2002: 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
#line 2002 "configure"
#line 2007 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2012: \"$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*
eval "ac_cv_header_$ac_safe=yes"
else
echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1
EOF
else
echo "$ac_t""no" 1>&6
fi
done
for ac_hdr in readline/readline.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2042: 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
#line 2047 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2052: \"$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*
@ -2030,11 +2075,11 @@ fi
done
#AC_CHECK_TYPE(socklen_t, int)
echo $ac_n "checking Checking for socklen_t type""... $ac_c" 1>&6
echo "configure:2036: checking Checking for socklen_t type" >&5
echo "configure:2081: checking Checking for socklen_t type" >&5
cat > conftest.$ac_ext <<EOF
#line 2038 "configure"
#line 2083 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <sys/types.h>
@ -2044,7 +2089,7 @@ int main() {
socklen_t a;
; return 0; }
EOF
if { (eval echo configure:2048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:2093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
@ -2060,14 +2105,14 @@ rm -f conftest*
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
echo "configure:2064: checking whether byte ordering is bigendian" >&5
echo "configure:2109: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
#line 2071 "configure"
#line 2116 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@ -2078,11 +2123,11 @@ int main() {
#endif
; return 0; }
EOF
if { (eval echo configure:2082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:2127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
#line 2086 "configure"
#line 2131 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@ -2093,7 +2138,7 @@ int main() {
#endif
; return 0; }
EOF
if { (eval echo configure:2097: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:2142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
@ -2113,7 +2158,7 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
#line 2117 "configure"
#line 2162 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
@ -2126,7 +2171,7 @@ main () {
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
if { (eval echo configure:2130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:2175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian=no
else
@ -2150,12 +2195,12 @@ EOF
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
echo "configure:2154: checking for working const" >&5
echo "configure:2199: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2159 "configure"
#line 2204 "configure"
#include "confdefs.h"
int main() {
@ -2204,7 +2249,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
if { (eval echo configure:2208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:2253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@ -2261,8 +2306,24 @@ FIREBIRD_ARCH_TYPE=classic
#FIREBIRD_ARCH_TYPE=super
CPU_TYPE=$host_cpu
# The following file defines the version number strings
source src/misc/writeBuildNum.sh
FIREBIRD_PACKAGE_VERSION="0a.Dev1"
FIREBIRD_LIBGDS_SO=libgds.so.${FIREBIRD_VERSION}
FIREBIRD_LIBGDS_SO_LNK=libgds.so
FIREBIRD_LIBGDS_SO_X_LNK=libgds.so.${MajorVer}
@ -2277,6 +2338,9 @@ source src/misc/writeBuildNum.sh
#AC_DEFINE_UNQUOTED(FILE_VER_STRING, "$FILE_VER_STRING")
#AC_DEFINE_UNQUOTED(LICENSE_VER_STRING, "$FILE_VER_STRING")
PROD_BUILD_FLG=
#PROD_BUILD_FLG=Y
@ -2305,6 +2369,13 @@ PROD_BUILD_FLG=
@ -2439,9 +2510,16 @@ src/qli/Makefile:src/make.new/Makefile.in.qli \
src/remote/Makefile:src/make.new/Makefile.in.remote \
src/utilities/Makefile:src/make.new/Makefile.in.utilities \
src/wal/Makefile:src/make.new/Makefile.in.wal \
src/install/Makefile:src/install/Makefile.in:src/install/arch-specific/${MAKEFILE_PREFIX}/Makefile.in \
src/install/Makefile:src/make.new/Makefile.in.install \
src/Makefile:src/make.new/Makefile.in.firebird \
Makefile:Makefile.in \
gen/install/scripts/preinstall.sh:src/install/${FIREBIRD_ARCH_TYPE}/preinstall.sh.in \
gen/install/scripts/install.sh:src/install/${FIREBIRD_ARCH_TYPE}/install.sh.in \
gen/install/scripts/postinstall.sh:src/install/${FIREBIRD_ARCH_TYPE}/postinstall.sh.in \
gen/install/scripts/preuninstall.sh:src/install/${FIREBIRD_ARCH_TYPE}/preuninstall.sh.in \
gen/install/scripts/postuninstall.sh:src/install/${FIREBIRD_ARCH_TYPE}/postuninstall.sh.in \
gen/install/install.sh:src/install/${FIREBIRD_ARCH_TYPE}/tarInstall.sh.in \
src/install/misc/firebird.xinetd \
src/include/gen/autoconfig.h:src/make.new/config/config.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@ -2501,7 +2579,12 @@ s%@YACC@%$YACC%g
s%@CPP@%$CPP%g
s%@PLATFORM@%$PLATFORM%g
s%@FIREBIRD_ARCH_TYPE@%$FIREBIRD_ARCH_TYPE%g
s%@CPU_TYPE@%$CPU_TYPE%g
s%@FIREBIRD_LIBGDS_SO@%$FIREBIRD_LIBGDS_SO%g
s%@FIREBIRD_LIBGDS_SO_LNK@%$FIREBIRD_LIBGDS_SO_LNK%g
s%@FIREBIRD_LIBGDS_SO_X_LNK@%$FIREBIRD_LIBGDS_SO_X_LNK%g
s%@FIREBIRD_VERSION@%$FIREBIRD_VERSION%g
s%@FIREBIRD_PACKAGE_VERSION@%$FIREBIRD_PACKAGE_VERSION%g
s%@PROD_BUILD_FLG@%$PROD_BUILD_FLG%g
CEOF
@ -2570,9 +2653,16 @@ src/qli/Makefile:src/make.new/Makefile.in.qli \
src/remote/Makefile:src/make.new/Makefile.in.remote \
src/utilities/Makefile:src/make.new/Makefile.in.utilities \
src/wal/Makefile:src/make.new/Makefile.in.wal \
src/install/Makefile:src/install/Makefile.in:src/install/arch-specific/${MAKEFILE_PREFIX}/Makefile.in \
src/install/Makefile:src/make.new/Makefile.in.install \
src/Makefile:src/make.new/Makefile.in.firebird \
Makefile:Makefile.in \
gen/install/scripts/preinstall.sh:src/install/${FIREBIRD_ARCH_TYPE}/preinstall.sh.in \
gen/install/scripts/install.sh:src/install/${FIREBIRD_ARCH_TYPE}/install.sh.in \
gen/install/scripts/postinstall.sh:src/install/${FIREBIRD_ARCH_TYPE}/postinstall.sh.in \
gen/install/scripts/preuninstall.sh:src/install/${FIREBIRD_ARCH_TYPE}/preuninstall.sh.in \
gen/install/scripts/postuninstall.sh:src/install/${FIREBIRD_ARCH_TYPE}/postuninstall.sh.in \
gen/install/install.sh:src/install/${FIREBIRD_ARCH_TYPE}/tarInstall.sh.in \
src/install/misc/firebird.xinetd \
"}
EOF
cat >> $CONFIG_STATUS <<\EOF
@ -2762,6 +2852,10 @@ cat >> $CONFIG_STATUS <<EOF
@ -2791,6 +2885,8 @@ mkdir -p gen/jrd
mkdir -p gen/qli
mkdir -p gen/utilities
mkdir -p gen/fbutil
mkdir -p gen/install
mkdir -p gen/install/scripts
mkdir -p gen/firebird/include
mkdir -p gen/firebird/intl
mkdir -p gen/firebird/UDF
@ -2799,6 +2895,8 @@ mkdir -p gen/firebird/examples/v5
mkdir -p gen/firebird/lib
mkdir -p gen/firebird/misc
mkdir -p gen/firebird/help
chmod a+x gen/install/install.sh
chmod a+x gen/install/scripts/*.sh
exit 0
EOF

42
configure.in
View File

@ -1,9 +1,13 @@
AC_INIT(src)
AC_CONFIG_AUX_DIR(src/make.new/config)
AC_CACHE_VAL(ac_cv_prog_make_set, [AC_PROG_MAKE_SET])
AC_PREFIX_DEFAULT(/usr/local/firebird)
AC_CONFIG_HEADER(src/include/gen/autoconfig.h:src/make.new/config/config.h.in)
# possibly needed if we use install-sh program
#AC_CONFIG_AUX_DIR(`pwd`)
AC_CANONICAL_SYSTEM
AC_PROG_AWK
@ -32,8 +36,9 @@ AC_CHECK_HEADERS(stdlib.h)
AC_CHECK_HEADERS(ctype.h)
AC_CHECK_HEADERS(string.h)
AC_CHECK_HEADERS(signal.h)
AC_CHECK_HEADERS(readline/readline.h)
#AC_CHECK_TYPE(socklen_t, int)
AC_MSG_CHECKING(Checking for socklen_t type)
AC_TRY_COMPILE([#include <stdlib.h>
#include <sys/types.h>
@ -65,11 +70,27 @@ FIREBIRD_ARCH_TYPE=classic
#FIREBIRD_ARCH_TYPE=super
AC_SUBST(FIREBIRD_ARCH_TYPE)
CPU_TYPE=$host_cpu
AC_SUBST(CPU_TYPE)
# The following file defines the version number strings
source src/misc/writeBuildNum.sh
FIREBIRD_PACKAGE_VERSION="0a.Dev1"
FIREBIRD_LIBGDS_SO=libgds.so.${FIREBIRD_VERSION}
FIREBIRD_LIBGDS_SO_LNK=libgds.so
FIREBIRD_LIBGDS_SO_X_LNK=libgds.so.${MajorVer}
AC_SUBST(FIREBIRD_LIBGDS_SO)
AC_SUBST(FIREBIRD_LIBGDS_SO_LNK)
AC_SUBST(FIREBIRD_LIBGDS_SO_X_LNK)
AC_SUBST(FIREBIRD_VERSION)
AC_SUBST(FIREBIRD_PACKAGE_VERSION)
#AC_DEFINE_UNQUOTED(FB_BUILD_TYPE, "$BuildType")
#AC_DEFINE_UNQUOTED(FB_MAJOR_VER, "$MajorVer")
@ -81,6 +102,9 @@ AC_SUBST(FIREBIRD_VERSION)
#AC_DEFINE_UNQUOTED(FILE_VER_STRING, "$FILE_VER_STRING")
#AC_DEFINE_UNQUOTED(LICENSE_VER_STRING, "$FILE_VER_STRING")
PROD_BUILD_FLG=
#PROD_BUILD_FLG=Y
AC_SUBST(PROD_BUILD_FLG)
@ -108,6 +132,9 @@ AC_OUTPUT_COMMANDS([mkdir -p gen/qli])
AC_OUTPUT_COMMANDS([mkdir -p gen/utilities])
AC_OUTPUT_COMMANDS([mkdir -p gen/fbutil])
AC_OUTPUT_COMMANDS([mkdir -p gen/install])
AC_OUTPUT_COMMANDS([mkdir -p gen/install/scripts])
AC_OUTPUT_COMMANDS([mkdir -p gen/firebird/include])
AC_OUTPUT_COMMANDS([mkdir -p gen/firebird/intl])
AC_OUTPUT_COMMANDS([mkdir -p gen/firebird/UDF])
@ -117,6 +144,10 @@ AC_OUTPUT_COMMANDS([mkdir -p gen/firebird/lib])
AC_OUTPUT_COMMANDS([mkdir -p gen/firebird/misc])
AC_OUTPUT_COMMANDS([mkdir -p gen/firebird/help])
AC_OUTPUT_COMMANDS([chmod a+x gen/install/install.sh])
AC_OUTPUT_COMMANDS([chmod a+x gen/install/scripts/*.sh])
AC_OUTPUT( \
src/make.rules:src/make.new/make.rules \
src/make.defaults:src/make.new/make.defaults \
@ -143,7 +174,14 @@ src/qli/Makefile:src/make.new/Makefile.in.qli \
src/remote/Makefile:src/make.new/Makefile.in.remote \
src/utilities/Makefile:src/make.new/Makefile.in.utilities \
src/wal/Makefile:src/make.new/Makefile.in.wal \
src/install/Makefile:src/install/Makefile.in:src/install/arch-specific/${MAKEFILE_PREFIX}/Makefile.in \
src/install/Makefile:src/make.new/Makefile.in.install \
src/Makefile:src/make.new/Makefile.in.firebird \
Makefile:Makefile.in \
gen/install/scripts/preinstall.sh:src/install/${FIREBIRD_ARCH_TYPE}/preinstall.sh.in \
gen/install/scripts/install.sh:src/install/${FIREBIRD_ARCH_TYPE}/install.sh.in \
gen/install/scripts/postinstall.sh:src/install/${FIREBIRD_ARCH_TYPE}/postinstall.sh.in \
gen/install/scripts/preuninstall.sh:src/install/${FIREBIRD_ARCH_TYPE}/preuninstall.sh.in \
gen/install/scripts/postuninstall.sh:src/install/${FIREBIRD_ARCH_TYPE}/postuninstall.sh.in \
gen/install/install.sh:src/install/${FIREBIRD_ARCH_TYPE}/tarInstall.sh.in \
src/install/misc/firebird.xinetd \
)

7
src/fbutil/FirebirdConfigFile.cpp
View File

@ -17,7 +17,6 @@ FirebirdConfigFile::FirebirdConfigFile()
{
isLoadedFlg = false;
configFile = "/etc/firebird.conf";
cout << "Got ya" << endl;
}
//-----------------------------------------------------------------------------
@ -198,8 +197,14 @@ void FirebirdConfigFile::checkLoadConfig() {
void FirebirdConfigFile::loadConfig() {
isLoadedFlg = true;
ifstream configFile(configFile.c_str());
if (!configFile) {
// config file does not exist, a warning message would be nice.
return;
}
string inputLine;
while (!configFile.eof() ) {

27
src/fbutil/main.cpp Normal file
View File

@ -0,0 +1,27 @@
#include "FirebirdConfig.h"
// This is mark's test program
#include <stdio.h>
#include <readline/readline.h>
#include <readline/history.h>
using namespace std;
int main(int argc, char* argv[]) {
char* data = readline("cop that>");
while (data != NULL) {
cout << data << endl;
add_history(data);
data = readline("cop that>");
}
string answer = FirebirdConfig::getSysString("waldo1");
cout << answer << endl;
}

0
src/install/classic/CSTarKullFiles.sh → src/install/classic/TarKullFiles.sh.in
View File

21
src/install/classic/CSinstall.sh → src/install/classic/install.sh.in
View File

@ -12,17 +12,16 @@
if [ -z "$FirebirdInstallPrefix" ]
then
FirebirdInstallPrefix=%prefix%
FirebirdInstallPrefix=@prefix@
fi
if [ -z "$FirebirdBuildPrefix" ]
then
FirebirdBuildPrefix="."
fi
BuildDir=$FirebirdBuildPrefix/firebird
DestDir=$FirebirdInstallPrefix/firebird
DestDir=$FirebirdInstallPrefix
# I think this is done as part of the build now.
@ -91,12 +90,20 @@
# cp $BuildDir/include/gds.hxx $DestDir/include
cp $BuildDir/include/*.h $DestDir/include
cp -f $BuildDir/lib/libgds.so /usr/lib/libgds.so.0
if [ -L /usr/lib/libgds.so ]
cp -f $BuildDir/lib/@FIREBIRD_LIBGDS_SO@ /usr/lib/@FIREBIRD_LIBGDS_SO@
if [ -L /usr/lib/@FIREBIRD_LIBGDS_SO_LNK@ ]
then
rm -f /usr/lib/libgds.so
rm -f /usr/lib/@FIREBIRD_LIBGDS_SO_LNK@
fi
ln -s libgds.so.0 /usr/lib/libgds.so
ln -s @FIREBIRD_LIBGDS_SO@ /usr/lib/@FIREBIRD_LIBGDS_SO_LNK@
if [ -L /usr/lib/@FIREBIRD_LIBGDS_SO_X_LNK@ ]
then
rm -f /usr/lib/@FIREBIRD_LIBGDS_SO_X_LNK@
fi
ln -s @FIREBIRD_LIBGDS_SO@ /usr/lib/@FIREBIRD_LIBGDS_SO_X_LNK@
# cp -f $BuildDir/lib/gds.a /usr/lib/libgds.a
cp -f $BuildDir/lib/ib_util.so /usr/lib/libib_util.so

8
src/install/classic/CSpostinstall.sh → src/install/classic/postinstall.sh.in
View File

@ -170,7 +170,7 @@ keepOrigDBAPassword() {
echo "daemon init routine in the file /etc/init.d/firebird)" >> $DBAPasswordFile
echo "" >> $DBAPasswordFile
echo "Your should password can be changed to a more suitable one using the" >> $DBAPasswordFile
echo "/opt/interbase/bin/changeDBAPassword.sh script" >> $DBAPasswordFile
echo "@prefix@/bin/changeDBAPassword.sh script" >> $DBAPasswordFile
echo "" >> $DBAPasswordFile
chmod u=r,go= $DBAPasswordFile
@ -197,7 +197,7 @@ generateNewDBAPassword() {
echo "daemon init routine in the file /etc/rc.d/init.d/firebird)" >> $DBAPasswordFile
echo "" >> $DBAPasswordFile
echo "Your password can be changed to a more suitable one using the" >> $DBAPasswordFile
echo "/opt/interbase/bin/changeDBAPassword.sh script" >> $DBAPasswordFile
echo "@prefix@/bin/changeDBAPassword.sh script" >> $DBAPasswordFile
echo "" >> $DBAPasswordFile
chmod u=r,go= $DBAPasswordFile
@ -488,7 +488,7 @@ resetInetdServer() {
# Make sure the links are in place
if [ -z "$FirebirdInstallPrefix" ]
then
FirebirdInstallPrefix=%prefix%
FirebirdInstallPrefix=@prefix@
fi
# Hopefully we are done with this link.
@ -499,7 +499,7 @@ resetInetdServer() {
# fi
FBRootDir=$FirebirdInstallPrefix/firebird
FBRootDir=$FirebirdInstallPrefix
FBBin=$FBRootDir/bin
RunUser=root
# RunUser=firebird

0
src/install/classic/CSpostuninstall.sh → src/install/classic/postuninstall.sh.in
View File

25
src/install/classic/CSpreinstall.sh → src/install/classic/preinstall.sh.in
View File

@ -51,8 +51,8 @@ checkIfServerRunning() {
if [ ! -z "$checkString" ]
then
echo "An instance of the Firebird/InterBase Super server seems to be running."
echo "Please quit all interbase applications and then proceed"
echo "An instance of the Firebird super server seems to be running."
echo "Please quit all firebird applications and then proceed"
exit 1
fi
@ -60,8 +60,17 @@ checkIfServerRunning() {
if [ ! -z "$checkString" ]
then
echo "An instance of the Firebird/InterBase server seems to be running."
echo "Please quit all interbase applications and then proceed."
echo "An instance of the Firebird server seems to be running."
echo "Please quit all Firebird applications and then proceed."
exit 1
fi
checkString=`netstat -an | egrep '3050.*LISTEN'`
if [ ! -z "$checkString" ]
then
echo "An instance of the Firebird server seems to be running."
echo "Please quit all Firebird applications and then proceed."
exit 1
fi
@ -134,7 +143,7 @@ archivePriorInstallSystemFiles() {
echo ""
echo "--- Warning ----------------------------------------------"
echo " The installation target directory: $FBRootDir"
echo " Already contains a prior installation of InterBase/Firebird."
echo " Already contains a prior installation of Firebird."
echo " This and files found in /usr/include and /usr/lib will be"
echo " archived in the file : ${ArchiveMainFile}"
echo ""
@ -160,7 +169,7 @@ archivePriorInstallSystemFiles() {
fi
done
for i in gds_pyxis.a gds.a libgds.so.0 libgds.so ib_util.so
for i in gds.a @FIREBIRD_LIBGDS_SO@ ib_util.so
do
DestFile=usr/lib/$i
if [ -e $DestFile ]
@ -218,9 +227,9 @@ checkForRPMInstall() {
if [ -z "$FirebirdInstallPrefix" ]
then
FirebirdInstallPrefix=%prefix%
FirebirdInstallPrefix=@prefix@
fi
FBRootDir=$FirebirdInstallPrefix/firebird
FBRootDir=$FirebirdInstallPrefix
FBBin=$FBRootDir/bin
ArchiveDateTag=`date +"%Y%m%d_%H%M"`
ArchiveMainFile="${FBRootDir}_${ArchiveDateTag}.tar.gz"

0
src/install/classic/CSpreuninstall.sh → src/install/classic/preuninstall.sh.in
View File

0
src/install/classic/CSrpmfiles.txt → src/install/classic/rpmfiles.txt.in
View File

17
src/install/classic/rpmheader.txt.in Normal file
View File

@ -0,0 +1,17 @@
Summary: Firebird Relational Database Server and Client tools.
Name: FirebirdCS
Version: 2.0.0
Release: 0.Dev1
Copyright: Distributable
Group: Applications/Databases
Source: FirebirdCS0.9src.tar.gz
URL: http://firebird.sourceforge.net
Prefix: /opt
AutoReqProv: no
BuildArchitectures: i386
# BuildRoot: /var/tmp/%{name}-buildroot
%description
Firebird is a powerful, high-performance relational database designed to be embedded into
applications on multiple platforms.

37
src/install/classic/CSTarInstall.sh → src/install/classic/tarInstall.sh.in
View File

@ -83,33 +83,28 @@ export InteractiveInstall
checkInstallUser
# Ok, If the env variable exists then we are doing
# Ok, If the dir ../../gen exists then we are in the build tree
# the install from the CVS tree
if [ ! -z "$FirebirdInstallPrefix" ]
then
ScriptsSrcDir=.
($ScriptsSrcDir/classic/CSpreinstall.sh )
($ScriptsSrcDir/classic/CSinstall.sh)
($ScriptsSrcDir/classic/CSpostinstall.sh)
fi
# Here we are installing from a install tar.gz file
if [ -e scripts ]
if [ -d "../../gen" ]
then
FirebirdBuildPrefix=".."
else
echo "Extracting install data"
runAndCheckExit "tar -xzf firebird.tar.gz"
(./scripts/CSpreinstall.sh)
(./scripts/CSinstall.sh)
(./scripts/CSpostinstall.sh)
rm -rf firebird
FirebirdBuildPrefix="."
fi
export FirebirdBuildPrefix
(./scripts/preinstall.sh)
(./scripts/install.sh)
(./scripts/postinstall.sh)
#if [ -d firebird ]
# then
# rm -rf firebird
#fi
echo "Install completed"

21
src/install/misc/firebird.conf Executable file
View File

@ -0,0 +1,21 @@
# Specify the root directory under which firebird is installed.
RootDirectory=/usr/local/firebird
# Turn on/off special handling for openning nfs data files
#
# The following option works if a database file exists on a NFS mounted
# partition.
# The original behavour in InterBase(r) was to try and connect to a firebird
#db server on the remote machine via port 3050, this ensures that all opens
# of a file occur on the same machine and locking etc can be handled
# appropriately.
# However this often causes frustration since often you end up in a position
# where you really do want db files to be opened by the local process even
# though it resides on a nfs share. So the next option allows us to turn
# this 'feature' off.
DoRemoteOpenForNFSFiles=0

7
src/install/misc/firebird.xinetd
View File

@ -1,13 +1,16 @@
# default: on
# description: Interbase server
# description: FirebirdSQL server
service gds_db
{
flags = REUSE
socket_type = stream
wait = no
# user = @FBRunUser@
user = root
log_on_success += USERID
log_on_failure += USERID
server = /opt/interbase/bin/gds_inet_server
server = /usr/local/firebird/bin/gds_inet_server
# server = ${exec_prefix}/sbin/gds_inet_server
# server = @exec_bindir@/gds_inet_server
disable = no
}

16
src/install/misc/firebird.xinetd.in Executable file
View File

@ -0,0 +1,16 @@
# default: on
# description: FirebirdSQL server
service gds_db
{
flags = REUSE
socket_type = stream
wait = no
# user = @FBRunUser@
user = root
log_on_success += USERID
log_on_failure += USERID
server = @prefix@/bin/gds_inet_server
# server = @sbindir@/gds_inet_server
# server = @exec_bindir@/gds_inet_server
disable = no
}

20
src/isql/extract.epp
View File

@ -19,7 +19,7 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
* $Id: extract.epp,v 1.2 2001-07-29 23:43:22 skywalker Exp $
* $Id: extract.epp,v 1.3 2001-08-27 15:29:18 skywalker Exp $
* Revision 1.3 2000/11/22 17:07:25 patrickgriffin
* In get_procedure_args change comment style from // to c style
*
@ -364,7 +364,7 @@ SSHORT EXTRACT_list_table(SCHAR * relation_name,
}
else
{
sprintf (Print_buffer, ",%s%s", NEWLINE, TAB);
sprintf (Print_buffer, ",%s%s", NEWLINE, TAB_AS_SPACES);
ISQL_printf (Out, Print_buffer);
}
@ -1420,11 +1420,11 @@ static void list_check(void)
{
ISQL_copy_SQL_id (TRG.RDB$RELATION_NAME, (TEXT**) &SQL_identifier, DBL_QUOTE);
sprintf (Print_buffer, "ALTER TABLE %s ADD %s%s",
SQL_identifier, NEWLINE, TAB);
SQL_identifier, NEWLINE, TAB_AS_SPACES);
}
else
sprintf (Print_buffer, "ALTER TABLE %s ADD %s%s",
TRG.RDB$RELATION_NAME, NEWLINE, TAB);
TRG.RDB$RELATION_NAME, NEWLINE, TAB_AS_SPACES);
ISQL_printf (Out, Print_buffer);
/* If the name of the constraint is not INTEG..., print it */
@ -1623,7 +1623,7 @@ static void list_create_db(void)
{
if (FIL.RDB$FILE_SEQUENCE)
{
sprintf (Print_buffer, "%sFILE '%s' ", TAB, FIL.RDB$FILE_NAME);
sprintf (Print_buffer, "%sFILE '%s' ", TAB_AS_SPACES, FIL.RDB$FILE_NAME);
ISQL_printf (Out, Print_buffer);
}
else
@ -1978,13 +1978,13 @@ static void list_domain_table( SCHAR * table_name, SSHORT default_char_set_id)
if (!FLD.RDB$DEFAULT_SOURCE.NULL)
{
sprintf (Print_buffer, "%s%s ", NEWLINE, TAB);
sprintf (Print_buffer, "%s%s ", NEWLINE, TAB_AS_SPACES);
ISQL_printf (Out, Print_buffer);
SHOW_print_metadata_text_blob (Out, &FLD.RDB$DEFAULT_SOURCE);
}
if (!FLD.RDB$VALIDATION_SOURCE.NULL)
{
sprintf (Print_buffer, "%s%s ", NEWLINE, TAB);
sprintf (Print_buffer, "%s%s ", NEWLINE, TAB_AS_SPACES);
ISQL_printf (Out, Print_buffer);
ISQL_print_validation (Out, &FLD.RDB$VALIDATION_SOURCE, 0, (SLONG*) gds_trans);
}
@ -2169,13 +2169,13 @@ static void list_domains( SSHORT default_char_set_id)
if (!FLD.RDB$DEFAULT_SOURCE.NULL)
{
sprintf (Print_buffer, "%s%s ", NEWLINE, TAB);
sprintf (Print_buffer, "%s%s ", NEWLINE, TAB_AS_SPACES);
ISQL_printf (Out, Print_buffer);
SHOW_print_metadata_text_blob (Out, &FLD.RDB$DEFAULT_SOURCE);
}
if (!FLD.RDB$VALIDATION_SOURCE.NULL)
{
sprintf (Print_buffer, "%s%s ", NEWLINE, TAB);
sprintf (Print_buffer, "%s%s ", NEWLINE, TAB_AS_SPACES);
ISQL_printf (Out, Print_buffer);
ISQL_print_validation (Out, &FLD.RDB$VALIDATION_SOURCE, 0, (SLONG*) gds_trans);
}
@ -2293,7 +2293,7 @@ static void list_filters(void)
sprintf (Print_buffer, "DECLARE FILTER %s INPUT_TYPE %d OUTPUT_TYPE %d%s%sENTRY_POINT '%s' MODULE_NAME '%s'%s%s%s",
FIL.RDB$FUNCTION_NAME, FIL.RDB$INPUT_SUB_TYPE, FIL.RDB$OUTPUT_SUB_TYPE,
NEWLINE, TAB, FIL.RDB$ENTRYPOINT, FIL.RDB$MODULE_NAME, Term, NEWLINE,
NEWLINE, TAB_AS_SPACES, FIL.RDB$ENTRYPOINT, FIL.RDB$MODULE_NAME, Term, NEWLINE,
NEWLINE);
ISQL_printf (Out, Print_buffer);

190
src/isql/isql.epp
View File

@ -21,7 +21,7 @@
* Contributor(s): ______________________________________.
*/
/*
$Id: isql.epp,v 1.2 2001-07-29 23:43:22 skywalker Exp $
$Id: isql.epp,v 1.3 2001-08-27 15:29:18 skywalker Exp $
Revision 1.5 2000/11/18 16:49:24 fsg
Increased PRINT_BUFFER_LENGTH to 2048 to show larger plans
Fixed Bug #122563 in extract.e get_procedure_args
@ -47,6 +47,24 @@
#include <signal.h>
#endif
#ifdef HAVE_READLINE_READLINE_H
#include <stdio.h>
#include <readline/readline.h>
#include <readline/history.h>
// We have conflicting values for NEWLINE readline wants '\n' and
// isql.h wants "\n". (note the quotes). So we undef it here after
// getting through the readline headers.
#ifdef NEWLINE
#undef NEWLINE
#endif
#endif
#include <string>
#define TIME_ERR 101
#define BLANK '\040'
#define DBL_QUOTE '\042'
@ -258,13 +276,13 @@ static TEXT rec_count[MSG_LENGTH];
/* if the action is rrstrict, do not print anything at all */
static RI_ACTIONS ri_actions_all[] = {
RI_ACTION_CASCADE, RI_ACTION_CASCADE, "Cascade",
RI_ACTION_NULL, RI_ACTION_NULL, "Set Null",
RI_ACTION_DEFAULT, RI_ACTION_DEFAULT, "Set Default",
RI_ACTION_NONE, RI_ACTION_NONE, "No Action",
RI_RESTRICT, "", "",
"", "", "",
0, 0, 0
{RI_ACTION_CASCADE, RI_ACTION_CASCADE, "Cascade"},
{RI_ACTION_NULL, RI_ACTION_NULL, "Set Null"},
{RI_ACTION_DEFAULT, RI_ACTION_DEFAULT, "Set Default"},
{RI_ACTION_NONE, RI_ACTION_NONE, "No Action"},
{RI_RESTRICT, "", ""},
{"", "", ""},
{0, 0, 0}
};
@ -594,6 +612,11 @@ BOOLEAN ISQL_dbcheck(void)
return TRUE;
}
static std::string userPrompt;
static char* lastInputLine = NULL;
static int getColumn = -1;
void ISQL_prompt( TEXT * string)
{
@ -608,15 +631,91 @@ void ISQL_prompt( TEXT * string)
* Not for Windows, otherwise flush the string
**************************************/
#ifndef GUI_TOOLS
ib_fprintf(ib_stdout, string);
ib_fflush(ib_stdout);
userPrompt = (char *) string;
#endif
}
static void readNextInputLine(const char* prompt) {
if (lastInputLine != NULL) {
free(lastInputLine);
lastInputLine = NULL;
}
#ifdef HAVE_READLINE_READLINE_H
lastInputLine = readline((char*) prompt);
if (lastInputLine != NULL && strlen(lastInputLine) != 0) {
add_history(lastInputLine);
}
#else
// Write the prompt out.
ib_fprintf(ib_stdout, prompt);
ib_fflush(ib_stdout);
// std::string inputLine;
// getline(std::cin, inputLine);
// int lineSize = inputLine.length();
// lastInputLine = malloc(lineSize);
// strncpy(lastInputLine, inputLine.c_str(), lineSize);
// (need to check if lineSize or lineSize +1 - I hate C and don't remember it exactly
// I've left it here as a guide.
lastInputLine = malloc(BUFFER_LENGTH512);
if (!ib_fgets(lastInputLine, BUFFER_LENGTH512, ib_stdin) {
free(lastInputLine);
lastInputLine = NULL;
}
#endif
getColumn = 0;
}
static void readNextInputLine() {
readNextInputLine(userPrompt.c_str());
}
char getNextInputChar() {
#ifdef HAVE_READLINE_READLINE_H
// If reading from a file do it the old way.
if (Ifp != ib_stdin) {
return ib_getc(Ifp);
}
// At end of line try and read next line
if (getColumn == -1) {
readNextInputLine();
}
// readline found EOF
if (lastInputLine == NULL) {
return EOF;
}
// If at end of line return \n
if (getColumn == strlen(lastInputLine)) {
getColumn = -1;
return '\n';
}
return lastInputLine[ getColumn++];
#else
return ib_getc(Ifp);
#endif
}
#ifdef GUI_TOOLS
int ISQL_commit_work(
int response, IB_FILE * ipf, IB_FILE * opf, IB_FILE * sf)
int ISQL_commit_work(int response, IB_FILE * ipf, IB_FILE * opf, IB_FILE * sf)
{
/**************************************
*
@ -819,7 +918,7 @@ void ISQL_warning( STATUS * status)
vec = status;
assert(vec[1] == 0); /* shouldn't be any errors */
gds_assert(vec[1] == 0); /* shouldn't be any errors */
if (!Quiet) {
if (vec[0] != gds_arg_gds ||
@ -2426,31 +2525,34 @@ static SSHORT add_row( TEXT * tabname)
if (type == SQL_BLOB) {
ISQL_msg_get(BLOB_PROMPT, msg, name, NULL, NULL, NULL, NULL);
ISQL_prompt(msg); /* Blob: %s, type 'edit' or filename to load> */
/* Blob: %s, type 'edit' or filename to load> */
}
else if (type == SQL_TIMESTAMP || type == SQL_TYPE_DATE) {
ISQL_msg_get(DATE_PROMPT, msg, name, NULL, NULL, NULL, NULL);
ISQL_prompt(msg); /* Enter %s as M/D/Y> */
/* Enter %s as M/D/Y> */
}
else {
ISQL_msg_get(NAME_PROMPT, msg, name, NULL, NULL, NULL, NULL);
ISQL_prompt(msg); /* Enter %s> */
/* Enter %s> */
}
/* On blank line or EOF, break the loop without doing an insert */
if (!ib_fgets(buffer, BUFFER_LENGTH512, ib_stdin)
|| !strlen(buffer)) {
readNextInputLine(msg);
// ISQL_prompt(msg);
// if (!ib_fgets(buffer, BUFFER_LENGTH512, ib_stdin)
// || !strlen(buffer)) {
if (lastInputLine == NULL || strlen(lastInputLine) == 0) {
done = TRUE;
break;
}
length = strlen(buffer);
length = strlen(lastInputLine);
STDERROUT("", 1);
/* Convert first 4 chars to upper case for comparison */
strncpy(cmd, buffer, 4);
strncpy(cmd, lastInputLine, 4);
cmd[4] = '\0';
ISQL_make_upper((UCHAR*) cmd);
@ -2481,7 +2583,7 @@ static SSHORT add_row( TEXT * tabname)
* the database, not updating existing info
*/
{
strcpy(bfile, buffer);
strcpy(bfile, lastInputLine);
res = BLOB_load(blobid, DB, M__trans, bfile);
}
@ -2495,7 +2597,7 @@ static SSHORT add_row( TEXT * tabname)
case SQL_FLOAT:
fvalue = (float *) ISQL_ALLOC(sizeof(float));
if (sscanf(buffer, "%g", fvalue) != 1) {
if (sscanf(lastInputLine, "%g", fvalue) != 1) {
STDERROUT("Input parsing problem", 1);
done = TRUE;
}
@ -2504,7 +2606,7 @@ static SSHORT add_row( TEXT * tabname)
case SQL_DOUBLE:
dvalue = (double *) ISQL_ALLOC(sizeof(double));
if (sscanf(buffer, "%lg", dvalue) != 1) {
if (sscanf(lastInputLine, "%lg", dvalue) != 1) {
STDERROUT("Input parsing problem", 1);
done = TRUE;
}
@ -2512,9 +2614,9 @@ static SSHORT add_row( TEXT * tabname)
break;
case SQL_TYPE_TIME:
if (3 != sscanf(buffer, "%d:%d:%d", &times.tm_hour,
if (3 != sscanf(lastInputLine, "%d:%d:%d", &times.tm_hour,
&times.tm_min, &times.tm_sec)) {
ISQL_msg_get(TIME_ERR, msg, buffer, NULL, NULL, NULL,
ISQL_msg_get(TIME_ERR, msg, lastInputLine, NULL, NULL, NULL,
NULL);
STDERROUT(msg, 1); /* Bad date %s\n */
done = TRUE;
@ -2531,9 +2633,9 @@ static SSHORT add_row( TEXT * tabname)
case SQL_TIMESTAMP:
case SQL_TYPE_DATE:
if (3 != sscanf(buffer, "%d/%d/%d", &times.tm_mon,
if (3 != sscanf(lastInputLine, "%d/%d/%d", &times.tm_mon,
&times.tm_mday, &times.tm_year)) {
ISQL_msg_get(DATE_ERR, msg, buffer, NULL, NULL, NULL,
ISQL_msg_get(DATE_ERR, msg, lastInputLine, NULL, NULL, NULL,
NULL);
STDERROUT(msg, 1); /* Bad date %s\n */
done = TRUE;
@ -2561,7 +2663,7 @@ static SSHORT add_row( TEXT * tabname)
(VARY *)
ISQL_ALLOC((SLONG) (length + sizeof(USHORT)));
vary->vary_length = length;
strncpy(vary->vary_string, buffer, length);
strncpy(vary->vary_string, lastInputLine, length);
ivar->sqldata = (SCHAR *) vary;
ivar->sqllen = length + sizeof(USHORT);
break;
@ -2585,7 +2687,7 @@ static SSHORT add_row( TEXT * tabname)
}
if ((dscale = var->sqlscale) < 0) {
SSHORT lscale = 0;
if (get_numeric((UCHAR*) buffer, length, &lscale, &n) != TRUE) {
if (get_numeric((UCHAR*) lastInputLine, length, &lscale, &n) != TRUE) {
STDERROUT("Input parsing problem", 1);
done = TRUE;
}
@ -2604,7 +2706,7 @@ static SSHORT add_row( TEXT * tabname)
}
}
/* sscanf assumes an 64-bit integer target */
else if (sscanf(buffer, "%" QUADFORMAT "d", &n) != 1) {
else if (sscanf(lastInputLine, "%" QUADFORMAT "d", &n) != 1) {
STDERROUT("Input parsing problem", 1);
done = TRUE;
}
@ -3430,7 +3532,7 @@ static void do_isql(void)
case EXTRACT:
case EXTRACTALL:
default:
/* assert (FALSE); -- removed as finds too many problems */
/* gds_assert (FALSE); -- removed as finds too many problems */
case ERR:
case FAIL:
case SKIP:
@ -3446,7 +3548,7 @@ static void do_isql(void)
gds_trans = NULL;
/* Should have a valid Temp file pointer */
assert(Ofp != (IB_FILE *) - 1)
gds_assert(Ofp != (IB_FILE *) - 1);
ib_fclose(Ofp);
unlink(Tmpfile);
@ -3640,9 +3742,10 @@ static int end_trans(void)
gds__msg_format(NULL_PTR, ISQL_MSG_FAC, COMMIT_PROMPT,
sizeof(infobuf), infobuf, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
(TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR);
ISQL_prompt(infobuf);
(void) ib_fgets(buffer, BUFFER_LENGTH80, ib_stdin);
if (isyesno(buffer)) { /* check for Yes answer */
readNextInputLine(infobuf);
// ISQL_prompt(infobuf);
// (void) ib_fgets(buffer, BUFFER_LENGTH80, ib_stdin);
if (isyesno(lastInputLine)) { /* check for Yes answer */
gds__msg_format(NULL_PTR, ISQL_MSG_FAC, COMMIT_MSG,
sizeof(infobuf), infobuf, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR,
(TEXT*) NULL_PTR, (TEXT*) NULL_PTR, (TEXT*) NULL_PTR);
@ -4354,6 +4457,8 @@ static SSHORT do_set_command( TEXT * parm, SSHORT * global_flag)
}
static SSHORT get_statement(TEXT ** statement_ref,
USHORT * statement_buffer,
TEXT * statement_prompt)
@ -4407,8 +4512,9 @@ static SSHORT get_statement(TEXT ** statement_ref,
#ifndef GUI_TOOLS
if (Ifp == ib_stdin) {
ib_fprintf(ib_stdout, statement_prompt);
ib_fflush(ib_stdout);
ISQL_prompt(statement_prompt);
// ib_fprintf(ib_stdout, statement_prompt);
// ib_fflush(ib_stdout);
}
#endif
@ -4425,7 +4531,8 @@ static SSHORT get_statement(TEXT ** statement_ref,
done = FALSE;
while (!done) {
switch (c = ib_getc(Ifp)) {
switch (c = getNextInputChar()) {
// switch (c = ib_getc(Ifp)) {
case EOF:
/* Go back to ib_getc if we get interrupted by a signal. */
@ -4466,6 +4573,7 @@ static SSHORT get_statement(TEXT ** statement_ref,
break;
case '\n':
// case '\0': // In particular with readline the \n is removed
/* the context of string literals should not extend past eoln */
in_single_quoted_string = in_double_quoted_string = FALSE;
@ -5045,7 +5153,7 @@ void ISQL_ri_action_print(TEXT * ri_action_str,
}
}
assert(FALSE);
gds_assert(FALSE);
}
@ -5250,7 +5358,7 @@ static SSHORT print_sets(void)
ISQL_printf(Out, Print_buffer);
while (p) {
sprintf(Print_buffer, "%s%s width: %d%s",
TAB, p->col_name, p->col_len, NEWLINE);
TAB_AS_SPACES, p->col_name, p->col_len, NEWLINE);
ISQL_printf(Out, Print_buffer);
p = p->collist_next;
}
@ -6722,7 +6830,7 @@ static int print_item_blob( IB_FILE * fp, XSQLVAR * var, void *trans)
else
break;
}
sprintf(Print_buffer, "%s %s%s", TAB, buffer, NEWLINE);
sprintf(Print_buffer, "%s %s%s", TAB_AS_SPACES, buffer, NEWLINE);
ISQL_printf(fp, (TEXT*) Print_buffer);
}
else {

4
src/isql/isql.h
View File

@ -19,7 +19,7 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
* $Id: isql.h,v 1.2 2001-07-12 05:46:04 bellardo Exp $
* $Id: isql.h,v 1.3 2001-08-27 15:29:18 skywalker Exp $
* Revision 1.2 2000/11/18 16:49:24 fsg
* Increased PRINT_BUFFER_LENGTH to 2048 to show larger plans
* Fixed Bug #122563 in extract.e get_procedure_args
@ -360,6 +360,6 @@ typedef struct sqltypes {
#define NEWLINE "\n"
#endif
#define TAB " "
#define TAB_AS_SPACES " "
#endif /* _ISQL_ISQL_H_ */

12
src/isql/show.epp
View File

@ -19,7 +19,7 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
* $Id: show.epp,v 1.2 2001-07-29 23:43:22 skywalker Exp $
* $Id: show.epp,v 1.3 2001-08-27 15:29:18 skywalker Exp $
* Revision 1.2 2000/11/19 07:02:49 fsg
* Change in show.e to use CHARACTER_LENGTH instead of FIELD_LENGTH in
* SHOW PROCEDURE
@ -1858,7 +1858,7 @@ static void show_db(void)
REL.RDB$RELATION_NAME = "RDB$DATABASE"
if (!REL.RDB$OWNER_NAME.NULL) {
sprintf (Print_buffer, "%sOwner: %s%s", TAB, REL.RDB$OWNER_NAME, NEWLINE);
sprintf (Print_buffer, "%sOwner: %s%s", TAB_AS_SPACES, REL.RDB$OWNER_NAME, NEWLINE);
ISQL_printf (Out, Print_buffer);
}
END_FOR
@ -1905,7 +1905,7 @@ static void show_db(void)
if (FIL.RDB$FILE_FLAGS & FILE_shadow) {
if (FIL.RDB$FILE_SEQUENCE) {
sprintf (Print_buffer, "%sfile %s ", TAB, FIL.RDB$FILE_NAME);
sprintf (Print_buffer, "%sfile %s ", TAB_AS_SPACES, FIL.RDB$FILE_NAME);
ISQL_printf (Out, Print_buffer);
}
else {
@ -2429,11 +2429,11 @@ static int show_filters( SCHAR * object)
sprintf (Print_buffer, "BLOB Filter: %s %s%sInput subtype: %d Output subtype: %d%s",
FIL.RDB$FUNCTION_NAME, NEWLINE,
TAB, FIL.RDB$INPUT_SUB_TYPE, FIL.RDB$OUTPUT_SUB_TYPE, NEWLINE);
TAB_AS_SPACES, FIL.RDB$INPUT_SUB_TYPE, FIL.RDB$OUTPUT_SUB_TYPE, NEWLINE);
ISQL_printf (Out, Print_buffer);
sprintf (Print_buffer, "%sFilter library is %s%s%sEntry point is %s%s%s",
TAB, FIL.RDB$MODULE_NAME, NEWLINE,
TAB, FIL.RDB$ENTRYPOINT, NEWLINE,
TAB_AS_SPACES, FIL.RDB$MODULE_NAME, NEWLINE,
TAB_AS_SPACES, FIL.RDB$ENTRYPOINT, NEWLINE,
NEWLINE);
ISQL_printf (Out, Print_buffer);

14
src/jrd/gdsassert.h
View File

@ -19,7 +19,6 @@
#ifndef _JRD_GDSASSERT_H_
#define _JRD_GDSASSERT_H_
#ifndef assert
#ifdef DEV_BUILD
@ -38,15 +37,24 @@
#else
#define _assert(ex) {if (!(ex)){(void) ib_fprintf (ib_stderr, "GDS Assertion failure: %s %ld\n", __FILE__, __LINE__); abort();}}
#endif
#define assert(ex) _assert(ex)
#else
#define _assert(ex) /* nothing */
#define assert(ex) /* nothing */
#endif /* DEV_BUILD */
#define gds_assert(ex) _assert(ex)
/* It's a bit poor, since asset is a standard function but this was the way it
was done. It is preferable to use the gds_assert(x) function, but I've left
the following for back compatibility since I don't want to wade through that
much code at the moment.
*/
#ifndef assert
#define assert(ex) _assert(ex)
#endif /* assert */
#endif /* _JRD_GDSASSERT_H_ */

15
src/make.new/Makefile.in.fbutil
View File

@ -26,7 +26,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.fbutil,v 1.5 2001-08-21 09:41:00 skywalker Exp $
# $Id: Makefile.in.fbutil,v 1.6 2001-08-27 15:29:18 skywalker Exp $
#
ROOT=../..
@ -59,11 +59,20 @@ $(LIB)/fbutil_boot.a: $(FBUTIL_Objects)
jrdlib_dependencies: $(FBUTIL_Objects)
libtestx.so.2 : $(FBUTIL_Objects)
# g++ -shared -o $@ $^ $(STATICLINK_LIBS)
$(LIB_LINK) $(LIB_LINK_OPTIONS) -o $@ $^
# The following was just for testing
testx: main.o $(FBUTIL_Objects)
g++ -o $@ $^ $(STATICLINK_LIBS)
testx: main.o
# g++ -v -shared -o $@ $^ -L. -ltestx $(STATICLINK_LIBS)
g++ -v -o $@ $^ -L. -ltestx.so.2
testx2:
-rm libtestx.so testx
make libtestx.so.2
make testx
clean:

7
src/make.new/Makefile.in.firebird
View File

@ -26,7 +26,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.firebird,v 1.9 2001-08-21 09:41:00 skywalker Exp $
# $Id: Makefile.in.firebird,v 1.10 2001-08-27 15:29:18 skywalker Exp $
#
ROOT=..
@ -42,6 +42,11 @@ ISC_USER= sysdba
ISC_PASSWORD= masterkey
LD_LIBRARY_PATH=/home/odonohue/src/firebird2/gen/firebird/lib:/usr/lib
#RealFirebirdPath = $(shell cd $(FIREBIRD); pwd)
LD_LIBRARY_PATH=$(RealFirebirdPath)/lib
export ISC_USER
export ISC_PASSWORD
export INTERBASE

31
src/install/Makefile.in → src/make.new/Makefile.in.install
View File

@ -26,7 +26,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in,v 1.6 2001-08-20 08:15:32 skywalker Exp $
# $Id: Makefile.in.install,v 1.1 2001-08-27 15:29:18 skywalker Exp $
#
ROOT=../..
@ -43,7 +43,7 @@ FirebirdInstallPrefix=@prefix@
@SET_MAKE@
FIREBIRD=$(FirebirdInstallPrefix)/firebird
FIREBIRD=$(FirebirdInstallPrefix)
export -n FIREBIRD
export -n INTERBASE
@ -62,27 +62,17 @@ BuildRoot=$(GEN_ROOT)
InstallRoot=.
FirebirdVersion=@FIREBIRD_VERSION@
ArchType=@FIREBIRD_ARCH_TYPE@
PackageVersion=$(FirebirdVersion)-1
FirebirdBuildPrefix=$(GEN_ROOT)
export FirebirdBuildPrefix
export FirebirdInstallPrefix
export PackageVersion
#export FirebirdBuildPrefix
#export FirebirdInstallPrefix
#export PackageVersion
ifeq ($(ArchType),classic)
ArchPrefix=CS
else
ArchPrefix=SS
endif
# This means something like: FirebirdCS-2.0.0-1.tar.gz
TarFile=Firebird$(ArchPrefix)-$(PackageVersion).tar.gz
# This means something like: FirebirdCS-2.0.0-1.i386.tar.gz
TarFile=Firebird$(ArchPrefix)-$(FirebirdVersion)-$(PackageVersion).$(CpuType).tar.gz
PkgSrcDir=$(InstallRoot)/$(ArchType)
@ -97,7 +87,7 @@ runinstall: $(LastInstallFlg)
$(LastInstallFlg) : $(BIN)/gsec
$(ArchType)/$(ArchPrefix)TarInstall.sh
(cd $(GEN_ROOT)/install; ./install.sh)
# (cd $(ROOT); sh $(InstallRoot)/classic/CSTarInstall.sh)
# touch $(LastInstallFlg)
@ -116,11 +106,6 @@ $(TarFile) : buildInstallDir
TarInstallDir=$(GEN_ROOT)/install
buildInstallDir:
mkdir -p $(TarInstallDir)/scripts
# (cd $(BuildRoot); tar -czf - interbase ) | cat > $(CSTarInstallDir)/interbase.tar.gz
cp $(PkgSrcDir)/??preinstall.sh $(TarInstallDir)/scripts
cp $(PkgSrcDir)/??install.sh $(TarInstallDir)/scripts
cp $(PkgSrcDir)/??postinstall.sh $(TarInstallDir)/scripts
cp $(PkgSrcDir)/??TarInstall.sh $(TarInstallDir)/install.sh
(cd $(GEN_ROOT); tar -czf install/firebird.tar.gz firebird)

8
src/make.new/Makefile.in.jrd
View File

@ -26,7 +26,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.jrd,v 1.7 2001-08-13 08:14:38 skywalker Exp $
# $Id: Makefile.in.jrd,v 1.8 2001-08-27 15:29:18 skywalker Exp $
#
ROOT=../..
@ -95,10 +95,12 @@ jrdlib_main : $(LIBGDS_LA)
$(LIBGDS_SO) : $(GDSLIB_Objects)
$(LIB_LINK) $(LIB_LINK_OPTIONS) -o $@ $^
$(LIB_LINK) $(LIBGDS_LINK_OPTIONS) -o $@ $^
-$(LN) $(@F) $(LIBGDS_SO_X_LNK)
-$(LN) $(notdir $(LIBGDS_SO_X_LNK)) $(LIBGDS_SO_LNK)
$(LIBGDS_A) : $(GDSLIB_Objects)
$(STATICLIB_LINK) $(LIB_LINK_OPTIONS) $@ $^
$(STATICLIB_LINK) $(LIBGDS_LINK_OPTIONS) $@ $^
#____________________________________________________________________________

1
src/make.new/config/config.h.in
View File

@ -21,6 +21,7 @@
#undef HAVE_STDLIB_H
#undef HAVE_STRING_H
#undef HAVE_SIGNAL_H
#undef HAVE_READLINE_READLINE_H
/* types */
#undef socklen_t

38
src/make.new/make.defaults
View File

@ -26,7 +26,7 @@
# Contributor(s):
#
#
# $Id: make.defaults,v 1.8 2001-08-20 08:15:33 skywalker Exp $
# $Id: make.defaults,v 1.9 2001-08-27 15:29:18 skywalker Exp $
#
@ -43,9 +43,27 @@
#_____________________________________________________________________________
FIREBIRD_ARCH_TYPE = @FIREBIRD_ARCH_TYPE@
INSTALL_PREFIX = @prefix@
FIREBIRD_VERSION = @FIREBIRD_VERSION@
RealFirebirdPath = $(shell cd $(FIREBIRD); pwd)
FirebirdInstallPrefix = @prefix@
CpuType=@CPU_TYPE@
FirebirdVersion=@FIREBIRD_VERSION@
PackageVersion=@FIREBIRD_PACKAGE_VERSION@
ArchType=@FIREBIRD_ARCH_TYPE@
ifeq ($(ArchType),classic)
ArchPrefix=CS
else
ArchPrefix=SS
endif
SharedLibraryName=@FIREBIRD_LIBGDS_SO@
SharedLibrarySoName=@FIREBIRD_LIBGDS_SO_X_LNK@
SharedLibraryBaseName=@FIREBIRD_LIBGDS_SO_LNK@
# Default programs and tools to be used in the build process
@ -82,7 +100,12 @@ EXEC_EXT=
JRD_BOOT= $(LIB)/jrd_boot.a
LIBGDS_SO = $(LIB)/libgds.so
LIBGDS_SO = $(LIB)/$(SharedLibraryName)
LIBGDS_SO_X_LNK = $(LIB)/$(SharedLibrarySoName)
LIBGDS_SO_LNK = $(LIB)/$(SharedLibraryBaseName)
LIBGDS_A = $(LIB)/libgds.a
@ -92,10 +115,15 @@ ifdef UseSharedLibraries
# LIBGDS_LINK = $(LIBGDS_SO)
LIBGDS_LINK =
LINK_LIBS := -L$(LIB) -lgds $(LINK_LIBS)
# LIBGDS_LINK_OPTIONS = -soname libgds.so -rpath /usr/lib
# LIBGDS_LINK_OPTIONS = -Wl,-soname,$(SharedLibrarySoName) -Wl,-rpath,$(FirebirdInstallPrefix)/lib
LIBGDS_LINK_OPTIONS = -Wl,-soname,$(SharedLibrarySoName) -Wl,-rpath,/usr/lib
else
LIBGDS_LA = $(LIBGDS_A)
LIBGDS_DEP = $(LIBGDS_LA)
LIBGDS_LINK =
LIBGDS_LINK_OPTIONS =
endif

17
src/make.new/make.rules
View File

@ -26,7 +26,7 @@
# Contributor(s):
#
#
# $Id: make.rules,v 1.9 2001-08-21 09:41:00 skywalker Exp $
# $Id: make.rules,v 1.10 2001-08-27 15:29:18 skywalker Exp $
#
#____________________________________________________________________________
@ -119,11 +119,11 @@ ifdef UseLibToolForLink
STATICEXE_LINK = libtool @CC@ -all-static
else
LIB_LINK= ld -shared
LIB_LINK= g++ -shared
STATICLIB_LINK= ar cruvs
LIB_LINK_OPTIONS = -soname libgds.so -rpath /usr/lib
# LIB_LINK_OPTIONS = -soname libgds.so -rpath /usr/lib
# LIB_LINK_OPTIONS = -soname libgds.so.2 -rpath /usr/lib
# LIB_LINK_OPTIONS =
LIB_LINK_OPTIONS =
EXE_LINK = g++
STATICEXE_LINK = g++
@ -135,10 +135,13 @@ endif
LINK_OPTIONS=
LINK_LIBS= -lm -lstdc++ -lgcc -lc -ldl -lcrypt
#LINK_LIBS= -L$(LIB) -lgds -lm -lc -ldl -lcrypt
STATICLINK_LIBS = -lm -lstdc++ -lgcc -lc -ldl -lcrypt
ReadlineLibs = -lreadline -ltermcap
LINK_LIBS= -lm -lstdc++ $(ReadlineLibs) -lc -ldl -lcrypt
STATICLINK_LIBS = -lm -lstdc++ $(ReadlineLibs) -lc -ldl -lcrypt
#LINK_LIBS= -L$(LIB) -lgds -lm -lc -ldl -lcrypt
# -lgcc
# These should no longer be required but I've left here