apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: apr-util apu-config.in
Date Tue, 14 May 2002 08:07:36 GMT
jerenkrantz    02/05/14 01:07:36

  Modified:    .        apu-config.in
  Log:
  Revert and fix ala gstein.
  
  The better thing to do here is if we're installed and the file doesn't
  exist, we MUST print the -L/-l options.  But, if we're in build mode, then
  we'll be optimistic and assume that at some point we'll create the LA_FILE.
  
  Revision  Changes    Path
  1.13      +15 -2     apr-util/apu-config.in
  
  Index: apu-config.in
  ===================================================================
  RCS file: /home/cvs/apr-util/apu-config.in,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- apu-config.in	14 May 2002 03:07:10 -0000	1.12
  +++ apu-config.in	14 May 2002 08:07:36 -0000	1.13
  @@ -173,10 +173,23 @@
       fi
       ;;
       --link-libtool)
  -    flags="$flags $LA_FILE"
  +    # 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 -laprutil"
  +    else
  +        flags="$flags $LA_FILE"
  +    fi
       ;;
       --apu-la-file)
  -    flags="$flags $LA_FILE"
  +    if test -f "$LA_FILE"; then
  +        flags="$flags $LA_FILE"
  +    fi
       ;;
       --old-expat)
       if test ! -n "$APR_XML_EXPAT_OLD"; then
  
  
  

Mime
View raw message