[Firebird-checkins] SF.net SVN: firebird:[51877] firebird/trunk

[<ale...@us...>]

Revision: 51877
          http://firebird.svn.sourceforge.net/firebird/?rev=51877&view=rev
Author:   alexpeshkoff
Date:     2010-11-08 18:12:03 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
Check for presence of ICU development package in configure, related cleanup

Modified Paths:
--------------
    firebird/trunk/builds/posix/make.defaults
    firebird/trunk/builds/posix/prefix.aix_powerpc
    firebird/trunk/builds/posix/prefix.aix_powerpc_xlc
    firebird/trunk/configure.in
    firebird/trunk/src/common/unicode_util.cpp
    firebird/trunk/src/intl/cs_icu.cpp
    firebird/trunk/src/intl/cv_icu.cpp

Modified: firebird/trunk/builds/posix/make.defaults
===================================================================
--- firebird/trunk/builds/posix/make.defaults	2010-11-08 16:37:07 UTC (rev 51876)
+++ firebird/trunk/builds/posix/make.defaults	2010-11-08 18:12:03 UTC (rev 51877)
@@ -161,7 +161,7 @@
 STATICEXE_LINK:= @CXX@ $(GLOB_OPTIONS)
 
 LINK_LIBS = @LIBS@
-ICU_LIBS = -licuuc -licudata -licui18n
+ICU_LIBS = -licuuc
 STATICLINK_LIBS = @LIBS@
 SO_LINK_LIBS = @LIBS@
 
@@ -307,7 +307,7 @@
 
 LINK_TRACE = $(LIB_LINK) $(LINK_TRACE_SYMBOLS) $(LIB_LINK_OPTIONS) $(UNDEF_FLAGS)\
  $(call LIB_LINK_SONAME,$(LIB_PREFIX)fbtrace.$(SHRLIB_EXT).0) $(call LIB_LINK_RPATH,lib)
-LINK_TRACE_LIBS = -L$(LIB) $(SO_LINK_LIBS) -licuuc
+LINK_TRACE_LIBS = -L$(LIB) $(SO_LINK_LIBS) $(ICU_LIBS)
 
 LINK_FIREBIRD = $(LIB_LINK) $(LINK_FIREBIRD_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_FIREBIRD_OPTIONS) $(UNDEF_FLAGS)\
  $(call LIB_LINK_SONAME,$(LibrarySoName)) $(call LIB_LINK_RPATH,lib)
@@ -315,7 +315,7 @@
 
 LINK_ENGINE = $(LIB_LINK) $(LINK_PLUGIN_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_FIREBIRD_OPTIONS) $(UNDEF_FLAGS)\
  $(call LIB_LINK_SONAME,$(EngineSoName)) $(call LIB_LINK_RPATH,lib)
-LINK_ENGINE_LIBS = $(LINK_FIREBIRD_LIBS) $(FIREBIRD_LIBRARY_LINK) -licuuc
+LINK_ENGINE_LIBS = $(LINK_FIREBIRD_LIBS) $(FIREBIRD_LIBRARY_LINK) $(ICU_LIBS)
 
 LINK_UDRENG = $(LIB_LINK) $(LINK_UDRENG_SYMBOLS) $(LIB_LINK_OPTIONS) $(call LIB_LINK_RPATH,lib) $(UNDEF_FLAGS)
 LINK_UDRENG_LIBS = -L$(LIB) $(SO_LINK_LIBS)

Modified: firebird/trunk/builds/posix/prefix.aix_powerpc
===================================================================
--- firebird/trunk/builds/posix/prefix.aix_powerpc	2010-11-08 16:37:07 UTC (rev 51876)
+++ firebird/trunk/builds/posix/prefix.aix_powerpc	2010-11-08 18:12:03 UTC (rev 51877)
@@ -52,7 +52,7 @@
 LIB_PATH_OPTS= -Wl,-blibpath:@FB_LIBDIR@:@FB_INTLDIR@:/usr/local/lib:/usr/lib:/lib:$(GCC_RUNTIME)
 
 ifeq ($(STD_ICU),true)
-   ICU_LIBS= -L/usr/local/lib -licuuc -licudata -licui18n
+   ICU_LIBS= -L/usr/local/lib -licuuc
 endif
 
 # non-firebird libraries have .a extension

Modified: firebird/trunk/builds/posix/prefix.aix_powerpc_xlc
===================================================================
--- firebird/trunk/builds/posix/prefix.aix_powerpc_xlc	2010-11-08 16:37:07 UTC (rev 51876)
+++ firebird/trunk/builds/posix/prefix.aix_powerpc_xlc	2010-11-08 18:12:03 UTC (rev 51877)
@@ -58,7 +58,7 @@
 LIB_PATH_OPTS= -blibpath:@FB_LIBDIR@:@FB_INTLDIR@:/usr/local/lib:/usr/lib:/lib
 
 ifeq ($(STD_ICU),true)
-   ICU_LIBS= -L/usr/local/lib -licuuc -licudata -licui18n
+   ICU_LIBS= -L/usr/local/lib -licuuc
 endif
 
 # non-firebird libraries have .a extension

Modified: firebird/trunk/configure.in
===================================================================
--- firebird/trunk/configure.in	2010-11-08 16:37:07 UTC (rev 51876)
+++ firebird/trunk/configure.in	2010-11-08 18:12:03 UTC (rev 51877)
@@ -52,11 +52,9 @@
 
 dnl Use /usr/lib for library links on most platforms except some 64-bit ones
 libdir=/usr/lib
-ICU_PLATFORM=LinuxRedHat
 
-dnl Should system editline and/or icu be used
+dnl Should system editline be used
 STD_EDITLINE=false
-STD_ICU=false
 RPM64=
 
 dnl Test for special ar options?
@@ -73,7 +71,6 @@
 	XE_APPEND(-framework CoreFoundation,LIBS)
     EDITLINE_FLG=Y
     SHRLIB_EXT=dylib
-    ICU_PLATFORM=MacOSX
     CPU_TYPE=x86_64
 	EXPORT_SYMBOLS_STYLE=darwin
     ;;
@@ -88,7 +85,6 @@
 	XE_APPEND(-framework CoreFoundation,LIBS)
     EDITLINE_FLG=Y
     SHRLIB_EXT=dylib
-    ICU_PLATFORM=MacOSX
 dnl CPU_TYPE=ppc64
 	EXPORT_SYMBOLS_STYLE=darwin
     ;;
@@ -100,10 +96,8 @@
         AR_OPT_CHECK=true
         TLS_OPTIONS="-qtls=default"
         MAKEFILE_PREFIX=aix_powerpc_xlc
-        ICU_PLATFORM=AIX4.3VA
     else
         MAKEFILE_PREFIX=aix_powerpc
-        ICU_PLATFORM=AIXGCC
     fi
     MAKEFILE_POSTFIX=aix
     PLATFORM=AIX
@@ -214,7 +208,6 @@
     EDITLINE_FLG=Y
     SHRLIB_EXT=so
     STD_EDITLINE=true
-    STD_ICU=true
     ;;
 
   sparc*-*-linux* | sparc*-*-gnu* | sparc*-*-k*bsd*-gnu)
@@ -318,7 +311,6 @@
     comp=`echo "$CXX" | cut -c1-3`
     case $comp in
        aCC) MAKEFILE_PREFIX=hpux_aCC ;
-           ICU_PLATFORM=HP-UX11ACC ;
            PTHREAD_CFLAGS=-mt
            ;;
        *)  MAKEFILE_PREFIX=hpux_ia64 ;
@@ -337,7 +329,6 @@
     comp=`echo "$CXX" | cut -c1-3`
     case $comp in
        aCC) MAKEFILE_PREFIX=hpux_aCC ;
-           ICU_PLATFORM=HP-UX11ACC ;
            PTHREAD_CFLAGS=-mt
            ;;
        *)  MAKEFILE_PREFIX=hpux ;
@@ -357,12 +348,10 @@
     comp=`echo "$CXX" | cut -c1-2`
     case $comp in
        CC) MAKEFILE_PREFIX=solaris
-           ICU_PLATFORM=SOLARISX86
            PTHREAD_CFLAGS=-mt
            PTHREAD_LIBS=-lpthread
            ;;
        *)  MAKEFILE_PREFIX=solx86gcc ;
-           ICU_PLATFORM=SOLARISX86GCC ;
            PTHREAD_CFLAGS=-pthreads ;;
     esac
     dnl if this is amd64 system, we should install our libraries in /usr/lib/amd64
@@ -383,7 +372,6 @@
     comp=`echo "$CXX" | cut -c1-3`
     case $comp in
        CC) MAKEFILE_PREFIX=solaris ;
-           ICU_PLATFORM=SOLARISCC 
            dnl inline assembly for atomic operations on Solaris 9 w SSPRO
            PTHREAD_CFLAGS=-mt
            PTHREAD_LIBS=-lpthread
@@ -392,7 +380,6 @@
            fi
            ;;
        *)  MAKEFILE_PREFIX=solaris-64gcc ;
-           ICU_PLATFORM=SOLARISGCC ;;
     esac
     CAS_OPTIONS=`pwd`"/src/common/classes/fb_cas.il";
     INSTALL_PREFIX=solaris
@@ -410,7 +397,6 @@
     EDITLINE_FLG=N
     RAW_DEVICES_FLG=N
     SHRLIB_EXT=dll
-	ICU_PLATFORM=MinGW
     ;;
 
   *)
@@ -428,7 +414,6 @@
 AC_SUBST(AR_OPTIONS)
 AC_SUBST(PLATFORM)
 AC_SUBST(SHRLIB_EXT)
-AC_SUBST(ICU_PLATFORM)
 AC_DEFINE(CASE_SENSITIVITY, true, [Define this if paths are case sensitive])
 AC_SUBST(RPM64)
 
@@ -535,15 +520,6 @@
 AC_SUBST(STD_EDITLINE)
 AC_SUBST(EDITLINE_FLG)
 
-AC_ARG_WITH(system-icu,
-  [  --with-system-icu       use OS supplied ICU],
-  [case "$withval" in
-     yes) STD_ICU=true;;
-     no)  STD_ICU=false;;
-     *)   AC_MSG_ERROR(bad value '${withval}' for --with-system-icu);;
-   esac])
-AC_SUBST(STD_ICU)
-
 FB_SERVICE_NAME=gds_db
 FB_SERVICE_PORT=3050
 FB_IPC_NAME=FirebirdIPI
@@ -685,6 +661,11 @@
 AC_CHECK_HEADERS(atomic.h)
 AC_CHECK_HEADERS(atomic_ops.h)
 
+dnl check for ICU presence
+AC_CHECK_HEADER(unicode/ucnv.h,,AC_MSG_ERROR(ICU support not found - please install development ICU package))
+dnl setting ICU_OK here is done to only avoid default action
+AC_CHECK_LIB(icuuc, main, ICU_OK=yes, AC_MSG_ERROR(ICU support not found - please install development ICU package))
+
 dnl Check for libraries
 AC_SEARCH_LIBS(dlopen, dl)
 AC_CHECK_LIB(m, main)
@@ -1192,7 +1173,6 @@
   solx86|SOLARIS)
     AC_CONFIG_FILES([gen/install/Pkginfo:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/pkginfo.in
                      gen/install/prototype.main:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/prototype.in
-                     gen/install/prototype.icu:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/prototype.icu.in
                      gen/install/Preinstall:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/preinstall.in
                      gen/install/Postinstall:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/postinstall.in
                      gen/install/Postremove:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/postremove.in
@@ -1238,15 +1218,8 @@
 if test "$STD_EDITLINE" = "false"; then
   AC_CONFIG_FILES(gen/Makefile.extern.editline:${MAKE_SRC_DIR}/Makefile.in.extern.editline)
 fi
-if test "$STD_ICU" = "false"; then
-  AC_CONFIG_FILES(gen/Makefile.extern.icu:${MAKE_SRC_DIR}/Makefile.in.extern.icu)
-fi
 
 
-if test "$PROD_BUILD_FLG" = N; then
-  DEBUG_ICU=--enable-debug
-fi
-
 case "$PLATFORM" in
   SOLARIS | solx86 )
 AC_CONFIG_FILES(
@@ -1255,14 +1228,7 @@
 ;;
 esac
 
-if test "$STD_ICU" = "true"; then
 AC_OUTPUT
-else
-AC_OUTPUT
-(cd extern/icu/source
-chmod +x runConfigureICU configure install-sh
-./runConfigureICU "$ICU_PLATFORM" "$DEBUG_ICU" --prefix=`pwd`/..)
-fi
 
 dnl Print out the build configuration (the most interesting thing)
 echo

Modified: firebird/trunk/src/common/unicode_util.cpp
===================================================================
--- firebird/trunk/src/common/unicode_util.cpp	2010-11-08 16:37:07 UTC (rev 51876)
+++ firebird/trunk/src/common/unicode_util.cpp	2010-11-08 18:12:03 UTC (rev 51877)
@@ -36,13 +36,14 @@
 #include "../common/classes/init.h"
 #include "../common/classes/objects_array.h"
 #include "../common/classes/rwlock.h"
-#include "unicode/ustring.h"
-#include "unicode/utrans.h"
-#include "unicode/uchar.h"
-#include "unicode/ucnv.h"
-#include "unicode/ucol.h"
 
+#include <unicode/ustring.h>
+#include <unicode/utrans.h>
+#include <unicode/uchar.h>
+#include <unicode/ucnv.h>
+#include <unicode/ucol.h>
 
+
 using namespace Firebird;
 
 

Modified: firebird/trunk/src/intl/cs_icu.cpp
===================================================================
--- firebird/trunk/src/intl/cs_icu.cpp	2010-11-08 16:37:07 UTC (rev 51876)
+++ firebird/trunk/src/intl/cs_icu.cpp	2010-11-08 18:12:03 UTC (rev 51877)
@@ -28,7 +28,7 @@
 #include "../intl/ldcommon.h"
 #include "cs_icu.h"
 #include "cv_icu.h"
-#include "unicode/ucnv.h"
+#include <unicode/ucnv.h>
 
 
 static void charset_destroy(charset* cs)

Modified: firebird/trunk/src/intl/cv_icu.cpp
===================================================================
--- firebird/trunk/src/intl/cv_icu.cpp	2010-11-08 16:37:07 UTC (rev 51876)
+++ firebird/trunk/src/intl/cv_icu.cpp	2010-11-08 18:12:03 UTC (rev 51877)
@@ -28,7 +28,7 @@
 #include "../intl/ldcommon.h"
 #include "ld_proto.h"
 #include "cv_icu.h"
-#include "unicode/ucnv.h"
+#include <unicode/ucnv.h>
 
 
 static UConverter* create_converter(csconvert* cv, UErrorCode* status)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.