Porting changes made to fb1.

configure.in

@@ -22,13 +22,18 @@ AC_CHECK_HEADERS(assert.h)
 AC_CHECK_HEADERS(unistd.h)
 AC_CHECK_HEADERS(fcntl.h)
 AC_CHECK_HEADERS(grp.h)
+AC_CHECK_HEADERS(pwd.h)
 AC_CHECK_HEADERS(libio.h)
+AC_CHECK_HEADERS(locale.h)
+AC_CHECK_HEADERS(math.h)
+AC_CHECK_HEADERS(pthread.h)
 AC_CHECK_HEADERS(sys/types.h)
 AC_CHECK_HEADERS(sys/stat.h)
 AC_CHECK_HEADERS(sys/uio.h)
 AC_CHECK_HEADERS(sys/wait.h)
 AC_CHECK_HEADERS(time.h)
 AC_CHECK_HEADERS(sys/time.h)
+AC_CHECK_HEADERS(sys/timeb.h)
 AC_CHECK_HEADERS(sys/param.h)
 AC_CHECK_HEADERS(varargs.h)
 AC_CHECK_HEADERS(stdarg.h)
@@ -151,12 +156,13 @@ 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_COMMANDS([src/misc/writeBuildNum.sh rebuildHeader])
+
 AC_OUTPUT_COMMANDS([mkdir -p gen/jrd/os])
 AC_OUTPUT_COMMANDS([mkdir -p gen/jrd/os/darwin])
 AC_OUTPUT_COMMANDS([mkdir -p gen/jrd/os/posix])
 AC_OUTPUT_COMMANDS([mkdir -p gen/jrd/os/win32])
 
-
 AC_OUTPUT( \
 src/make.rules:src/make.new/make.rules \
 src/make.defaults:src/make.new/make.defaults \
@@ -171,6 +177,7 @@ src/dsql/Makefile:src/make.new/Makefile.in.dsql \
 src/dudley/Makefile:src/make.new/Makefile.in.dudley \
 src/v5_examples/Makefile:src/make.new/Makefile.in.example5 \
 src/extlib/Makefile:src/make.new/Makefile.in.extlib \
+src/extlib/fbudf/Makefile:src/make.new/Makefile.in.fbudf \
 src/gpre/Makefile:src/make.new/Makefile.in.gpre \
 src/intl/Makefile:src/make.new/Makefile.in.intl \
 src/isql/Makefile:src/make.new/Makefile.in.isql \

src/make.new/Makefile.in.fbudf

@@ -0,0 +1,63 @@
+# 
+# Makefile for fbudf module
+# 
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# You may obtain a copy of the Licence at
+# http://www.gnu.org/licences/lgpl.html
+# 
+# As a special exception this file can also be included in modules with 
+# source code released under any Mozilla Public Licence Version 1.1 
+# or MPL compatible licence. You may obtain a copy of the licence at 
+# http://www.mozilla.org/MPL/ 
+#
+# This module is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public Licence for more details.
+# 
+# This module was created by members of the firebird development team.
+# All individual contributions remain the Copyright (C) of those
+# individuals and all rights are reserved.  Contributors to this file 
+# are either listed below or can be obtained from a CVS history command.
+#
+#  Created by:  Mark O'Donohue <mark.odonohue@ludwig.edu.au>
+#
+#  Contributor(s):
+# 
+# 
+#   $Id: Makefile.in.fbudf,v 1.1 2002-06-29 16:41:10 skywalker Exp $
+# 
+
+ROOT=../../..
+
+include     $(ROOT)/src/make.rules
+include     $(ROOT)/src/make.defaults
+include     $(ROOT)/src/make.platform
+include     $(ROOT)/src/make.shared.variables
+
+@SET_MAKE@
+
+UDF=	$(FIREBIRD)/UDF
+
+
+all:  fbudf
+
+
+
+# ib_udf.so
+#
+# User defined functions.  (I've put the .so extension back onto the library)
+# 
+
+UDF_OBJECTS = fbudf.o
+
+fbudf: $(UDF)/fb_udf.so($(UDF_OBJECTS))
+
+$(UDF)/fb_udf.so(%.o) : %.o
+	ar crv $@  $%
+
+FORCE:
+

src/make.new/Makefile.in.jrd

@@ -26,7 +26,7 @@
 #   Contributor(s):
 #
 #
-#   $Id: Makefile.in.jrd,v 1.12 2002-06-23 19:51:30 paul_reeves Exp $
+#   $Id: Makefile.in.jrd,v 1.13 2002-06-29 16:41:10 skywalker Exp $
 #
 # 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
 #
@@ -264,7 +264,7 @@ bridge.shared_o:	$(GDSSHR)
 		$(OBJS)/dsql/ddl.o $(OBJS)/dsql/dsql.o $(OBJS)/dsql/err.o \
 		$(OBJS)/dsql/gen.o $(OBJS)/dsql/hsh.o $(OBJS)/dsql/make.o \
 		$(OBJS)/dsql/met.o $(OBJS)/dsql/mov.o $(OBJS)/dsql/parse.o \
-		$(OBJS)/dsql/pass1.o $(BLD_LIBS) -o bridge5
+		$(OBJS)/dsql/pass1.o $(BsLsD_LIBS) -o bridge5
 	$(CHMOD_7) bridge5
 
 bridge.shared_bin:	$(GDSSHR)
@@ -719,7 +719,7 @@ build_alt_use_main: alt_use_sec.h.pre
 #	$(GPRE_BOOT) -lang_internal -n -manual -raw -O $< $@
 
 #$(SRC)/codes.cpp:	$(SRC)/codes.epp
-codes.cpp:	$(SRC)/codes.epp  msgs.gdb
+codes.cpp:	$(SRC)/codes.epp  msg.gdb
 	$(GPRE) -n -manual -raw -string $< $@
 
 

src/make.new/config/config.h.in

@@ -14,26 +14,30 @@
 
 /* Headers */
 #undef HAVE_ASSERT_H
-#undef HAVE_UNISTD_H
+#undef HAVE_CTYPE_H
 #undef HAVE_FCNTL_H
 #undef HAVE_GRP_H
 #undef HAVE_LIBIO_H
+#undef HAVE_LIB_IO_H
+#undef HAVE_LOCALE_H
+#undef HAVE_MATH_H
+#undef HAVE_PWD_H
+#undef HAVE_READLINE_READLINE_H
+#undef HAVE_PTHREAD_H
+#undef HAVE_SIGNAL_H
+#undef HAVE_STDARG_H
+#undef HAVE_STDLIB_H
+#undef HAVE_STRING_H
 #undef HAVE_SYS_TYPES_H
 #undef HAVE_SYS_STAT_H
 #undef HAVE_SYS_UIO_H
 #undef HAVE_SYS_WAIT_H
-#undef HAVE_TIME_H
 #undef HAVE_SYS_TIME_H
+#undef HAVE_SYS_TIMEB_H
 #undef HAVE_SYS_PARAM_H
+#undef HAVE_TIME_H
+#undef HAVE_UNISTD_H
 #undef HAVE_VARARGS_H
-#undef HAVE_STDARG_H
-#undef HAVE_STDLIB_H
-#undef HAVE_CTYPE_H
-#undef HAVE_STRING_H
-#undef HAVE_LIB_IO_H
-#undef HAVE_SIGNAL_H
-#undef HAVE_READLINE_READLINE_H
-#undef HAVE_PWD_H
 
 /* types */
 #undef socklen_t