]>
Commit | Line | Data |
---|---|---|
c18c76c2 | 1 | diff -urN avifile-0.6.org/acinclude.m4 avifile-0.6/acinclude.m4 |
a7a1738c AM |
2 | --- avifile-0.6.org/acinclude.m4 Thu May 17 17:54:08 2001 |
3 | +++ avifile-0.6/acinclude.m4 Thu May 17 17:54:17 2001 | |
c18c76c2 AM |
4 | @@ -2587,190 +2587,6 @@ |
5 | ||
6 | ]) | |
7 | ||
8 | -## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*- | |
9 | -## Copyright (C) 1996-1998 Free Software Foundation, Inc. | |
10 | -## Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 | |
11 | -## | |
12 | -## This program is free software; you can redistribute it and/or modify | |
13 | -## it under the terms of the GNU General Public License as published by | |
14 | -## the Free Software Foundation; either version 2 of the License, or | |
15 | -## (at your option) any later version. | |
16 | -## | |
17 | -## This program is distributed in the hope that it will be useful, but | |
18 | -## WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 | -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
20 | -## General Public License for more details. | |
21 | -## | |
22 | -## You should have received a copy of the GNU General Public License | |
23 | -## along with this program; if not, write to the Free Software | |
24 | -## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | |
25 | -## | |
26 | -## As a special exception to the GNU General Public License, if you | |
27 | -## distribute this file as part of a program that contains a | |
28 | -## configuration script generated by Autoconf, you may include it under | |
29 | -## the same distribution terms that you use for the rest of that program. | |
30 | - | |
31 | -# serial 24 AM_PROG_LIBTOOL | |
32 | -AC_DEFUN(AM_PROG_LIBTOOL, | |
33 | -[AC_REQUIRE([AM_ENABLE_SHARED])dnl | |
34 | -AC_REQUIRE([AM_ENABLE_STATIC])dnl | |
35 | -AC_REQUIRE([AC_CANONICAL_HOST])dnl | |
36 | -AC_REQUIRE([AC_PROG_RANLIB])dnl | |
37 | -AC_REQUIRE([AC_PROG_CC])dnl | |
38 | -AC_REQUIRE([AM_PROG_LD])dnl | |
39 | -AC_REQUIRE([AM_PROG_NM])dnl | |
40 | -AC_REQUIRE([AC_PROG_LN_S])dnl | |
41 | -dnl | |
42 | -# Always use our own libtool. | |
43 | -LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent' | |
44 | -AC_SUBST(LIBTOOL)dnl | |
45 | - | |
46 | -# Check for any special flags to pass to ltconfig. | |
47 | -libtool_flags= | |
48 | -test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" | |
49 | -test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" | |
50 | -test "$silent" = yes && libtool_flags="$libtool_flags --silent" | |
51 | -test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" | |
52 | -test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" | |
53 | - | |
54 | -# Some flags need to be propagated to the compiler or linker for good | |
55 | -# libtool support. | |
56 | -case "$host" in | |
57 | -*-*-irix6*) | |
58 | - # Find out which ABI we are using. | |
59 | - echo '[#]line __oline__ "configure"' > conftest.$ac_ext | |
60 | - if AC_TRY_EVAL(ac_compile); then | |
61 | - case "`/usr/bin/file conftest.o`" in | |
62 | - *32-bit*) | |
63 | - LD="${LD-ld} -32" | |
64 | - ;; | |
65 | - *N32*) | |
66 | - LD="${LD-ld} -n32" | |
67 | - ;; | |
68 | - *64-bit*) | |
69 | - LD="${LD-ld} -64" | |
70 | - ;; | |
71 | - esac | |
72 | - fi | |
73 | - rm -rf conftest* | |
74 | - ;; | |
75 | - | |
76 | -*-*-sco3.2v5*) | |
77 | - # On SCO OpenServer 5, we need -belf to get full-featured binaries. | |
78 | - CFLAGS="$CFLAGS -belf" | |
79 | - ;; | |
80 | -esac | |
81 | - | |
82 | -# Actually configure libtool. ac_aux_dir is where install-sh is found. | |
83 | -CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ | |
84 | -LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ | |
85 | -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ | |
86 | -$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ | |
87 | -|| AC_MSG_ERROR([libtool configure failed]) | |
88 | -]) | |
89 | - | |
90 | -# AM_ENABLE_SHARED - implement the --enable-shared flag | |
91 | -# Usage: AM_ENABLE_SHARED[(DEFAULT)] | |
92 | -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to | |
93 | -# `yes'. | |
94 | -AC_DEFUN(AM_ENABLE_SHARED_EX, | |
95 | -[define([AM_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl | |
96 | -AC_PROVIDE(AM_ENABLE_SHARED) | |
97 | -AC_ARG_ENABLE(shared, | |
98 | -changequote(<<, >>)dnl | |
99 | -<< --enable-shared build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT] | |
100 | -changequote([, ])dnl | |
101 | -[ --enable-shared=PKGS only build shared libraries if the current package | |
102 | - appears as an element in the PKGS list], | |
103 | -[p=${PACKAGE-default} | |
104 | -case "$enableval" in | |
105 | -yes) enable_shared=yes ;; | |
106 | -no) enable_shared=no ;; | |
107 | -*) | |
108 | - enable_shared=no | |
109 | - # Look at the argument we got. We use all the common list separators. | |
110 | - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," | |
111 | - for pkg in $enableval; do | |
112 | - if test "X$pkg" = "X$p"; then | |
113 | - enable_shared=yes | |
114 | - fi | |
115 | - done | |
116 | - IFS="$ac_save_ifs" | |
117 | - ;; | |
118 | -esac], | |
119 | -enable_shared=AM_ENABLE_SHARED_DEFAULT)dnl | |
120 | -]) | |
121 | - | |
122 | -AC_DEFUN(AM_ENABLE_SHARED, | |
123 | -[define([AM_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl | |
124 | -AC_ARG_ENABLE(shared, | |
125 | -changequote(<<, >>)dnl | |
126 | -<< --enable-shared build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT], | |
127 | -changequote([, ])dnl | |
128 | -[ | |
129 | -if test "$enableval" = no; then | |
130 | - enable_shared=no | |
131 | -else | |
132 | - enable_shared=yes | |
133 | -fi | |
134 | -], | |
135 | -enable_shared=AM_ENABLE_SHARED_DEFAULT)dnl | |
136 | -]) | |
137 | - | |
138 | - | |
139 | -# AM_DISABLE_SHARED - set the default shared flag to --disable-shared | |
140 | -AC_DEFUN(AM_DISABLE_SHARED, | |
141 | -[AM_ENABLE_SHARED(no)]) | |
142 | - | |
143 | -# AM_DISABLE_STATIC - set the default static flag to --disable-static | |
144 | -AC_DEFUN(AM_DISABLE_STATIC, | |
145 | -[AM_ENABLE_STATIC(no)]) | |
146 | - | |
147 | -# AM_ENABLE_STATIC - implement the --enable-static flag | |
148 | -# Usage: AM_ENABLE_STATIC[(DEFAULT)] | |
149 | -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to | |
150 | -# `yes'. | |
151 | -AC_DEFUN(AM_ENABLE_STATIC_EX, | |
152 | -[define([AM_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl | |
153 | -AC_PROVIDE(AM_ENABLE_STATIC) | |
154 | -AC_ARG_ENABLE(static, | |
155 | -changequote(<<, >>)dnl | |
156 | -<< --enable-static build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT] | |
157 | -changequote([, ])dnl | |
158 | -[ --enable-static=PKGS only build shared libraries if the current package | |
159 | - appears as an element in the PKGS list], | |
160 | -[p=${PACKAGE-default} | |
161 | -case "$enableval" in | |
162 | -yes) enable_static=yes ;; | |
163 | -no) enable_static=no ;; | |
164 | -*) | |
165 | - enable_static=no | |
166 | - # Look at the argument we got. We use all the common list separators. | |
167 | - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," | |
168 | - for pkg in $enableval; do | |
169 | - if test "X$pkg" = "X$p"; then | |
170 | - enable_static=yes | |
171 | - fi | |
172 | - done | |
173 | - IFS="$ac_save_ifs" | |
174 | - ;; | |
175 | -esac], | |
176 | -enable_static=AM_ENABLE_STATIC_DEFAULT)dnl | |
177 | -]) | |
178 | - | |
179 | -AC_DEFUN(AM_ENABLE_STATIC, | |
180 | -[define([AM_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl | |
181 | -AC_ARG_ENABLE(static, | |
182 | -changequote(<<, >>)dnl | |
183 | -<< --enable-static build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT], | |
184 | -changequote([, ])dnl | |
185 | -[if test "$enableval" = no; then | |
186 | - enable_static=no | |
187 | -else | |
188 | - enable_static=yes | |
189 | -fi], | |
190 | -enable_static=AM_ENABLE_STATIC_DEFAULT)dnl | |
191 | -]) | |
192 | ||
193 | AC_DEFUN(AM_DISABLE_LIBRARIES, | |
194 | [ | |
195 | @@ -2780,112 +2596,6 @@ | |
196 | enable_shared=no | |
197 | ]) | |
198 | ||
199 | -# AM_PROG_LD - find the path to the GNU or non-GNU linker | |
200 | -AC_DEFUN(AM_PROG_LD, | |
201 | -[AC_ARG_WITH(gnu-ld, | |
202 | -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], | |
203 | -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) | |
204 | -AC_REQUIRE([AC_PROG_CC]) | |
205 | -ac_prog=ld | |
206 | -if test "$ac_cv_prog_gcc" = yes; then | |
207 | - # Check if gcc -print-prog-name=ld gives a path. | |
208 | - AC_MSG_CHECKING([for ld used by GCC]) | |
209 | - ac_prog=`($CC -print-prog-name=ld) 2>&5` | |
210 | - case "$ac_prog" in | |
211 | - # Accept absolute paths. | |
212 | - /* | [A-Za-z]:\\*) | |
213 | - test -z "$LD" && LD="$ac_prog" | |
214 | - ;; | |
215 | - "") | |
216 | - # If it fails, then pretend we aren't using GCC. | |
217 | - ac_prog=ld | |
218 | - ;; | |
219 | - *) | |
220 | - # If it is relative, then search for the first ld in PATH. | |
221 | - with_gnu_ld=unknown | |
222 | - ;; | |
223 | - esac | |
224 | -elif test "$with_gnu_ld" = yes; then | |
225 | - AC_MSG_CHECKING([for GNU ld]) | |
226 | -else | |
227 | - AC_MSG_CHECKING([for non-GNU ld]) | |
228 | -fi | |
229 | -AC_CACHE_VAL(ac_cv_path_LD, | |
230 | -[if test -z "$LD"; then | |
231 | - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" | |
232 | - for ac_dir in $PATH; do | |
233 | - test -z "$ac_dir" && ac_dir=. | |
234 | - if test -f "$ac_dir/$ac_prog"; then | |
235 | - ac_cv_path_LD="$ac_dir/$ac_prog" | |
236 | - # Check to see if the program is GNU ld. I'd rather use --version, | |
237 | - # but apparently some GNU ld's only accept -v. | |
238 | - # Break only if it was the GNU/non-GNU ld that we prefer. | |
239 | - if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then | |
240 | - test "$with_gnu_ld" != no && break | |
241 | - else | |
242 | - test "$with_gnu_ld" != yes && break | |
243 | - fi | |
244 | - fi | |
245 | - done | |
246 | - IFS="$ac_save_ifs" | |
247 | -else | |
248 | - ac_cv_path_LD="$LD" # Let the user override the test with a path. | |
249 | -fi]) | |
250 | -LD="$ac_cv_path_LD" | |
251 | -if test -n "$LD"; then | |
252 | - AC_MSG_RESULT($LD) | |
253 | -else | |
254 | - AC_MSG_RESULT(no) | |
255 | -fi | |
256 | -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) | |
257 | -AC_SUBST(LD) | |
258 | -AM_PROG_LD_GNU | |
259 | -]) | |
260 | - | |
261 | -AC_DEFUN(AM_PROG_LD_GNU, | |
262 | -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld, | |
263 | -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. | |
264 | -if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then | |
265 | - ac_cv_prog_gnu_ld=yes | |
266 | -else | |
267 | - ac_cv_prog_gnu_ld=no | |
268 | -fi]) | |
269 | -]) | |
270 | - | |
271 | -# AM_PROG_NM - find the path to a BSD-compatible name lister | |
272 | -AC_DEFUN(AM_PROG_NM, | |
273 | -[AC_MSG_CHECKING([for BSD-compatible nm]) | |
274 | -AC_CACHE_VAL(ac_cv_path_NM, | |
275 | -[case "$NM" in | |
276 | -/* | [A-Za-z]:\\*) | |
277 | - ac_cv_path_NM="$NM" # Let the user override the test with a path. | |
278 | - ;; | |
279 | -*) | |
280 | - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" | |
281 | - for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do | |
282 | - test -z "$ac_dir" && ac_dir=. | |
283 | - if test -f $ac_dir/nm; then | |
284 | - # Check to see if the nm accepts a BSD-compat flag. | |
285 | - # Adding the `sed 1q' prevents false positives on HP-UX, which says: | |
286 | - # nm: unknown option "B" ignored | |
287 | - if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then | |
288 | - ac_cv_path_NM="$ac_dir/nm -B" | |
289 | - elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then | |
290 | - ac_cv_path_NM="$ac_dir/nm -p" | |
291 | - else | |
292 | - ac_cv_path_NM="$ac_dir/nm" | |
293 | - fi | |
294 | - break | |
295 | - fi | |
296 | - done | |
297 | - IFS="$ac_save_ifs" | |
298 | - test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm | |
299 | - ;; | |
300 | -esac]) | |
301 | -NM="$ac_cv_path_NM" | |
302 | -AC_MSG_RESULT([$NM]) | |
303 | -AC_SUBST(NM) | |
304 | -]) | |
305 | ||
306 | # Configure paths for SDL | |
307 | # Sam Lantinga 9/21/99 | |
a7a1738c AM |
308 | diff -urN avifile-0.6.org/configure.in avifile-0.6/configure.in |
309 | --- avifile-0.6.org/configure.in Thu May 17 17:54:08 2001 | |
310 | +++ avifile-0.6/configure.in Thu May 17 17:54:32 2001 | |
311 | @@ -18,14 +18,6 @@ | |
312 | AC_PROG_CXXCPP | |
313 | AC_PROG_INSTALL | |
314 | AM_PROG_LIBTOOL | |
315 | -dnl - some bad is with the current version of automake in Debian unstable | |
316 | -dnl - so temporaly using this ugly fix - using link to system's binary | |
e735cad9 | 317 | -if test x$USER = xkkabi; then |
a7a1738c AM |
318 | - rm libtool |
319 | - ln -s /usr/bin/libtool | |
320 | -else | |
321 | - AM_PROG_LIBTOOL | |
322 | -fi | |
323 | AC_LANG_C | |
324 | ||
325 | AM_CONFIG_HEADER(include/config.h) |