diff --git a/Makefile.in b/Makefile.in index fb686b4..247796f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -81,13 +81,13 @@ install: $(TARGETS) install-modules for f in $(top_srcdir)/include/*.h $(top_blddir)/include/*.h; do \ $(INSTALL_DATA) $${f} $(DESTDIR)$(includedir); \ done - $(INSTALL_DATA) apr-util.pc $(DESTDIR)$(libdir)/pkgconfig/$(APRUTIL_PCFILE) + $(INSTALL_DATA) apr-util.pc $(DESTDIR)$(libdir)/pkgconfig/apr-util14-$(APRUTIL_MAJOR_VERSION).pc list='$(INSTALL_SUBDIRS)'; for i in $$list; do \ ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \ done $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir) $(INSTALL_DATA) aprutil.exp $(DESTDIR)$(libdir) - $(INSTALL) -m 755 apu-config.out $(DESTDIR)$(bindir)/$(APU_CONFIG) + $(INSTALL) -m 755 apu-config.out $(DESTDIR)$(bindir)/apu14-$(APRUTIL_MAJOR_VERSION)-config $(TARGET_LIB): $(OBJECTS) $(EXTRA_OBJECTS) $(LINK) @lib_target@ $(EXTRA_OBJECTS) $(ALL_LIBS) $(APRUTIL_LDFLAGS) $(APRUTIL_LIBS) diff --git a/apr-util.pc.in b/apr-util.pc.in index 5b146af..ca8a97e 100644 --- a/apr-util.pc.in +++ b/apr-util.pc.in @@ -8,6 +8,6 @@ Name: APR Utils Description: Companion library for APR Version: @APRUTIL_DOTTED_VERSION@ # assume that apr-util requires libapr of same major version -Requires: apr-@APRUTIL_MAJOR_VERSION@ +Requires: apr14-@APRUTIL_MAJOR_VERSION@ Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @LDADD_ldap@ @APRUTIL_EXPORT_LIBS@ Cflags: -I${includedir} diff --git a/apu-config.in b/apu-config.in index 64cccb1..f984c03 100644 --- a/apu-config.in +++ b/apu-config.in @@ -26,7 +26,7 @@ exec_prefix="@exec_prefix@" bindir="@bindir@" includedir="@includedir@" -libdir=`pkg-config --variable=libdir apr-util-@APRUTIL_MAJOR_VERSION@` +libdir=`pkg-config --variable=libdir apr-util14-@APRUTIL_MAJOR_VERSION@` LIBS="@APRUTIL_EXPORT_LIBS@" INCLUDES="@APRUTIL_INCLUDES@" @@ -47,7 +47,7 @@ location=@APU_CONFIG_LOCATION@ show_usage() { cat << EOF -Usage: apu-$APRUTIL_MAJOR_VERSION-config [OPTION] +Usage: apu14-$APRUTIL_MAJOR_VERSION-config [OPTION] Known values for OPTION are: --prefix[=DIR] change prefix to DIR @@ -70,9 +70,9 @@ Known values for OPTION are: --help print this help When linking with libtool, an application should do something like: - APU_LIBS="\`apu-$APRUTIL_MAJOR_VERSION-config --link-libtool --libs\`" + APU_LIBS="\`apu14-$APRUTIL_MAJOR_VERSION-config --link-libtool --libs\`" or when linking directly: - APU_LIBS="\`apu-$APRUTIL_MAJOR_VERSION-config --link-ld --libs\`" + APU_LIBS="\`apu14-$APRUTIL_MAJOR_VERSION-config --link-ld --libs\`" An application should use the results of --includes, and --ldflags in their build process. diff --git a/configure.in b/configure.in index 3aff513..e824e31 100644 --- a/configure.in +++ b/configure.in @@ -188,11 +188,11 @@ lib_target=$APR_LIB_TARGET AC_SUBST(so_ext) AC_SUBST(lib_target) -APRUTIL_LIBNAME="aprutil${libsuffix}" +APRUTIL_LIBNAME="aprutil14${libsuffix}" AC_SUBST(APRUTIL_LIBNAME) # Set up destination directory for DSOs. -APU_DSO_LIBDIR="\${libdir}/apr-util-${APRUTIL_MAJOR_VERSION}" +APU_DSO_LIBDIR="\${libdir}/apr-util14-${APRUTIL_MAJOR_VERSION}" # Set APU_HAVE_MODULES appropriately for the Makefile if test -n "$APU_MODULES"; then APU_HAVE_MODULES=yes