1*4882a593SmuzhiyunUpstream-Status: Inappropriate [configuration] 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunIndex: apr-util-1.3.4/apu-config.in 4*4882a593Smuzhiyun=================================================================== 5*4882a593Smuzhiyun--- apr-util-1.3.4.orig/apu-config.in 2009-01-12 17:08:06.000000000 +0000 6*4882a593Smuzhiyun+++ apr-util-1.3.4/apu-config.in 2009-01-12 17:09:00.000000000 +0000 7*4882a593Smuzhiyun@@ -134,14 +134,7 @@ 8*4882a593Smuzhiyun exit 0 9*4882a593Smuzhiyun ;; 10*4882a593Smuzhiyun --includes) 11*4882a593Smuzhiyun- if test "$location" = "installed"; then 12*4882a593Smuzhiyun flags="$flags -I$includedir $INCLUDES" 13*4882a593Smuzhiyun- elif test "$location" = "source"; then 14*4882a593Smuzhiyun- flags="$flags -I$APU_SOURCE_DIR/include $INCLUDES" 15*4882a593Smuzhiyun- else 16*4882a593Smuzhiyun- # this is for VPATH builds 17*4882a593Smuzhiyun- flags="$flags -I$APU_BUILD_DIR/include -I$APU_SOURCE_DIR/include $INCLUDES" 18*4882a593Smuzhiyun- fi 19*4882a593Smuzhiyun ;; 20*4882a593Smuzhiyun --ldflags) 21*4882a593Smuzhiyun flags="$flags $LDFLAGS" 22*4882a593Smuzhiyun@@ -155,28 +148,10 @@ 23*4882a593Smuzhiyun exit 0 24*4882a593Smuzhiyun ;; 25*4882a593Smuzhiyun --link-ld) 26*4882a593Smuzhiyun- if test "$location" = "installed"; then 27*4882a593Smuzhiyun- ### avoid using -L if libdir is a "standard" location like /usr/lib 28*4882a593Smuzhiyun flags="$flags -L$libdir -l$APRUTIL_LIBNAME" 29*4882a593Smuzhiyun- else 30*4882a593Smuzhiyun- flags="$flags -L$APU_BUILD_DIR -l$APRUTIL_LIBNAME" 31*4882a593Smuzhiyun- fi 32*4882a593Smuzhiyun ;; 33*4882a593Smuzhiyun --link-libtool) 34*4882a593Smuzhiyun- # If the LA_FILE exists where we think it should be, use it. If we're 35*4882a593Smuzhiyun- # installed and the LA_FILE does not exist, assume to use -L/-l 36*4882a593Smuzhiyun- # (the LA_FILE may not have been installed). If we're building ourselves, 37*4882a593Smuzhiyun- # we'll assume that at some point the .la file be created. 38*4882a593Smuzhiyun- if test -f "$LA_FILE"; then 39*4882a593Smuzhiyun- flags="$flags $LA_FILE" 40*4882a593Smuzhiyun- elif test "$location" = "installed"; then 41*4882a593Smuzhiyun- ### avoid using -L if libdir is a "standard" location like /usr/lib 42*4882a593Smuzhiyun- # Since the user is specifying they are linking with libtool, we 43*4882a593Smuzhiyun- # *know* that -R will be recognized by libtool. 44*4882a593Smuzhiyun- flags="$flags -L$libdir -R$libdir -l$APRUTIL_LIBNAME" 45*4882a593Smuzhiyun- else 46*4882a593Smuzhiyun- flags="$flags $LA_FILE" 47*4882a593Smuzhiyun- fi 48*4882a593Smuzhiyun+ flags="$flags -l$APRUTIL_LIBNAME" 49*4882a593Smuzhiyun ;; 50*4882a593Smuzhiyun --apu-la-file) 51*4882a593Smuzhiyun if test -f "$LA_FILE"; then 52