acinclude/ltoptions.m4
changeset 6442 2d3caa191dc4
parent 3345 437378d409b1
     1.1 --- a/acinclude/ltoptions.m4	Wed Sep 19 18:08:37 2012 -0700
     1.2 +++ b/acinclude/ltoptions.m4	Thu Sep 20 21:13:10 2012 -0700
     1.3 @@ -1,14 +1,14 @@
     1.4 -##############################################################################
     1.5  # Helper functions for option handling.                    -*- Autoconf -*-
     1.6  #
     1.7 -#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
     1.8 +#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
     1.9 +#   Inc.
    1.10  #   Written by Gary V. Vaughan, 2004
    1.11  #
    1.12  # This file is free software; the Free Software Foundation gives
    1.13  # unlimited permission to copy and/or distribute it, with or without
    1.14  # modifications, as long as this notice is preserved.
    1.15  
    1.16 -# serial 6 ltoptions.m4
    1.17 +# serial 7 ltoptions.m4
    1.18  
    1.19  # This is to help aclocal find these macros, as it can't see m4_define.
    1.20  AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
    1.21 @@ -126,7 +126,7 @@
    1.22  [enable_win32_dll=yes
    1.23  
    1.24  case $host in
    1.25 -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
    1.26 +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
    1.27    AC_CHECK_TOOL(AS, as, false)
    1.28    AC_CHECK_TOOL(DLLTOOL, dlltool, false)
    1.29    AC_CHECK_TOOL(OBJDUMP, objdump, false)
    1.30 @@ -134,13 +134,13 @@
    1.31  esac
    1.32  
    1.33  test -z "$AS" && AS=as
    1.34 -_LT_DECL([], [AS],      [0], [Assembler program])dnl
    1.35 +_LT_DECL([], [AS],      [1], [Assembler program])dnl
    1.36  
    1.37  test -z "$DLLTOOL" && DLLTOOL=dlltool
    1.38 -_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
    1.39 +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
    1.40  
    1.41  test -z "$OBJDUMP" && OBJDUMP=objdump
    1.42 -_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
    1.43 +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
    1.44  ])# win32-dll
    1.45  
    1.46  AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
    1.47 @@ -326,9 +326,24 @@
    1.48  # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
    1.49  m4_define([_LT_WITH_PIC],
    1.50  [AC_ARG_WITH([pic],
    1.51 -    [AS_HELP_STRING([--with-pic],
    1.52 +    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
    1.53  	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
    1.54 -    [pic_mode="$withval"],
    1.55 +    [lt_p=${PACKAGE-default}
    1.56 +    case $withval in
    1.57 +    yes|no) pic_mode=$withval ;;
    1.58 +    *)
    1.59 +      pic_mode=default
    1.60 +      # Look at the argument we got.  We use all the common list separators.
    1.61 +      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
    1.62 +      for lt_pkg in $withval; do
    1.63 +	IFS="$lt_save_ifs"
    1.64 +	if test "X$lt_pkg" = "X$lt_p"; then
    1.65 +	  pic_mode=yes
    1.66 +	fi
    1.67 +      done
    1.68 +      IFS="$lt_save_ifs"
    1.69 +      ;;
    1.70 +    esac],
    1.71      [pic_mode=default])
    1.72  
    1.73  test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
    1.74 @@ -367,4 +382,3 @@
    1.75  		 [m4_define([_LTDL_TYPE], [installable])])
    1.76  LT_OPTION_DEFINE([LTDL_INIT], [convenience],
    1.77  		 [m4_define([_LTDL_TYPE], [convenience])])
    1.78 -