[Firebird-checkins] CVS: firebird2/builds/install/misc firebird.conf.in, NONE, 1.3.4.2 fb_config.in, 1.2.20.2, 1.2.20.3 fbintl.conf, 1.16, 1.16.8.1 firebird.conf, 1.40.4.5, NONE

[Adriano d. S. F. <asf...@us...>]

Build Version :  T3.0.0.25805 Firebird 3.0 Unstable

(writeBuildNum.sh,v 1.25973 2009/10/20 21:24:58 asfernandes )

Update of /cvsroot/firebird/firebird2/builds/install/misc
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27220/builds/install/misc

Modified Files:
      Tag: B2_5_ExtEngines
	fb_config.in fbintl.conf 
Added Files:
      Tag: B2_5_ExtEngines
	firebird.conf.in 
Removed Files:
      Tag: B2_5_ExtEngines
	firebird.conf 
Log Message:
Sync. with HEAD


--- firebird.conf.in ADDED ---

Index: fb_config.in
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/misc/fb_config.in,v
retrieving revision 1.2.20.2
retrieving revision 1.2.20.3
diff -b -U3 -r1.2.20.2 -r1.2.20.3
--- fb_config.in	17 Sep 2009 14:41:24 -0000	1.2.20.2
+++ fb_config.in	20 Oct 2009 21:24:56 -0000	1.2.20.3
@@ -26,6 +26,20 @@
 fb_bindir=@FB_BINDIR@
 fb_libdir=@FB_LIBDIR@
 fb_incdir=@FB_INCDIR@
+fb_udfdir=@FB_UDFDIR@
+fb_sbindir=@FB_SBINDIR@
+fb_confdir=@FB_CONFDIR@
+fb_docdir=@FB_DOCDIR@
+fb_sampledir=@FB_SAMPLEDIR@
+fb_sampledbdir=@FB_SAMPLEDBDIR@
+fb_helpdir=@FB_HELPDIR@
+fb_intldir=@FB_INTLDIR@
+fb_miscdir=@FB_MISCDIR@
+fb_securedbdir=@FB_SECDBDIR@
+fb_msgdir=@FB_MSGDIR@
+fb_logdir=@FB_LOGDIR@
+fb_glockdir=@FB_GUARDDIR@
+fb_pluginsdir=@FB_PLUGDIR@
 
 fb_cflags="-I$fb_incdir"
 fb_libs="-L$fb_libdir -lfbclient"
@@ -50,6 +64,20 @@
      --libs
      --embedlibs
      --bindir
+     --udfdir
+     --sbindir
+     --confdir
+     --docdir
+     --sampledir
+     --sampledbdir
+     --helpdir
+     --intldir
+     --miscdir
+     --securedbdir
+     --msgdir
+     --logdir
+     --glockdir
+     --pluginsdir
      --version
 EOF
 }
@@ -67,6 +95,20 @@
         --libs) echo $fb_libs ;;
         --embedlibs) echo $fb_embedlibs ;;
         --bindir) echo $fb_bindir ;;
+        --udfdir) echo $fb_udfdir ;;
+        --sbindir) echo $fb_sbindir ;;
+        --confdir) echo $fb_confdir ;;
+        --docdir) echo $fb_docdir ;;
+        --sampledir) echo $fb_sampledir ;;
+        --helpdir) echo $fb_helpdir ;;
+        --intldir) echo $fb_intldir ;;
+        --miscdir) echo $fb_miscdir ;;
+        --securedbdir) echo $fb_securedbdir ;;
+        --msgdir) echo $fb_msgdir ;;
+        --logdir) echo $fb_logdir ;;
+        --glockdir) echo $fb_glockdir ;;
+        --pluginsdir) echo $fb_pluginsdir ;;
+        --sampledbdir) echo $fb_sampledbdir ;;
         --version) echo $fb_version ;;
         --help) usage ;;
         *) usage ;

Index: fbintl.conf
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/misc/fbintl.conf,v
retrieving revision 1.16
retrieving revision 1.16.8.1
diff -b -U3 -r1.16 -r1.16.8.1
--- fbintl.conf	19 Jul 2007 01:25:18 -0000	1.16
+++ fbintl.conf	20 Oct 2009 21:24:56 -0000	1.16.8.1
@@ -369,3 +369,9 @@
 	collation	CP943C			ibm-943_P15A-2003
 	collation	CP943C_UNICODE
 </charset>
+
+<charset GB18030>
+	intl_module	fbintl
+	collation	GB18030
+	collation	GB18030_UNICODE
+</charset>

--- firebird.conf DELETED ---