CWS-TOOLING: integrate CWS rptfix04

2009-02-23 01:59:54 +0100 rene  r268341 : #i10000# fix system-jfreereport build
2009-02-13 10:17:16 +0100 oj  r267696 : #i98549# integrate zip form pentaho package
2009-02-03 14:48:34 +0100 oj  r267330 : set formula locale to doc locale
2009-02-03 14:45:54 +0100 oj  r267329 : set formula locale to doc locale
2009-02-03 11:50:03 +0100 oj  r267311 : set formula locale to doc locale
2009-02-03 08:55:02 +0100 oj  r267297 : unix line ends
2009-01-28 11:21:24 +0100 rene  r267043 : #i98549# s/DESIGN/BUILDER/ also for Sun
2009-01-27 17:17:50 +0100 rene  r267012 : merge builfix from trunk
2009-01-27 14:16:30 +0100 rene  r266991 : #i10000# fix rebase which left out the whole changes in former config_office; sync variable names (s/LIB_//) and some other things
2009-01-27 10:01:09 +0100 oj  r266959 : CWS-TOOLING: rebase CWS rptfix04 to trunk@266944 (milestone: DEV300:m40)
2009-01-27 08:00:16 +0100 oj  r266951 : conflict in mergeinfo
2009-01-26 12:23:03 +0100 oj  r266914 : #i98383# fix grouping
2009-01-23 22:03:03 +0100 rene  r266852 : fix --enable-report-builder description
2009-01-23 10:37:27 +0100 oj  r266778 : set escape processing when set at query
2009-01-23 09:17:16 +0100 fs  r266770 : add CWS name to version
2009-01-21 13:57:35 +0100 oj  r266669 : merge for build bots
2009-01-20 09:07:24 +0100 oj  r266552 : CWS-TOOLING: rebase CWS rptfix04 to trunk@266428 (milestone: DEV300:m39)
2009-01-20 08:34:16 +0100 oj  r266551 : rebase
2009-01-20 08:33:59 +0100 oj  r266550 : rebase
2009-01-20 08:32:50 +0100 oj  r266549 : rebase
2009-01-20 08:30:13 +0100 oj  r266548 : rebase
2009-01-20 08:29:30 +0100 oj  r266547 : rebase
2009-01-20 08:22:33 +0100 oj  r266546 : merge short cuts from dba31g
2009-01-19 21:04:08 +0100 rene  r266525 : #i10000# we need officecfg for component-update.dtd
2009-01-19 21:01:26 +0100 rene  r266524 : #i10000# fix import
2009-01-19 20:26:20 +0100 rene  r266523 : #i10000# remove svn conflicts markers; fix build
2009-01-19 14:23:56 +0100 rene  r266496 : libbase depends on apache-commons..
2009-01-19 14:00:42 +0100 oj  r266495 : merge from m39
2009-01-19 12:39:00 +0100 oj  r266489 : CWS-TOOLING: rebase CWS rptfix04 to trunk@266428 (milestone: DEV300:m39)
2009-01-16 11:47:04 +0100 oj  r266410 : #i97560# add , between expressions
2009-01-09 17:11:38 +0100 rene  r266103 : don't show "checking which Apache commons-* libs to use" when we neither build the wiki editor nor  the SRB
2009-01-09 16:48:02 +0100 rene  r266099 : #i10000# reportbuilder needs apache-commons
2009-01-09 15:43:35 +0100 oj  r266093 : use of new nspaces
2009-01-09 15:41:34 +0100 oj  r266092 : use of new nspaces
2009-01-09 14:44:15 +0100 rene  r266088 : fix typo/description
2009-01-09 12:48:51 +0100 rene  r266074 : #i10000# fix install
2009-01-09 11:52:53 +0100 rene  r266070 : #i10000# more build fixes
2009-01-09 10:53:13 +0100 rene  r266062 : #i10000# ENABLE_REPORTBUILDER also in set_soenv.in, fix typo
2009-01-09 10:40:24 +0100 rene  r266060 : #i10000# configure fix for new reportbuilder module, typo fix at libfonts
2009-01-09 10:01:52 +0100 rene  r266055 : #i10000# adapt to current configure.in
2009-01-09 09:59:32 +0100 oj  r266054 : add new pentaho jars
2009-01-09 09:47:54 +0100 oj  r266049 : merge changes from DEV300_m39
2009-01-09 09:14:08 +0100 oj  r266048 : merge from DEV300_m39
2009-01-09 08:28:43 +0100 oj  r266045 : merge changes from dba31g
2009-01-09 07:58:10 +0100 oj  r266044 : replace JCOMMON with LIB
2009-01-08 13:42:24 +0100 oj  r266005 : move ext to reportbuilder
2009-01-08 13:41:38 +0100 oj  r266004 : add dep for license
2009-01-08 13:27:56 +0100 oj  r266001 : new module for Sun report Builder extension
2009-01-07 12:58:13 +0100 oj  r265960 : CWS-TOOLING: rebase CWS rptfix04 to trunk@265758 (milestone: DEV300:m38)
2008-12-15 13:47:18 +0100 oj  r265481 : new pentaho resources
2008-12-15 10:04:01 +0100 oj  r265462 : integrate new pentaho sources
2008-12-15 10:02:54 +0100 oj  r265461 : #i96888# fix date time function
2008-12-12 09:23:29 +0100 oj  r265389 : #97174# check of res < 0 removed
2008-12-12 09:15:54 +0100 oj  r265388 : #i9716# fix for DayFunction
2008-12-11 12:24:24 +0100 oj  r265281 : integrate new pentaho sources
2008-12-11 11:49:16 +0100 oj  r265273 : integrate new pentaho sources
2008-12-11 09:34:07 +0100 oj  r265248 : integrate new pentaho sources
2008-12-10 18:58:06 +0100 oj  r265227 : introduce new pentaho sources
2008-12-10 18:56:43 +0100 oj  r265226 : introduce new pentaho sources
2008-12-10 18:54:26 +0100 oj  r265225 : introduce new pentaho sources
2008-12-10 18:42:59 +0100 oj  r265221 : introduce new pentaho sources
2008-12-10 17:24:23 +0100 oj  r265212 : introduce new pentaho sources
2008-12-10 17:24:07 +0100 oj  r265211 : new pentaho sources
2008-12-10 17:23:00 +0100 oj  r265210 : introduce new pentaho sources

1 files changed, 105 insertions, 98 deletions

diff --git a/configure.in b/configure.in
index 2303020b3f1b..5c97417dc40d 100644
--- a/configure.in
+++ b/configure.in
@@ -414,15 +414,11 @@ AC_ARG_WITH(servlet-api-jar,
 [ SERVLETAPI_JAR="$withval"
 ])
 AC_ARG_ENABLE(report-builder,
-[  --enable-report-builder  disables the build of the Report Builder extension
+[  --enable-report-builder  enables the build of the Report Builder extension
 ],,)
 AC_ARG_WITH(system-jfreereport,
 [  --with-system-jfreereport      Use JFreeReport already on system
 ],,)
-AC_ARG_WITH(jcommon-jar,
-[  --with-jcommon-jar=JARFILE   Specify path to jarfile manually ],
-[ JCOMMON_JAR="$withval"
-])
 AC_ARG_WITH(sac-jar,
 [  --with-sac-jar=JARFILE   Specify path to jarfile manually ],
 [ SAC_JAR="$withval"
@@ -463,9 +459,13 @@ AC_ARG_WITH(libfonts-jar,
 [  --with-libfonts-jar=JARFILE   Specify path to jarfile manually ],
 [ LIBFONTS_JAR="$withval"
 ])
-AC_ARG_WITH(jcommon-serializer-jar,
-[  --with-jcommon-serializer-jar=JARFILE   Specify path to jarfile manually ],
-[ JCOMMON_SERIALIZER_JAR="$withval"
+AC_ARG_WITH(libserializer-jar,
+[  --libserializer-jar=JARFILE   Specify path to jarfile manually ],
+[ LIBSERIALIZER_JAR="$withval"
+])
+AC_ARG_WITH(libbase-jar,
+[  --with-libbase-jar=JARFILE   Specify path to jarfile manually ],
+[ LIBBASE_JAR="$withval"
 ])
 AC_ARG_WITH(system-saxon,
 [  --with-system-saxon     Use saxon already on system
@@ -5418,56 +5418,12 @@ if test -n "$enable_wiki_publisher" -a "$enable_wiki_publisher" != "no" && test
    AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
   fi
   ENABLE_MEDIAWIKI=YES
-  AC_MSG_CHECKING([which Apache commons-* libs to use])
-  if test "$with_system_apache_commons" == "yes"; then
-  	SYSTEM_APACHE_COMMONS=YES
-	AC_MSG_RESULT([external])
-	if test -z "$COMMONS_CODEC_JAR"; then
-		COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar
-	fi
-   AC_CHECK_FILE($COMMONS_CODEC_JAR, [],
-        [AC_MSG_ERROR(commons-codec.jar not found.)], [])
-	if test -z "$COMMONS_LANG_JAR"; then
-		COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar
-	fi
-   AC_CHECK_FILE($COMMONS_LANG_JAR, [],
-        [AC_MSG_ERROR(commons-lang.jar not found.)], [])
-	if test -z "$COMMONS_HTTPCLIENT_JAR"; then
-		COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar
-	fi
-   AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [],
-        [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
-
-   if test -z $COMMONS_LOGGING_JAR; then
-     AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar, 
-       [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar ],
-       [
-         AC_CHECK_FILE(/usr/share/java/commons-logging.jar, 
-           [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ],
-           [AC_MSG_ERROR(commons-logging.jar replacement not found.)]
-         )
-       ]
-     )
-   else
-     AC_CHECK_FILE($COMMONS_LOGGING_JAR, [],
-          [AC_MSG_ERROR(commons-logging.jar not found.)], [])
-   fi
-  else
-	AC_MSG_RESULT([internal])
-  	SYSTEM_APACHE_COMMONS=NO
-  	BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
-  fi
   BUILD_TYPE="$BUILD_TYPE SWEXT"
 else
   AC_MSG_RESULT([no])
   ENABLE_MEDIAWIKI=NO
 fi
 AC_SUBST(ENABLE_MEDIAWIKI)
-AC_SUBST(SYSTEM_APACHE_COMMONS)
-AC_SUBST(COMMONS_CODEC_JAR)
-AC_SUBST(COMMONS_LANG_JAR)
-AC_SUBST(COMMONS_HTTPCLIENT_JAR)
-AC_SUBST(COMMONS_LOGGING_JAR)
 
 if test "$ENABLE_MEDIAWIKI" == "YES"; then
   AC_MSG_CHECKING([which Servlet API Jar to use])
@@ -5492,25 +5448,16 @@ AC_MSG_CHECKING([whether to build the Report Builder extension])
 if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test "$WITH_JAVA" != "no"; then
   AC_MSG_RESULT([yes])
   ENABLE_REPORTBUILDER=YES
+  AC_MSG_CHECKING([for reportbuilder module])
+  if test -d ./reportbuilder; then
+    AC_MSG_RESULT([OK])
+  else
+    AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
+  fi
   AC_MSG_CHECKING([which jfreereport libs to use])
   if test "$with_system_jfreereport" == "yes"; then
    	SYSTEM_JFREEREPORT=YES
   	   AC_MSG_RESULT([external])
-      if test -z $JCOMMON_JAR; then
-        AC_CHECK_FILE(/usr/share/java/jcommon-1.0.10.jar, 
-          [ JCOMMON_JAR=/usr/share/java/jcommon-1.0.10.jar ],
-          [
-            AC_CHECK_FILE(/usr/share/java/jcommon.jar, 
-              [ JCOMMON_JAR=/usr/share/java/jcommon.jar ],
-              [AC_MSG_ERROR(jcommon.jar replacement not found.)]
-            )
-          ]
-        )
-      else
-        AC_CHECK_FILE($JCOMMON_JAR, [],
-             [AC_MSG_ERROR(jcommon.jar not found.)], [])
-      fi
-
       if test -z $SAC_JAR; then
              SAC_JAR=/usr/share/java/sac.jar
       fi
@@ -5518,8 +5465,8 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
              [AC_MSG_ERROR(sac.jar not found.)], [])
 
       if test -z $LIBXML_JAR; then
-        AC_CHECK_FILE(/usr/share/java/libxml-0.9.9.jar, 
-          [ LIBXML_JAR=/usr/share/java/libxml-0.9.9.jar ],
+        AC_CHECK_FILE(/usr/share/java/libxml-1.0.0.jar, 
+          [ LIBXML_JAR=/usr/share/java/libxml-1.0.0.jar ],
           [
             AC_CHECK_FILE(/usr/share/java/libxml.jar, 
               [ LIBXML_JAR=/usr/share/java/libxml.jar ],
@@ -5533,26 +5480,26 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
       fi
 
       if test -z $FLUTE_JAR; then
-        AC_CHECK_FILE(/usr/share/java/flute-1.3-jfree-20061107.jar, 
-          [ FLUTE_JAR=/usr/share/java/flute-1.3-jfree-20061107.jar ],
+        AC_CHECK_FILE(/usr/share/java/flute-1.3.0.jar, 
+          [ FLUTE_JAR=/usr/share/java/flute-1.3.0.jar ],
           [
             AC_CHECK_FILE(/usr/share/java/flute.jar, 
               [ FLUTE_JAR=/usr/share/java/flute.jar ],
-              [ AC_MSG_ERROR(flute-1.3-jfree.jar replacement not found.)]
+              [ AC_MSG_ERROR(flute-1.3.0.jar replacement not found.)]
             )
           ]
         )
       else
         AC_CHECK_FILE($FLUTE_JAR, [],
-             [AC_MSG_ERROR(flute-1.3-jfree.jar not found.)], [])
+             [AC_MSG_ERROR(flute-1.3.0.jar not found.)], [])
       fi
 
       if test -z $JFREEREPORT_JAR; then
-        AC_CHECK_FILE(/usr/share/java/pentaho-reporting-flow-engine-0.9.2.jar, 
-          [ JFREEREPORT_JAR=/usr/share/java/pentaho-reporting-flow-engine-0.9.2.jar ],
+        AC_CHECK_FILE(/usr/share/java/flow-engine-0.9.2.jar, 
+          [ JFREEREPORT_JAR=/usr/share/java/flow-engine-0.9.2.jar ],
           [
-            AC_CHECK_FILE(/usr/share/java/pentaho-reporting-flow-engine.jar, 
-              [ JFREEREPORT_JAR=/usr/share/java/pentaho-reporting-flow-engine.jar ],
+            AC_CHECK_FILE(/usr/share/java/flow-engine.jar, 
+              [ JFREEREPORT_JAR=/usr/share/java/flow-engine.jar ],
               [AC_MSG_ERROR(jfreereport.jar replacement not found.)]
             )
           ]
@@ -5563,8 +5510,8 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
       fi
 
       if test -z $LIBLAYOUT_JAR; then
-        AC_CHECK_FILE(/usr/share/java/liblayout-0.2.8.jar, 
-          [ LIBLAYOUT_JAR=/usr/share/java/liblayout-0.2.8.jar ],
+        AC_CHECK_FILE(/usr/share/java/liblayout-0.2.9.jar, 
+          [ LIBLAYOUT_JAR=/usr/share/java/liblayout-0.2.9.jar ],
           [
             AC_CHECK_FILE(/usr/share/java/liblayout.jar, 
               [ LIBLAYOUT_JAR=/usr/share/java/liblayout.jar ],
@@ -5578,8 +5525,8 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
       fi
 
       if test -z $LIBLOADER_JAR; then
-        AC_CHECK_FILE(/usr/share/java/libloader-0.3.6.jar, 
-          [ LIBLOADER_JAR=/usr/share/java/libloader-0.3.6.jar ],
+        AC_CHECK_FILE(/usr/share/java/libloader-1.0.0.jar, 
+          [ LIBLOADER_JAR=/usr/share/java/libloader-1.0.0.jar ],
           [
             AC_CHECK_FILE(/usr/share/java/libloader.jar, 
               [ LIBLOADER_JAR=/usr/share/java/libloader.jar ],
@@ -5593,8 +5540,8 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
       fi
 
       if test -z $LIBFORMULA_JAR; then
-        AC_CHECK_FILE(/usr/share/java/libformula-0.1.14.jar, 
-          [ LIBFORMULA_JAR=/usr/share/java/libformula-0.1.14.jar ],
+        AC_CHECK_FILE(/usr/share/java/libformula-0.2.0.jar, 
+          [ LIBFORMULA_JAR=/usr/share/java/libformula-0.2.0.jar ],
           [
             AC_CHECK_FILE(/usr/share/java/libformula.jar, 
               [ LIBFORMULA_JAR=/usr/share/java/libformula.jar ],
@@ -5608,8 +5555,8 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
       fi
 
       if test -z $LIBREPOSITORY_JAR; then
-        AC_CHECK_FILE(/usr/share/java/librepository-0.1.4.jar, 
-          [ LIBREPOSITORY_JAR=/usr/share/java/librepository-0.1.4.jar ],
+        AC_CHECK_FILE(/usr/share/java/librepository-1.0.0.jar, 
+          [ LIBREPOSITORY_JAR=/usr/share/java/librepository-1.0.0.jar ],
           [
             AC_CHECK_FILE(/usr/share/java/librepository.jar, 
               [ LIBREPOSITORY_JAR=/usr/share/java/librepository.jar ],
@@ -5623,8 +5570,8 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
       fi
 
       if test -z $LIBFONTS_JAR; then
-        AC_CHECK_FILE(/usr/share/java/libfonts-0.3.3.jar, 
-          [ LIBFONTS_JAR=/usr/share/java/libfonts-0.3.3.jar ],
+        AC_CHECK_FILE(/usr/share/java/libfonts-1.0.0.jar, 
+          [ LIBFONTS_JAR=/usr/share/java/libfonts-1.0.0.jar ],
           [
             AC_CHECK_FILE(/usr/share/java/libfonts.jar, 
               [ LIBFONTS_JAR=/usr/share/java/libfonts.jar ],
@@ -5637,19 +5584,35 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
              [AC_MSG_ERROR(libfonts.jar not found.)], [])
       fi
 
-      if test -z $JCOMMON_SERIALIZER_JAR; then
-        AC_CHECK_FILE(/usr/share/java/jcommon-serializer-0.2.0.jar, 
-          [ JCOMMON_SERIALIZER_JAR=/usr/share/java/jcommon-serializer-0.2.0.jar ],
+      if test -z $LIBSERIALIZER_JAR; then
+        AC_CHECK_FILE(/usr/share/java/libserializer-1.0.0.jar, 
+          [ LIBSERIALIZER_JAR=/usr/share/java/libserializer-1.0.0.jar ],
           [
-            AC_CHECK_FILE(/usr/share/java/jcommon-serializer.jar, 
-              [ JCOMMON_SERIALIZER_JAR=/usr/share/java/jcommon-serializer.jar ],
-              [AC_MSG_ERROR(jcommon-serializer.jar replacement not found.)]
+            AC_CHECK_FILE(/usr/share/java/libserializer.jar, 
+              [ LIBSERIALIZER_JAR=/usr/share/java/libserializer.jar ],
+              [AC_MSG_ERROR(libserializer.jar replacement not found.)]
             )
           ]
         )
       else
-        AC_CHECK_FILE($JCOMMON_SERIALIZER_JAR, [],
-             [AC_MSG_ERROR(jcommon-serializer.jar not found.)], [])
+        AC_CHECK_FILE($LIBSERIALIZER_JAR, [],
+             [AC_MSG_ERROR(libserializer.jar not found.)], [])
+      fi
+
+
+      if test -z $LIBBASE_JAR; then
+        AC_CHECK_FILE(/usr/share/java/libbase-1.0.0.jar, 
+          [ LIBBASE_JAR=/usr/share/java/libbase-1.0.0.jar ],
+          [
+            AC_CHECK_FILE(/usr/share/java/libbase.jar, 
+              [ LIBBASE_JAR=/usr/share/java/libbase.jar ],
+              [AC_MSG_ERROR(libbase.jar replacement not found.)]
+            )
+          ]
+        )
+      else
+        AC_CHECK_FILE($LIBBASE_JAR, [],
+             [AC_MSG_ERROR(libbase.jar not found.)], [])
       fi
 
   else
@@ -5663,7 +5626,7 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
      SYSTEM_JFREEREPORT=NO
      BUILD_TYPE="$BUILD_TYPE JFREEREPORT"
   fi
-  BUILD_TYPE="$BUILD_TYPE REPORTDESIGN"
+  BUILD_TYPE="$BUILD_TYPE REPORTBUILDER"
 else
   AC_MSG_RESULT([no])
   ENABLE_REPORTBUILDER=NO
@@ -5671,17 +5634,61 @@ else
 fi
 AC_SUBST(ENABLE_REPORTBUILDER)
 AC_SUBST(SYSTEM_JFREEREPORT)
-AC_SUBST(JCOMMON_JAR)
 AC_SUBST(SAC_JAR)
 AC_SUBST(LIBXML_JAR)
 AC_SUBST(FLUTE_JAR)
 AC_SUBST(JFREEREPORT_JAR)
+AC_SUBST(LIBBASE_JAR)
 AC_SUBST(LIBLAYOUT_JAR)
 AC_SUBST(LIBLOADER_JAR)
 AC_SUBST(LIBFORMULA_JAR)
 AC_SUBST(LIBREPOSITORY_JAR)
 AC_SUBST(LIBFONTS_JAR)
-AC_SUBST(JCOMMON_SERIALIZER_JAR)
+AC_SUBST(LIBSERIALIZER_JAR)
+
+# this has to be here because both the wiki publisher and the SRB use
+# commons-logging
+if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
+  AC_MSG_CHECKING([which Apache commons-* libs to use])
+  if test "$with_system_apache_commons" = "yes"; then
+       SYSTEM_APACHE_COMMONS=YES
+       AC_MSG_RESULT([external])
+    if test "$ENABLE_MEDIAWIKI" = "YES"; then
+        if test -z "$COMMONS_CODEC_JAR"; then
+                COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar
+        fi
+   AC_CHECK_FILE($COMMONS_CODEC_JAR, [],
+        [AC_MSG_ERROR(commons-codec.jar not found.)], [])
+        if test -z "$COMMONS_LANG_JAR"; then
+                COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar
+        fi
+   AC_CHECK_FILE($COMMONS_LANG_JAR, [],
+        [AC_MSG_ERROR(commons-lang.jar not found.)], [])
+        if test -z "$COMMONS_HTTPCLIENT_JAR"; then
+                COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar
+        fi
+   AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [],
+        [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
+    fi
+    if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
+        if test -z "$COMMONS_LOGGING_JAR"; then
+                COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar
+        fi
+   AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [],
+        [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
+
+    fi
+  else
+        AC_MSG_RESULT([internal])
+        SYSTEM_APACHE_COMMONS=NO
+        BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
+  fi
+fi
+AC_SUBST(SYSTEM_APACHE_COMMONS)
+AC_SUBST(COMMONS_CODEC_JAR)
+AC_SUBST(COMMONS_LANG_JAR)
+AC_SUBST(COMMONS_HTTPCLIENT_JAR)
+AC_SUBST(COMMONS_LOGGING_JAR)
 
 dnl ===================================================================
 dnl Check whether the Qt and KDE libraries are available.