diff options
| -rw-r--r-- | Makefile.in | 14 | ||||
| -rw-r--r-- | configure.in | 18 | ||||
| -rw-r--r-- | util-misc/apu_dso.c | 16 |
3 files changed, 24 insertions, 24 deletions
diff --git a/Makefile.in b/Makefile.in index 5ecf899f6..c10a232d0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -32,15 +32,15 @@ APR_CONFIG = apr-$(APR_MAJOR_VERSION)-config 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: install-modules-@APU_HAVE_MODULES@ 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) > $@ diff --git a/configure.in b/configure.in index 9daf8fff3..f808a3537 100644 --- a/configure.in +++ b/configure.in @@ -2472,20 +2472,20 @@ APRUTIL_LIBNAME="aprutil${libsuffix}" 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 diff --git a/util-misc/apu_dso.c b/util-misc/apu_dso.c index 383c5157a..1cd42bdd0 100644 --- a/util-misc/apu_dso.c +++ b/util-misc/apu_dso.c @@ -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_status_t apu_dso_load(apr_dso_handle_t **dlhandleptr, || (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 @@ apr_status_t apu_dso_load(apr_dso_handle_t **dlhandleptr, 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 @@ apr_status_t apu_dso_load(apr_dso_handle_t **dlhandleptr, return rv; } -#endif /* APU_DSO_BUILD */ +#endif /* APR_DSO_BUILD */ |