svn commit: r1354845 - in /incubator/ooo/trunk: ext_libraries/apr-util/makefile.mk main/configure.in main/set_soenv.in main/solenv/inc/libs.mk main/ucb/source/ucp/webdav/makefile.mk

[af...@apache.org]

Author: af
Date: Thu Jun 28 07:52:01 2012
New Revision: 1354845

URL: http://svn.apache.org/viewvc?rev=1354845&view=rev
Log:
#i118906# Renamed APRUTIL to APR_UTIL.

Modified:
    incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk
    incubator/ooo/trunk/main/configure.in
    incubator/ooo/trunk/main/set_soenv.in
    incubator/ooo/trunk/main/solenv/inc/libs.mk
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/makefile.mk

Modified: incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk?rev=1354845&r1=1354844&r2=1354845&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk (original)
+++ incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk Thu Jun 28 07:52:01 2012
@@ -39,10 +39,10 @@ all:
 .ELSE
 
 # Assemble the full version number from the parts defined in aprutil_version.mk
-APRUTIL_VERSION=$(APR_UTIL_MAJOR).$(APR_UTIL_MINOR).$(APR_UTIL_MICRO)
+APR_UTIL_VERSION=$(APR_UTIL_MAJOR).$(APR_UTIL_MINOR).$(APR_UTIL_MICRO)
 
 
-TARFILE_NAME=$(PRJNAME)-$(APRUTIL_VERSION)
+TARFILE_NAME=$(PRJNAME)-$(APR_UTIL_VERSION)
 TARFILE_MD5=666a5d56098a9debf998510e304c8095
 
 .IF "$(OS)"=="WNT"

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1354845&r1=1354844&r2=1354845&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Thu Jun 28 07:52:01 2012
@@ -4477,22 +4477,22 @@ AC_SUBST(APR_LIBS)
 dnl ===================================================================
 dnl Check for system apr-util
 dnl ===================================================================
-SYSTEM_APRUTIL=NO
-APRUTIL_CFLAGS=
-APRUTIL_LIBS=
+SYSTEM_APR_UTIL=NO
+APR_UTIL_CFLAGS=
+APR_UTIL_LIBS=
 AC_MSG_CHECKING([which libapr-util to use])
 if test "x$with_system_apr_util" = "xyes" -o -n "$with_system_libs"; then
     AC_MSG_RESULT([system])
-    PKG_CHECK_MODULES([APRUTIL], [apr-util-1 >= 1.0])
-    SYSTEM_APRUTIL=YES
+    PKG_CHECK_MODULES([APR_UTIL], [apr-util-1 >= 1.0])
+    SYSTEM_APR_UTIL=YES
 else
     AC_MSG_RESULT([internal])
-    SYSTEMAPR_UTIL=NO
+    SYSTEM_APR_UTIL=NO
     BUILD_TYPE="$BUILD_TYPE APR_UTIL"
 fi
-AC_SUBST(SYSTEM_APRUTIL)
-AC_SUBST(APRUTIL_CFLAGS)
-AC_SUBST(APRUTIL_LIBS)
+AC_SUBST(SYSTEM_APR_UTIL)
+AC_SUBST(APR_UTIL_CFLAGS)
+AC_SUBST(APR_UTIL_LIBS)
 
 
 dnl ===================================================================

Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1354845&r1=1354844&r2=1354845&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Thu Jun 28 07:52:01 2012
@@ -1988,9 +1988,9 @@ ToFile( "ENABLE_JAVASCRIPT", "@ENABLE_JA
 ToFile( "SYSTEM_APR",        "@SYSTEM_APR@",       "e" );
 ToFile( "APR_CFLAGS",        "@APR_CFLAGS@",       "e" );
 ToFile( "APR_LIBS",          "@APR_LIBS@",         "e" );
-ToFile( "SYSTEM_APRUTIL",    "@SYSTEM_APRUTIL@",   "e" );
-ToFile( "APRUTIL_CFLAGS",    "@APRUTIL_CFLAGS@",   "e" );
-ToFile( "APRUTIL_LIBS",      "@APRUTIL_LIBS@",     "e" );
+ToFile( "SYSTEM_APR_UTIL",   "@SYSTEM_APR_UTIL@",  "e" );
+ToFile( "APR_UTIL_CFLAGS",   "@APR_UTIL_CFLAGS@",  "e" );
+ToFile( "APR_UTIL_LIBS",     "@APR_UTIL_LIBS@",    "e" );
 ToFile( "SYSTEM_SERF",       "@SYSTEM_SERF@",      "e" );
 ToFile( "SERF_CFLAGS",       "@SERF_CFLAGS@",      "e" );
 ToFile( "SERF_LIBS",         "@SERF_LIBS@",        "e" );

Modified: incubator/ooo/trunk/main/solenv/inc/libs.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/libs.mk?rev=1354845&r1=1354844&r2=1354845&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/libs.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/libs.mk Thu Jun 28 07:52:01 2012
@@ -356,7 +356,7 @@ MYTHESLIB=-lmythes-1.2
 PYUNOLIB=-lpyuno
 COINMPLIBS=-lCoinMP -lCoinUtils -lClp -lCbc -lOsi -lOsiClp -lCgl -lCbcSolver
 INTERNAL_APR_LIBS=-lapr-1
-INTERNAL_APRUTIL_LIBS=-laprutil-1
+INTERNAL_APR_UTIL_LIBS=-laprutil-1
 INTERNAL_SERF_LIBS=-lserf-1
 SOFFICELIB=-lsofficeapp
 UNOPKGAPPLIB=-lunopkgapp
@@ -529,7 +529,7 @@ MYTHESLIB=libmythes.lib
 PYUNOLIB=ipyuno.lib
 COINMPLIBS=CoinMP.lib
 INTERNAL_APR_LIBS=libapr-1.lib
-INTERNAL_APRUTIL_LIBS=iapr-util.lib
+INTERNAL_APR_UTIL_LIBS=iapr-util.lib
 INTERNAL_SERF_LIBS=iserf.lib
 SOFFICELIB=isofficeapp.lib
 UNOPKGAPPLIB=iunopkgapp.lib

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/makefile.mk?rev=1354845&r1=1354844&r2=1354845&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/makefile.mk (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/makefile.mk Thu Jun 28 07:52:01 2012
@@ -63,12 +63,12 @@ CFLAGS+= -I$(SOLARINCDIR)$/$(APRINCDIR)
 SHL1STDLIBS+=$(INTERNAL_APR_LIBS)
 .ENDIF
 
-.IF "$(SYSTEM_APRUTIL)" == "YES"
-CFLAGS+= $(APRUTIL_CFLAGS)
-SHL1STDLIBS+=$(APRUTIL_LIBS)
+.IF "$(SYSTEM_APR_UTIL)" == "YES"
+CFLAGS+= $(APR_UTIL_CFLAGS)
+SHL1STDLIBS+=$(APR_UTIL_LIBS)
 .ELSE
-CFLAGS+= -I$(SOLARINCDIR)$/$(APRUTILINCDIR)
-SHL1STDLIBS+=$(INTERNAL_APRUTIL_LIBS)
+CFLAGS+= -I$(SOLARINCDIR)$/$(APR_UTIL_INCDIR)
+SHL1STDLIBS+=$(INTERNAL_APR_UTIL_LIBS)
 .ENDIF
 
 .IF "$(SYSTEM_SERF)" == "YES"