Removing references to APREQ_SOURCE_DIR and APREQ_BUILD_DIR --- ./apreq2-config.in +++ ./apreq2-config.in @@ -33,9 +33,6 @@ LDFLAGS="@APR_LDFLAGS@" APREQ_LIBNAME="@APREQ_LIBNAME@" -APREQ_SOURCE_DIR="@abs_srcdir@" -APREQ_BUILD_DIR="@abs_builddir@" - show_usage() { cat << EOF @@ -48,7 +45,6 @@ Known values for OPTION are: --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 @@ -83,17 +79,12 @@ fi # 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 @@ -133,11 +124,9 @@ while test $# -gt 0; do --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" + flags="$thisdir/include" fi echo $flags exit 0 @@ -145,20 +134,14 @@ while test $# -gt 0; do --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" + flags="$flags -I$thisdir/include $INCLUDES" fi ;; --ldflags) flags="$flags $LDFLAGS" ;; - --srcdir) - echo $APREQ_SOURCE_DIR - exit 0 - ;; --library-version) echo @APREQ_DOTTED_VERSION@ exit 0