You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apreq-cvs@httpd.apache.org by jo...@apache.org on 2006/02/24 23:49:00 UTC
svn commit: r380845 - in /httpd/apreq/branches/apr-build-system: ./
Makefile.in apreq2-config.in configure.in
Author: joes
Date: Fri Feb 24 14:48:58 2006
New Revision: 380845
URL: http://svn.apache.org/viewcvs?rev=380845&view=rev
Log:
add apreq2-config.in
Added:
httpd/apreq/branches/apr-build-system/apreq2-config.in (with props)
Modified:
httpd/apreq/branches/apr-build-system/ (props changed)
httpd/apreq/branches/apr-build-system/Makefile.in
httpd/apreq/branches/apr-build-system/configure.in
Propchange: httpd/apreq/branches/apr-build-system/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 24 14:48:58 2006
@@ -5,3 +5,4 @@
.libs
.make.dirs
Makefile
+apreq2-config
Modified: httpd/apreq/branches/apr-build-system/Makefile.in
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/apr-build-system/Makefile.in?rev=380845&r1=380844&r2=380845&view=diff
==============================================================================
--- httpd/apreq/branches/apr-build-system/Makefile.in (original)
+++ httpd/apreq/branches/apr-build-system/Makefile.in Fri Feb 24 14:48:58 2006
@@ -8,7 +8,7 @@
APREQ_MINOR_VERSION=@APREQ_MINOR_VERSION@
APREQ_PATCH_VERSION=@APREQ_PATCH_VERSION@
APREQ_DOTTED_VERSION=@APREQ_DOTTED_VERSION@
-APREQ_LTVERSION=`expr $(APREQ_MAJOR_VERSION) + $(APREQ_MINOR_VERSION) + $(APR_MAJOR_VERSION)`:$(APREQ_PATCH_VERSION):$(APREQ_MINOR_VERSION)
+APREQ_LIBTOOL_VERSION=@APREQ_LIBTOOL_VERSION@
srcdir = @srcdir@
VPATH = @srcdir@
@@ -31,7 +31,7 @@
@INCLUDE_RULES@
@INCLUDE_OUTPUTS@
-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) -version-info $(APREQ_LTVERSION) $(ALL_LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) -version-info $(APREQ_LIBTOOL_VERSION) $(ALL_LDFLAGS) -o $@
CLEAN_SUBDIRS = test @APR_ICONV_DIR@
Added: httpd/apreq/branches/apr-build-system/apreq2-config.in
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/apr-build-system/apreq2-config.in?rev=380845&view=auto
==============================================================================
--- httpd/apreq/branches/apr-build-system/apreq2-config.in (added)
+++ httpd/apreq/branches/apr-build-system/apreq2-config.in Fri Feb 24 14:48:58 2006
@@ -0,0 +1,218 @@
+#!/bin/sh
+
+##
+## Copyright 2003-2006 The Apache Software Foundation
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+# apreq2-config- based on apu-config:
+# APR-util script designed to allow easy command line access to APR-util
+# configuration parameters.
+
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+bindir="@bindir@"
+libdir="@libdir@"
+includedir="@includedir@"
+
+LIBS="@APR_LIBS@ @APU_LIBS@"
+LDFLAGS="@LDFLAGS@"
+INCLUDES="@APR_INCLUDES@"
+
+APREQ_LIBNAME="@APREQ_LIBNAME@"
+
+APREQ_SOURCE_DIR="@abs_srcdir@"
+APREQ_BUILD_DIR="@abs_builddir@"
+
+show_usage()
+{
+ cat << EOF
+Usage: apreq2-config [OPTION]
+
+Known values for OPTION are:
+ --prefix[=DIR] change prefix to DIR
+ --bindir print location where binaries are installed
+ --includes print include information
+ --includedir print location where headers are installed
+ --ldflags print linker flags
+ --libs print library information
+ --srcdir print apreq2 source directory
+ --link-ld print link switch(es) for linking to libapreq2
+ --link-libtool print the libtool inputs for linking to libapreq2
+ --la-file print the path to the library's .la file, if available
+ --library-version print the API version as a dotted triple
+ --libtool-version print the ABI version in a libtool-compatible format
+ --package-version print the version number of the distribution
+ --help print this help
+
+When linking with libtool, an application should do something like:
+ APREQ_LIBS="\`apreq2-config --link-libtool --libs\`"
+or when linking directly:
+ APREQ_LIBS="\`apreq2-config --link-ld --ldflags --libs\`"
+
+An application should use the results of --includes, and --ldflags in
+their build process.
+EOF
+}
+
+if test $# -eq 0; then
+ show_usage
+ exit 1
+fi
+
+thisdir="`dirname $0`"
+thisdir="`cd $thisdir && pwd`"
+if test -d $bindir; then
+ tmpbindir="`cd $bindir && pwd`"
+else
+ tmpbindir=""
+fi
+# If we have the realpath program, use it to resolve symlinks.
+# Otherwise, being in a symlinked dir may result in incorrect output.
+if test -x "`which realpath 2>/dev/null`"; then
+ thisdir="`realpath $thisdir`"
+ if test -d "$APREQ_SOURCE_DIR"; then
+ APREQ_SOURCE_DIR="`realpath $APREQ_SOURCE_DIR`"
+ fi
+ if test -n "$tmpbindir"; then
+ tmpbindir="`realpath $tmpbindir`"
+ fi
+fi
+if test "$tmpbindir" = "$thisdir"; then
+ location=installed
+elif test "$APREQ_SOURCE_DIR" = "$thisdir"; then
+ location=source
+else
+ location=build
+fi
+
+
+if test "$location" = "installed"; then
+ LA_FILE="$libdir/lib${APREQ_LIBNAME}.la"
+else
+ LA_FILE="$thisdir/library/lib${APREQ_LIBNAME}.la"
+fi
+
+flags=""
+
+while test $# -gt 0; do
+ # Normalize the prefix.
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ case "$1" in
+ # It is possible for the user to override our prefix.
+ --prefix=*)
+ prefix=$optarg
+ ;;
+ --prefix)
+ echo $prefix
+ exit 0
+ ;;
+ --bindir)
+ echo $bindir
+ exit 0
+ ;;
+ --libs)
+ flags="$flags $LIBS"
+ ;;
+ --includedir)
+ if test "$location" = "installed"; then
+ flags="$includedir"
+ elif test "$location" = "source"; then
+ flags="$APREQ_SOURCE_DIR/include"
+ else
+ # this is for VPATH builds
+ flags="$thisdir/include $APREQ_SOURCE_DIR/include"
+ fi
+ echo $flags
+ exit 0
+ ;;
+ --includes)
+ if test "$location" = "installed"; then
+ flags="$flags -I$includedir $INCLUDES"
+ elif test "$location" = "source"; then
+ flags="$flags -I$APREQ_SOURCE_DIR/include $INCLUDES"
+ else
+ # this is for VPATH builds
+ flags="$flags -I$thisdir/include -I$APREQ_SOURCE_DIR/include $INCLUDES"
+ fi
+ ;;
+ --ldflags)
+ flags="$flags $LDFLAGS"
+ ;;
+ --srcdir)
+ echo $APREQ_SOURCE_DIR
+ exit 0
+ ;;
+ --library-version)
+ echo @APREQ_DOTTED_VERSION@
+ exit 0
+ ;;
+ --libtool-version)
+ echo @APREQ_LIBTOOL_VERSION@
+ exit 0
+ ;;
+ --package-version)
+ echo "@VERSION@"
+ exit 0
+ ;;
+ --link-ld)
+ if test "$location" = "installed"; then
+ ### avoid using -L if libdir is a "standard" location like /usr/lib
+ flags="$flags -L$libdir -l$APREQ_LIBNAME"
+ else
+ flags="$flags -L$thisdir/library/.libs -l$APREQ_LIBNAME"
+ fi
+ ;;
+ --link-libtool)
+ # If the LA_FILE exists where we think it should be, use it. If we're
+ # installed and the LA_FILE does not exist, assume to use -L/-l
+ # (the LA_FILE may not have been installed). If we're building ourselves,
+ # we'll assume that at some point the .la file be created.
+ if test -f "$LA_FILE"; then
+ flags="$flags $LA_FILE"
+ elif test "$location" = "installed"; then
+ ### avoid using -L if libdir is a "standard" location like /usr/lib
+ flags="$flags -L$libdir -l$APREQ_LIBNAME $apreq_libs"
+ else
+ flags="$flags $LA_FILE"
+ fi
+ ;;
+ --la-file)
+ if test -f "$LA_FILE"; then
+ flags="$flags $LA_FILE"
+ fi
+ ;;
+ --help)
+ show_usage
+ exit 0
+ ;;
+ *)
+ show_usage
+ exit 1
+ ;;
+ esac
+
+ # Next please.
+ shift
+done
+
+if test -n "$flags"; then
+ echo "$flags"
+fi
+
+exit 0
Propchange: httpd/apreq/branches/apr-build-system/apreq2-config.in
------------------------------------------------------------------------------
svn:eol-style = native
Modified: httpd/apreq/branches/apr-build-system/configure.in
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/apr-build-system/configure.in?rev=380845&r1=380844&r2=380845&view=diff
==============================================================================
--- httpd/apreq/branches/apr-build-system/configure.in (original)
+++ httpd/apreq/branches/apr-build-system/configure.in Fri Feb 24 14:48:58 2006
@@ -5,6 +5,9 @@
AC_PREREQ(2.50)
AC_INIT(export_vars.sh.in)
+VERSION=2.08
+AC_SUBST(VERSION)
+
AC_CONFIG_HEADER(include/apreq_config.h)
AC_CONFIG_AUX_DIR(build)
@@ -50,20 +53,6 @@
dnl Initialize mkdir -p functionality.
APR_MKDIR_P_CHECK($abs_srcdir/build/mkdir.sh)
-dnl get our version information
-get_version="$abs_srcdir/build/get-version.sh"
-version_hdr="$abs_srcdir/include/apreq_version.h"
-APREQ_MAJOR_VERSION="`$get_version major $version_hdr APREQ`"
-APREQ_MINOR_VERSION="`$get_version minor $version_hdr APREQ`"
-APREQ_PATCH_VERSION="`$get_version patch $version_hdr APREQ`"
-APREQ_DOTTED_VERSION="`$get_version all $version_hdr APREQ`"
-
-AC_SUBST(APREQ_DOTTED_VERSION)
-AC_SUBST(APREQ_MAJOR_VERSION)
-AC_SUBST(APREQ_MINOR_VERSION)
-AC_SUBST(APREQ_PATCH_VERSION)
-
-echo "APREQ Version: ${APREQ_DOTTED_VERSION}"
dnl Enable the layout handling code, then reparse the prefix-style
dnl arguments due to autoconf being a PITA.
@@ -103,6 +92,27 @@
APREQ_FIND_APU
+dnl get our version information
+get_version="$abs_srcdir/build/get-version.sh"
+version_hdr="$abs_srcdir/include/apreq_version.h"
+APREQ_MAJOR_VERSION="`$get_version major $version_hdr APREQ`"
+APREQ_MINOR_VERSION="`$get_version minor $version_hdr APREQ`"
+APREQ_PATCH_VERSION="`$get_version patch $version_hdr APREQ`"
+APREQ_DOTTED_VERSION="`$get_version all $version_hdr APREQ`"
+
+APR_MAJOR_VERSION="`$apr_config --version | cut -f1 -d.`"
+APREQ_LIBTOOL_VERSION="`expr $APREQ_MAJOR_VERSION + $APREQ_MINOR_VERSION + $APR_MAJOR_VERSION`:$APREQ_PATCH_VERSION:$APREQ_MINOR_VERSION"
+
+AC_SUBST(APREQ_DOTTED_VERSION)
+AC_SUBST(APREQ_LIBTOOL_VERSION)
+AC_SUBST(APREQ_MAJOR_VERSION)
+AC_SUBST(APREQ_MINOR_VERSION)
+AC_SUBST(APREQ_PATCH_VERSION)
+
+echo "APREQ Version: ${APREQ_DOTTED_VERSION}"
+
+
+
so_ext=$APR_SO_EXT
lib_target=$APR_LIB_TARGET
AC_SUBST(so_ext)
@@ -156,6 +166,8 @@
test -d $top_builddir/$d || mkdir $top_builddir/$d
done
-AC_CONFIG_FILES([Makefile export_vars.sh])
+AC_CONFIG_FILES([Makefile export_vars.sh apreq2-config])
+
+AC_CONFIG_COMMANDS([default], [chmod +x apreq2-config])
AC_OUTPUT