svn commit: r757845 - in /apr/apr/trunk: Makefile.in configure.in util-misc/apu_dso.c

[jo...@apache.org]

Author: jorton
Date: Tue Mar 24 15:26:04 2009
New Revision: 757845

URL: http://svn.apache.org/viewvc?rev=757845&view=rev
Log:
* Makefile.in, configure.in: s/APU/APR/ in DSO handling code.
  Use default install prefix of $libdir/apr-$major/

* util-misc/apu_dso.c: Update likewise.

Modified:
    apr/apr/trunk/Makefile.in
    apr/apr/trunk/configure.in
    apr/apr/trunk/util-misc/apu_dso.c

Modified: apr/apr/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/Makefile.in?rev=757845&r1=757844&r2=757845&view=diff
==============================================================================
--- apr/apr/trunk/Makefile.in (original)
+++ apr/apr/trunk/Makefile.in Tue Mar 24 15:26:04 2009
@@ -32,15 +32,15 @@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
-APU_MODULES = @APU_MODULES@
-LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APR_MAJOR_VERSION) -module -rpath $(APU_DSO_LIBDIR)
-APU_DSO_LIBDIR = @APU_DSO_LIBDIR@
+APR_MODULES = @APR_MODULES@
+LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APR_MAJOR_VERSION) -module -rpath $(APR_DSO_LIBDIR)
+APR_DSO_LIBDIR = @APR_DSO_LIBDIR@
 
 #
 # Rules for building specific targets, starting with 'all' for
 # building the entire package.
 #
-TARGETS = $(TARGET_LIB) $(APU_MODULES) \
+TARGETS = $(TARGET_LIB) $(APR_MODULES) \
 	apr.exp apr-config.out build/apr_rules.out
 
 LT_VERSION = @LT_VERSION@
@@ -106,9 +106,9 @@
 
 install-modules-no:
 
-install-modules-yes: $(APU_MODULES)
-	$(APR_MKDIR) $(DESTDIR)$(APU_DSO_LIBDIR)
-	@for m in $(APU_MODULES); do $(LIBTOOL) $(LT_LTFLAGS) $(LTFLAGS) --mode=install $(INSTALL) -m 755 $$m $(DESTDIR)$(APU_DSO_LIBDIR); done
+install-modules-yes: $(APR_MODULES)
+	$(APR_MKDIR) $(DESTDIR)$(APR_DSO_LIBDIR)
+	@for m in $(APR_MODULES); do $(LIBTOOL) $(LT_LTFLAGS) $(LTFLAGS) --mode=install $(INSTALL) -m 755 $$m $(DESTDIR)$(APR_DSO_LIBDIR); done
 
 exports.c: $(HEADERS)
 	$(APR_MKEXPORT) $(HEADERS) > $@

Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=757845&r1=757844&r2=757845&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Tue Mar 24 15:26:04 2009
@@ -2472,20 +2472,20 @@
 AC_SUBST(APRUTIL_LIBNAME)
 
 # Set up destination directory for DSOs.
-APU_DSO_LIBDIR="\${libdir}/apr-util-${APR_MAJOR_VERSION}"
+APR_DSO_LIBDIR="\${libdir}/apr-${APR_MAJOR_VERSION}"
 # Set APU_HAVE_MODULES appropriately for the Makefile
-if test -n "$APU_MODULES"; then 
-   APU_HAVE_MODULES=yes
+if test -n "$APR_MODULES"; then 
+   APR_HAVE_MODULES=yes
 else
-   APU_HAVE_MODULES=no
+   APR_HAVE_MODULES=no
 fi
 # Define expanded libdir for apu_config.h
-APR_EXPAND_VAR(abs_dso_libdir, $APU_DSO_LIBDIR)
-AC_DEFINE_UNQUOTED([APU_DSO_LIBDIR], ["$abs_dso_libdir"],
+APR_EXPAND_VAR(abs_dso_libdir, $APR_DSO_LIBDIR)
+AC_DEFINE_UNQUOTED([APR_DSO_LIBDIR], ["$abs_dso_libdir"],
                    [Define to be absolute path to DSO directory])
-AC_SUBST(APU_HAVE_MODULES)
-AC_SUBST(APU_DSO_LIBDIR)
-AC_SUBST(APU_MODULES)
+AC_SUBST(APR_HAVE_MODULES)
+AC_SUBST(APR_DSO_LIBDIR)
+AC_SUBST(APR_MODULES)
 AC_SUBST(EXTRA_OBJECTS)
 
 dnl

Modified: apr/apr/trunk/util-misc/apu_dso.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/util-misc/apu_dso.c?rev=757845&r1=757844&r2=757845&view=diff
==============================================================================
--- apr/apr/trunk/util-misc/apu_dso.c (original)
+++ apr/apr/trunk/util-misc/apu_dso.c Tue Mar 24 15:26:04 2009
@@ -31,7 +31,7 @@
 #include "apu_internal.h"
 #include "apu_version.h"
 
-#if APU_DSO_BUILD
+#if APR_DSO_BUILD
 
 #if APR_HAS_THREADS
 static apr_thread_mutex_t* mutex = NULL;
@@ -126,11 +126,11 @@
           || (apr_filepath_list_split(&paths, pathlist, pool) != APR_SUCCESS))
         paths = apr_array_make(pool, 1, sizeof(char*));
 
-#if defined(APU_DSO_LIBDIR)
+#if defined(APR_DSO_LIBDIR)
     /* Always search our prefix path, but on some platforms such as
      * win32 this may be left undefined
      */
-    (*((char **)apr_array_push(paths))) = APU_DSO_LIBDIR;
+    (*((char **)apr_array_push(paths))) = APR_DSO_LIBDIR;
 #endif
 
     for (i = 0; i < paths->nelts; ++i)
@@ -159,14 +159,14 @@
         if (rv == APR_SUCCESS) { /* APR_EDSOOPEN */
             break;
         }
-#if defined(APU_DSO_LIBDIR)
+#if defined(APR_DSO_LIBDIR)
         else if (i < paths->nelts - 1) {
 #else
-        else {   /* No APU_DSO_LIBDIR to skip */
+        else {   /* No APR_DSO_LIBDIR to skip */
 #endif
-             /* try with apr-util-APU_MAJOR_VERSION appended */
+             /* try with apr-APR_MAJOR_VERSION appended */
             eos = apr_cpystrn(eos,
-                              "apr-util-" APU_STRINGIFY(APU_MAJOR_VERSION) "/",
+                              "apr-" APR_STRINGIFY(APR_MAJOR_VERSION) "/",
                               sizeof(path) - (eos - path));
 
             apr_cpystrn(eos, module, sizeof(path) - (eos - path));
@@ -195,5 +195,5 @@
     return rv;
 }
 
-#endif /* APU_DSO_BUILD */
+#endif /* APR_DSO_BUILD */