diff options
| author | Greg Stein <gstein@apache.org> | 2002-08-14 17:15:15 +0000 |
|---|---|---|
| committer | Greg Stein <gstein@apache.org> | 2002-08-14 17:15:15 +0000 |
| commit | b1f49f44cb4c389dbbad998463491706bd135832 (patch) | |
| tree | e24d3720f5e9e798a1dbbf2fe3e6cbafeb44e154 /apr-config.in | |
| parent | 90b257e27b99a2f83a6144dc6d84476f2e73a76f (diff) | |
| download | apr-b1f49f44cb4c389dbbad998463491706bd135832.tar.gz | |
Various changes to clean up APR for a release.
* Add a version number to the library name to support parallel
installation.
See: http://www106.pair.com/rhp/parallel.html
(assuming the app uses apr-config to fetch linking information, then
users should not have anything to change)
* Get rid of APRVARS. Apps should be using apr-config by now.
* Add --version to apr-config so that apps can see what they're
building against.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@63811 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'apr-config.in')
| -rw-r--r-- | apr-config.in | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/apr-config.in b/apr-config.in index b68766ba1..56ef86594 100644 --- a/apr-config.in +++ b/apr-config.in @@ -75,6 +75,8 @@ SHLIBPATH_VAR="@shlibpath_var@" APR_SOURCE_DIR="@apr_srcdir@" APR_SO_EXT="@so_ext@" APR_LIB_TARGET="@export_lib_target@" +APR_DOTTED_VERSION="@APR_DOTTED_VERSION@" +APR_LIBNAME="@APR_LIBNAME@" show_usage() { @@ -96,6 +98,7 @@ Known values for OPTION are: --apr-so-ext print the extensions of shared objects on this platform --apr-lib-target print the libtool target information --apr-libtool print the path to APR's libtool + --version print the APR's version as a dotted triple --help print this help When linking with libtool, an application should do something like: @@ -106,7 +109,6 @@ or when linking directly: An application should use the results of --cflags, --cppflags, --includes, and --ldflags in their build process. EOF -#' close a quote from above to make emacs happy } if test $# -eq 0; then @@ -130,9 +132,9 @@ else fi if test "$location" = "installed"; then - LA_FILE="$libdir/libapr.la" + LA_FILE="$libdir/${APR_LIBNAME}.la" else - LA_FILE="$thisdir/libapr.la" + LA_FILE="$thisdir/${APR_LIBNAME}.la" fi flags="" @@ -178,6 +180,10 @@ while test $# -gt 0; do echo $APR_SOURCE_DIR exit 0 ;; + --version) + echo $APR_DOTTED_VERSION + exit 0 + ;; --link-ld) if test "$location" = "installed"; then ### avoid using -L if libdir is a "standard" location like /usr/lib |