Changes for rebuild of fb2.

2025-01-22 18:43:02 +01:00 · 2002-07-04 09:34:20 +00:00 · 2002-07-04 09:34:20 +00:00 · dae9189129
commit dae9189129
parent 797d77bd3a
16 changed files with 362 additions and 45 deletions
--- a/323
+++ b/323
@ -2342,6 +2342,309 @@ EOF
 fi
 rm -f conftest*

+echo $ac_n "checking for main in -lcrypt""... $ac_c" 1>&6
+echo "configure:2347: checking for main in -lcrypt" >&5
+ac_lib_var=`echo crypt'_'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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lcrypt  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2355 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:2362: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo crypt | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lcrypt $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
+echo "configure:2390: checking for main in -ldl" >&5
+ac_lib_var=`echo dl'_'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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldl  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2398 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:2405: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo dl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-ldl $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking for main in -lc""... $ac_c" 1>&6
+echo "configure:2433: checking for main in -lc" >&5
+ac_lib_var=`echo c'_'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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lc  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2441 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:2448: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo c | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lc $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
+echo "configure:2476: checking for main in -lm" >&5
+ac_lib_var=`echo m'_'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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lm  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2484 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:2491: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lm $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6
+echo "configure:2519: 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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lcurses  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2527 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:2534: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo curses | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lcurses $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+#AC_CHECK_LIB(termcap, main)
+echo $ac_n "checking for main in -lreadline""... $ac_c" 1>&6
+echo "configure:2563: checking for main in -lreadline" >&5
+ac_lib_var=`echo readline'_'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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lreadline $LIBS $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2571 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:2578: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo readline | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lreadline $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking for main in -lstdc++""... $ac_c" 1>&6
+echo "configure:2606: checking for main in -lstdc++" >&5
+ac_lib_var=`echo stdc++'_'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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lstdc++ $LIBS $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2614 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:2621: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo stdc++ | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lstdc++ $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+

 cat >> confdefs.h <<\EOF
 #define UNIX_64_BIT_IO 1
@ -2350,14 +2653,14 @@ EOF


 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:2354: checking whether byte ordering is bigendian" >&5
+echo "configure:2657: 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 2361 "configure"
+#line 2664 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@ -2368,11 +2671,11 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:2372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2675: \"$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 2376 "configure"
+#line 2679 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@ -2383,7 +2686,7 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:2387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_bigendian=yes
 else
@ -2403,7 +2706,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 2407 "configure"
+#line 2710 "configure"
 #include "confdefs.h"
 main () {
  /* Are we little or big endian?  From Harbison&Steele.  */
@ -2416,7 +2719,7 @@ main () {
  exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:2420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2723: \"$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
@ -2440,12 +2743,12 @@ EOF
 fi

 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2444: checking for working const" >&5
+echo "configure:2747: 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 2449 "configure"
+#line 2752 "configure"
 #include "confdefs.h"

 int main() {
@ -2494,7 +2797,7 @@ ccp = (char const *const *) p;

 ; return 0; }
 EOF
-if { (eval echo configure:2498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2801: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_const=yes
 else
--- a/configure.in
+++ b/configure.in
@ -53,6 +53,15 @@ AC_TRY_COMPILE([#include <stdlib.h>
 [AC_MSG_RESULT(yes)],
 [AC_DEFINE(socklen_t, int) AC_MSG_RESULT(no)])

+AC_CHECK_LIB(crypt, main)
+AC_CHECK_LIB(dl, main)
+AC_CHECK_LIB(c,main)
+AC_CHECK_LIB(m, main)
+AC_CHECK_LIB(curses, main)
+#AC_CHECK_LIB(termcap, main)
+AC_CHECK_LIB(readline, main,,,$LIBS)
+AC_CHECK_LIB(stdc++, main,,, $LIBS)
+

 AC_DEFINE(UNIX_64_BIT_IO)

--- a/src/gpre/pat.cpp
+++ b/src/gpre/pat.cpp
@ -24,7 +24,7 @@
 //
 //____________________________________________________________
 //
-//	$Id: pat.cpp,v 1.4 2002-01-04 11:34:15 skywalker Exp $
+//	$Id: pat.cpp,v 1.5 2002-07-04 09:34:19 skywalker Exp $
 //

 #include "firebird.h"
@ -35,6 +35,7 @@
 #include "../gpre/pat.h"
 #include "../gpre/gpre_proto.h"
 #include "../gpre/pat_proto.h"
+#include "../gpre/lang_proto.h"


 extern "C" {
--- a/src/jrd/alt_use_sec.h
+++ b/src/jrd/alt_use_sec.h
@ -29,7 +29,7 @@
 *       John Bellardo  <bellardo@cs.ucsd.edu>
 *
 *
- *  $Id: alt_use_sec.h,v 1.5 2002-07-01 15:07:18 skywalker Exp $
+ *  $Id: alt_use_sec.h,v 1.6 2002-07-04 09:34:19 skywalker Exp $
 *
 */

--- a/src/jrd/build_no.h
+++ b/src/jrd/build_no.h
@ -3,16 +3,16 @@
               *** DO NOT EDIT ***
  TO CHANGE ANY INFORMATION IN HERE PLEASE
  EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:421 
+  FORMAL BUILD NUMBER:442 
 */

-#define PRODUCT_VER_STRING "2.0.0.421"
-#define FILE_VER_STRING "WI-T2.0.0.421"
-#define LICENSE_VER_STRING "WI-T2.0.0.421"
-#define FILE_VER_NUMBER 2, 0, 0, 421
+#define PRODUCT_VER_STRING "2.0.0.442"
+#define FILE_VER_STRING "WI-T2.0.0.442"
+#define LICENSE_VER_STRING "WI-T2.0.0.442"
+#define FILE_VER_NUMBER 2, 0, 0, 442
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "421"
+#define FB_BUILD_NO "442"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird2 Dev1"
--- a/src/jrd/cmp.cpp
+++ b/src/jrd/cmp.cpp
@ -30,7 +30,7 @@
 *   This closes the heart of SF Bug #518282.
 */
 /*
-$Id: cmp.cpp,v 1.7 2002-06-29 13:00:56 dimitr Exp $
+$Id: cmp.cpp,v 1.8 2002-07-04 09:34:19 skywalker Exp $
 */

 #include "firebird.h"
@ -75,6 +75,7 @@ $Id: cmp.cpp,v 1.7 2002-06-29 13:00:56 dimitr Exp $
 #include "../jrd/scl_proto.h"
 #include "../jrd/thd_proto.h"
 #include "../jrd/met_proto.h"
+#include "../jrd/mov_proto.h"
 #include "../jrd/dsc_proto.h"
 #include "../jrd/dbg_proto.h"	/* DBG_supervisor */

@ -5355,7 +5356,7 @@ static void post_trigger_access(TDBB tdbb, CSB csb, REL owner_relation, VEC trig
 						if (!strcmp(access->acc_type, object_column)
 							&& MET_relation_owns_trigger(tdbb, access->acc_name, access->acc_trg_name)
 							&& (MET_lookup_field(tdbb, owner_relation, access->acc_name, access->acc_security_name) >= 0
-							|| MET_relation_default_class(tdbb, owner_relation, access->acc_security_name)))
+							|| MET_relation_default_class(tdbb, owner_relation->rel_name, access->acc_security_name)))
 							continue;
 					}
 					/* Inherited access needs from "object" to acc_security_name */
@ -5382,7 +5383,7 @@ static void post_trigger_access(TDBB tdbb, CSB csb, REL owner_relation, VEC trig
 							continue;
 						if (!strcmp(access->acc_type, object_column)
 							&& (MET_lookup_field(tdbb, owner_relation, access->acc_name, access->acc_security_name) >= 0
-							|| MET_relation_default_class(tdbb, owner_relation, access->acc_security_name)))
+							|| MET_relation_default_class(tdbb, owner_relation->rel_name, access->acc_security_name)))
 							continue;
 					}
 					/* A direct access to an object from this trigger */
--- a/src/jrd/isc.cpp
+++ b/src/jrd/isc.cpp
@ -28,7 +28,7 @@
 * 01-Feb-2002 Paul Reeves: Removed hard-coded registry path
 */
 /*
-$Id: isc.cpp,v 1.9 2002-07-02 09:49:19 dimitr Exp $
+$Id: isc.cpp,v 1.10 2002-07-04 09:34:19 skywalker Exp $
 */
 #ifdef DARWIN
 #define _STLP_CCTYPE
@ -51,7 +51,6 @@ $Id: isc.cpp,v 1.9 2002-07-02 09:49:19 dimitr Exp $
 #include "../jrd/gds_proto.h"
 #include "../jrd/isc_proto.h"
 #include "../jrd/jrd_proto.h"
-#include "../utilities/registry.h"

 /* Initialize the structure that hold all the config information */

--- a/src/jrd/isc_win32.cpp
+++ b/src/jrd/isc_win32.cpp
@ -24,7 +24,7 @@
 * Solaris x86 changes - Konstantin Kuznetsov, Neil McCalden
 */
 /*
-$Id: isc_win32.cpp,v 1.3 2001-12-24 02:50:51 tamlin Exp $
+$Id: isc_win32.cpp,v 1.4 2002-07-04 09:34:19 skywalker Exp $
 */

 #include "firebird.h"
@ -42,6 +42,7 @@ $Id: isc_win32.cpp,v 1.3 2001-12-24 02:50:51 tamlin Exp $
 #include "../jrd/gds_proto.h"
 #include "../jrd/isc_proto.h"
 #include "../jrd/jrd_proto.h"
+#include "../utilities/registry.h"


 #include <windows.h>
--- a/src/jrd/met.epp
+++ b/src/jrd/met.epp
@ -35,7 +35,7 @@
 *
 */
 /*
-$Id: met.epp,v 1.11 2002-07-01 16:59:09 skywalker Exp $
+$Id: met.epp,v 1.12 2002-07-04 09:34:19 skywalker Exp $
 */
 // This MUST be at the top of the file
 #ifdef DARWIN
@ -2709,8 +2709,8 @@ REL MET_relation(TDBB tdbb, USHORT id)
 }


-BOOLEAN MET_relation_owns_trigger (TDBB tdbb, TEXT *relation_name, 
-                                   TEXT *trigger_name)
+BOOLEAN MET_relation_owns_trigger (TDBB tdbb, const TEXT *relation_name, 
+                                   const TEXT *trigger_name)
 {
 /**************************************
 *
@ -2767,8 +2767,8 @@ BOOLEAN MET_relation_owns_trigger (TDBB tdbb, TEXT *relation_name,
    return found;
 }

-BOOLEAN MET_relation_default_class (TDBB tdbb, TEXT *relation_name,
-                                    TEXT *default_security_class_name)
+BOOLEAN MET_relation_default_class (TDBB tdbb, const TEXT *relation_name,
+                                    const TEXT *default_security_class_name)
 {
 /**************************************
 *
--- a/src/jrd/met_proto.h
+++ b/src/jrd/met_proto.h
@ -72,8 +72,8 @@ int MET_post_existence(TDBB, struct rel *);
 void MET_prepare(TDBB, struct tra *, USHORT, UCHAR *);
 struct prc *MET_procedure(TDBB, int, USHORT);
 struct rel *MET_relation(TDBB, USHORT);
-extern BOOLEAN 		MET_relation_owns_trigger (TDBB, TEXT *, TEXT *);
-extern BOOLEAN		MET_relation_default_class (TDBB, TEXT *, TEXT *);
+extern BOOLEAN 		MET_relation_owns_trigger (TDBB, const TEXT *, const TEXT *);
+extern BOOLEAN		MET_relation_default_class (TDBB, const TEXT *, const TEXT *);
 void MET_release_existence(struct rel *);
 void MET_release_triggers(TDBB, VEC *);
 void MET_remove_procedure(TDBB, int, PRC);
--- a/src/make.defaults
+++ b/src/make.defaults
@ -26,7 +26,7 @@
 #   Contributor(s):
 # 
 # 
-#   $Id: make.defaults,v 1.4 2002-07-01 16:59:09 skywalker Exp $
+#   $Id: make.defaults,v 1.5 2002-07-04 09:34:18 skywalker Exp $
 # 


--- a/src/make.new/Makefile.in.firebird
+++ b/src/make.new/Makefile.in.firebird
@ -26,7 +26,7 @@
 #   Contributor(s):
 #
 #
-#   $Id: Makefile.in.firebird,v 1.14 2002-02-16 02:21:27 seanleyne Exp $
+#   $Id: Makefile.in.firebird,v 1.15 2002-07-04 09:34:19 skywalker Exp $
 #
 # 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
 #
@ -64,7 +64,6 @@ dirs = alice burp dudley dsql extlib gpre intl isql journal jrd lock msgs \

 .PHONY: firebird super_firebird $(dirs)

-
 firebird: updateBuildNum phase1 phase2 phase3


--- a/src/make.new/Makefile.in.gpre
+++ b/src/make.new/Makefile.in.gpre
@ -26,7 +26,7 @@
 #   Contributor(s):
 # 
 # 
-#   $Id: Makefile.in.gpre,v 1.10 2002-06-24 13:59:57 paul_reeves Exp $
+#   $Id: Makefile.in.gpre,v 1.11 2002-07-04 09:34:19 skywalker Exp $
 # 

 ROOT=../..
@ -43,7 +43,7 @@ include     $(ROOT)/src/make.shared.variables

 GPRECommon_Sources = cmd.cpp cme.cpp cmp.cpp c_cxx.cpp exp.cpp gpre.cpp \
 		hsh.cpp int.cpp int_cxx.cpp jrdmet.cpp movg.cpp msc.cpp par.cpp \
-		pat.cpp pretty.cpp sqe.cpp sql.cpp noform.cpp
+		pat.cpp pretty.cpp sqe.cpp sql.cpp cob.cpp noform.cpp

 GPREBoot_Sources=  gpre_meta_boot.cpp ../common/fb_exception.cpp
 GPRE_Sources=	   gpre_meta.cpp
--- a/src/make.new/make.rules
+++ b/src/make.new/make.rules
@ -26,7 +26,7 @@
 #   Contributor(s):
 #
 #
-#   $Id: make.rules,v 1.14 2002-06-23 19:51:30 paul_reeves Exp $
+#   $Id: make.rules,v 1.15 2002-07-04 09:34:19 skywalker Exp $
 #

 #____________________________________________________________________________
@ -144,9 +144,11 @@ LINK_OPTIONS=
 #  This is something that we should pick up with autoconf.
 #ReadlineLibs = -lreadline -ltermcap
 #ReadlineLibs = -lreadline -lncurses
-ReadlineLibs = -lreadline
-LINK_LIBS= -lm -lstdc++ $(ReadlineLibs) -lc -ldl -lcrypt
-STATICLINK_LIBS = -lm -lstdc++ $(ReadlineLibs) -lc -ldl -lcrypt
+#ReadlineLibs:= -lreadline
+#LINK_LIBS:= -lm -lstdc++ $(ReadlineLibs) @LIBS@ -lc -ldl -lcrypt
+#STATICLINK_LIBS := -lm -lstdc++ $(ReadlineLibs) -lc -ldl -lcrypt
+LINK_LIBS = @LIBS@
+STATICLINK_LIBS = @LIBS@

 #LINK_LIBS= -L$(LIB)  -lgds -lm -lc -ldl -lcrypt
 # -lgcc
--- a/src/make.platform
+++ b/src/make.platform
@ -15,7 +15,7 @@
 # All Rights Reserved.
 # Contributor(s): ______________________________________.
 # Start of file prefix.linux:	$(VERSION)	$(PLATFORM)
-#$Id: make.platform,v 1.4 2002-07-01 16:59:09 skywalker Exp $
+#$Id: make.platform,v 1.5 2002-07-04 09:34:18 skywalker Exp $
 #Revision 1.6  2000/12/01 11:20:31  fsg
 #Added SHRLIB_EXT to  prefix.linux
 #Added Platform Manager rules	PR 2002-06-22
--- a/src/make.rules
+++ b/src/make.rules
@ -26,7 +26,7 @@
 #   Contributor(s):
 #
 #
-#   $Id: make.rules,v 1.4 2002-07-01 16:59:09 skywalker Exp $
+#   $Id: make.rules,v 1.5 2002-07-04 09:34:18 skywalker Exp $
 #

 #____________________________________________________________________________
@ -144,9 +144,11 @@ LINK_OPTIONS=
 #  This is something that we should pick up with autoconf.
 #ReadlineLibs = -lreadline -ltermcap
 #ReadlineLibs = -lreadline -lncurses
-ReadlineLibs = -lreadline
-LINK_LIBS= -lm -lstdc++ $(ReadlineLibs) -lc -ldl -lcrypt
-STATICLINK_LIBS = -lm -lstdc++ $(ReadlineLibs) -lc -ldl -lcrypt
+#ReadlineLibs:= -lreadline
+#LINK_LIBS:= -lm -lstdc++ $(ReadlineLibs) -lstdc++ -lreadline -lcurses -lm -lc -ldl -lcrypt  -lc -ldl -lcrypt
+#STATICLINK_LIBS := -lm -lstdc++ $(ReadlineLibs) -lc -ldl -lcrypt
+LINK_LIBS = -lstdc++ -lreadline -lcurses -lm -lc -ldl -lcrypt 
+STATICLINK_LIBS = -lstdc++ -lreadline -lcurses -lm -lc -ldl -lcrypt 

 #LINK_LIBS= -L$(LIB)  -lgds -lm -lc -ldl -lcrypt
 # -lgcc