Search
j0ke.net Open Build Service
>
Projects
>
Apache
:
Modules
>
apache2-mod_apreq2
> libapreq2-fix_config.patch
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File libapreq2-fix_config.patch of Package apache2-mod_apreq2
--- apreq2-config.in.orig 2009-04-15 22:54:39.000000000 +0200 +++ apreq2-config.in 2009-04-15 22:57:54.000000000 +0200 @@ -35,9 +35,6 @@ APREQ_LIBNAME="@APREQ_LIBNAME@" -APREQ_SOURCE_DIR="@abs_srcdir@" -APREQ_BUILD_DIR="@abs_builddir@" - show_usage() { cat << EOF @@ -50,7 +47,6 @@ --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 @@ -74,38 +70,7 @@ 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 +LA_FILE="$libdir/lib${APREQ_LIBNAME}.la" flags="" @@ -133,34 +98,16 @@ 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 + flags="$includedir" 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 + flags="$flags -I$includedir $INCLUDES" ;; --ldflags) flags="$flags $LDFLAGS" ;; - --srcdir) - echo $APREQ_SOURCE_DIR - exit 0 - ;; --library-version) echo @APREQ_DOTTED_VERSION@ exit 0 @@ -174,12 +121,7 @@ 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 + flags="$flags -L$libdir -l$APREQ_LIBNAME" ;; --link-libtool) # If the LA_FILE exists where we think it should be, use it. If we're @@ -188,11 +130,8 @@ # 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" + flags="$flags -L$libdir -l$APREQ_LIBNAME $apreq_libs" fi ;; --la-file)