|
@@ -1,13 +1,14 @@
|
|
|
# Helper functions for option handling. -*- Autoconf -*-
|
|
# Helper functions for option handling. -*- Autoconf -*-
|
|
|
#
|
|
#
|
|
|
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
|
|
|
|
|
|
|
+# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
|
|
|
|
|
+# Inc.
|
|
|
# Written by Gary V. Vaughan, 2004
|
|
# Written by Gary V. Vaughan, 2004
|
|
|
#
|
|
#
|
|
|
# This file is free software; the Free Software Foundation gives
|
|
# This file is free software; the Free Software Foundation gives
|
|
|
# unlimited permission to copy and/or distribute it, with or without
|
|
# unlimited permission to copy and/or distribute it, with or without
|
|
|
# modifications, as long as this notice is preserved.
|
|
# modifications, as long as this notice is preserved.
|
|
|
|
|
|
|
|
-# serial 6 ltoptions.m4
|
|
|
|
|
|
|
+# serial 7 ltoptions.m4
|
|
|
|
|
|
|
|
# This is to help aclocal find these macros, as it can't see m4_define.
|
|
# This is to help aclocal find these macros, as it can't see m4_define.
|
|
|
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
|
|
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
|
|
@@ -125,7 +126,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
|
|
|
[enable_win32_dll=yes
|
|
[enable_win32_dll=yes
|
|
|
|
|
|
|
|
case $host in
|
|
case $host in
|
|
|
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
|
|
|
|
|
|
|
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
|
|
|
AC_CHECK_TOOL(AS, as, false)
|
|
AC_CHECK_TOOL(AS, as, false)
|
|
|
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
|
|
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
|
|
|
AC_CHECK_TOOL(OBJDUMP, objdump, false)
|
|
AC_CHECK_TOOL(OBJDUMP, objdump, false)
|
|
@@ -133,13 +134,13 @@ case $host in
|
|
|
esac
|
|
esac
|
|
|
|
|
|
|
|
test -z "$AS" && AS=as
|
|
test -z "$AS" && AS=as
|
|
|
-_LT_DECL([], [AS], [0], [Assembler program])dnl
|
|
|
|
|
|
|
+_LT_DECL([], [AS], [1], [Assembler program])dnl
|
|
|
|
|
|
|
|
test -z "$DLLTOOL" && DLLTOOL=dlltool
|
|
test -z "$DLLTOOL" && DLLTOOL=dlltool
|
|
|
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
|
|
|
|
|
|
|
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
|
|
|
|
|
|
|
|
test -z "$OBJDUMP" && OBJDUMP=objdump
|
|
test -z "$OBJDUMP" && OBJDUMP=objdump
|
|
|
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
|
|
|
|
|
|
|
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
|
|
|
])# win32-dll
|
|
])# win32-dll
|
|
|
|
|
|
|
|
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
|
|
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
|
|
@@ -325,9 +326,24 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
|
|
|
# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
|
|
# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
|
|
|
m4_define([_LT_WITH_PIC],
|
|
m4_define([_LT_WITH_PIC],
|
|
|
[AC_ARG_WITH([pic],
|
|
[AC_ARG_WITH([pic],
|
|
|
- [AS_HELP_STRING([--with-pic],
|
|
|
|
|
|
|
+ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
|
|
|
[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
|
|
[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
|
|
|
- [pic_mode="$withval"],
|
|
|
|
|
|
|
+ [lt_p=${PACKAGE-default}
|
|
|
|
|
+ case $withval in
|
|
|
|
|
+ yes|no) pic_mode=$withval ;;
|
|
|
|
|
+ *)
|
|
|
|
|
+ pic_mode=default
|
|
|
|
|
+ # Look at the argument we got. We use all the common list separators.
|
|
|
|
|
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
|
|
|
|
|
+ for lt_pkg in $withval; do
|
|
|
|
|
+ IFS="$lt_save_ifs"
|
|
|
|
|
+ if test "X$lt_pkg" = "X$lt_p"; then
|
|
|
|
|
+ pic_mode=yes
|
|
|
|
|
+ fi
|
|
|
|
|
+ done
|
|
|
|
|
+ IFS="$lt_save_ifs"
|
|
|
|
|
+ ;;
|
|
|
|
|
+ esac],
|
|
|
[pic_mode=default])
|
|
[pic_mode=default])
|
|
|
|
|
|
|
|
test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
|
|
test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
|