apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: apr configure.in
Date Sun, 24 Aug 2003 23:18:22 GMT
jerenkrantz    2003/08/24 16:18:22

  Modified:    .        configure.in
  Log:
  Add an --experimental-libtool option that allows the user to specify an
  alternate libtool.
  
  (jlibtool.c isn't included with APR, but this just allows support for it by
  dropping it into the tree in the 'right' place alongside aplibtool.c.)
  
  Revision  Changes    Path
  1.533     +21 -6     apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.532
  retrieving revision 1.533
  diff -u -u -r1.532 -r1.533
  --- configure.in	24 Aug 2003 23:09:19 -0000	1.532
  +++ configure.in	24 Aug 2003 23:18:22 -0000	1.533
  @@ -129,6 +129,9 @@
   dnl
   echo "performing libtool configuration..."
   
  +AC_ARG_ENABLE(experimental-libtool,[  --experimental-libtool Use experimental custom libtool
(not included in source distribution)],
  +  [experimental_libtool=$enableval],[experimental_libtool=no])
  +
   case $host in
   *os2*)
       # Use a custom-made libtool replacement
  @@ -136,15 +139,27 @@
       LIBTOOL="$srcdir/build/aplibtool"
       gcc $CFLAGS $CPPFLAGS -o $LIBTOOL.exe $LIBTOOL.c
       ;;
  -*)  dnl libtoolize requires that the following not be indented
  -AC_PROG_LIBTOOL
  +*)
       if test "x$LTFLAGS" = "x"; then
           LTFLAGS='--silent'
       fi
  -    # get libtool's setting of shlibpath_var
  -    eval `grep "^shlibpath_var=[[A-Z_]]*$" $apr_builddir/libtool`
  -    if test "x$shlibpath_var" = "x"; then
  -        shlibpath_var=REPLACE_WITH_YOUR_SHLIBPATH_VAR
  +    if test "$experimental_libtool" = "yes"; then
  +        # Use a custom-made libtool replacement
  +        echo "using jlibtool"
  +        LIBTOOL="$apr_builddir/libtool"
  +        LIBTOOL_SRC="$apr_srcdir/build/jlibtool.c"
  +        if test ! -f $LIBTOOL_SRC; then
  +          AC_MSG_ERROR([Experimental libtool source not found.  It is not included with
APR by default.])
  +        fi
  +        $CC $CFLAGS $CPPFLAGS -o $LIBTOOL $LIBTOOL_SRC
  +    else
  +    dnl libtoolize requires that the following not be indented
  +AC_PROG_LIBTOOL
  +        # get libtool's setting of shlibpath_var
  +        eval `grep "^shlibpath_var=[[A-Z_]]*$" $apr_builddir/libtool`
  +        if test "x$shlibpath_var" = "x"; then
  +            shlibpath_var=REPLACE_WITH_YOUR_SHLIBPATH_VAR
  +        fi
       fi
       ;;
   esac
  
  
  

Mime
View raw message