comparison m4/ltoptions.m4 @ 1459:156b8e8c25d8

Grandfather into release: Use latest Debian testing autotools, etc.
author Adam Chlipala <adam@chlipala.net>
date Sun, 15 May 2011 17:20:08 -0400
parents f6cb1cb2d7a8
children 252e05bf199d
comparison
equal deleted inserted replaced
1458:bd6b03bc6333 1459:156b8e8c25d8
1 # Helper functions for option handling. -*- Autoconf -*- 1 # Helper functions for option handling. -*- Autoconf -*-
2 # 2 #
3 # Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. 3 # Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
4 # Inc.
4 # Written by Gary V. Vaughan, 2004 5 # Written by Gary V. Vaughan, 2004
5 # 6 #
6 # This file is free software; the Free Software Foundation gives 7 # This file is free software; the Free Software Foundation gives
7 # unlimited permission to copy and/or distribute it, with or without 8 # unlimited permission to copy and/or distribute it, with or without
8 # modifications, as long as this notice is preserved. 9 # modifications, as long as this notice is preserved.
9 10
10 # serial 6 ltoptions.m4 11 # serial 7 ltoptions.m4
11 12
12 # This is to help aclocal find these macros, as it can't see m4_define. 13 # This is to help aclocal find these macros, as it can't see m4_define.
13 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) 14 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
14 15
15 16
123 # Declare package support for building win32 dll's. 124 # Declare package support for building win32 dll's.
124 LT_OPTION_DEFINE([LT_INIT], [win32-dll], 125 LT_OPTION_DEFINE([LT_INIT], [win32-dll],
125 [enable_win32_dll=yes 126 [enable_win32_dll=yes
126 127
127 case $host in 128 case $host in
128 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) 129 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
129 AC_CHECK_TOOL(AS, as, false) 130 AC_CHECK_TOOL(AS, as, false)
130 AC_CHECK_TOOL(DLLTOOL, dlltool, false) 131 AC_CHECK_TOOL(DLLTOOL, dlltool, false)
131 AC_CHECK_TOOL(OBJDUMP, objdump, false) 132 AC_CHECK_TOOL(OBJDUMP, objdump, false)
132 ;; 133 ;;
133 esac 134 esac
134 135
135 test -z "$AS" && AS=as 136 test -z "$AS" && AS=as
136 _LT_DECL([], [AS], [0], [Assembler program])dnl 137 _LT_DECL([], [AS], [1], [Assembler program])dnl
137 138
138 test -z "$DLLTOOL" && DLLTOOL=dlltool 139 test -z "$DLLTOOL" && DLLTOOL=dlltool
139 _LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl 140 _LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
140 141
141 test -z "$OBJDUMP" && OBJDUMP=objdump 142 test -z "$OBJDUMP" && OBJDUMP=objdump
142 _LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl 143 _LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
143 ])# win32-dll 144 ])# win32-dll
144 145
145 AU_DEFUN([AC_LIBTOOL_WIN32_DLL], 146 AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
146 [AC_REQUIRE([AC_CANONICAL_HOST])dnl 147 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
147 _LT_SET_OPTION([LT_INIT], [win32-dll]) 148 _LT_SET_OPTION([LT_INIT], [win32-dll])