summaryrefslogtreecommitdiffstats
path: root/libtool.m4
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2001-03-22 06:48:32 +0000
committerAlexandre Oliva <aoliva@gcc.gnu.org>2001-03-22 06:48:32 +0000
commit82e232360ddbe45a46588e80aa620eb416e2d6ee (patch)
tree263e2343daebef64f5353d3bc54ae4ea676f67bf /libtool.m4
parentMethod.java (getExceptionTypes): Call getType() to initialize if exception_ty... (diff)
downloadgcc-82e232360ddbe45a46588e80aa620eb416e2d6ee.tar.gz
gcc-82e232360ddbe45a46588e80aa620eb416e2d6ee.tar.bz2
gcc-82e232360ddbe45a46588e80aa620eb416e2d6ee.tar.xz
ltconfig, [...]: Upgraded to libtool 1.4a 1.641.2.198.
* ltconfig, ltmain.sh, libtool.m4, ltcf-c.sh, ltcf-cxx.sh, ltcf-gcj.sh: Upgraded to libtool 1.4a 1.641.2.198. From-SVN: r40731
Diffstat (limited to 'libtool.m4')
-rw-r--r--libtool.m4223
1 files changed, 114 insertions, 109 deletions
diff --git a/libtool.m4 b/libtool.m4
index cb004e223ab..324676aab3f 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -22,8 +22,9 @@
22## configuration script generated by Autoconf, you may include it under 22## configuration script generated by Autoconf, you may include it under
23## the same distribution terms that you use for the rest of that program. 23## the same distribution terms that you use for the rest of that program.
24 24
25# serial 45 AC_PROG_LIBTOOL 25# serial 46 AC_PROG_LIBTOOL
26AC_DEFUN(AC_PROG_LIBTOOL,[AC_REQUIRE([_AC_PROG_LIBTOOL]) 26AC_DEFUN([AC_PROG_LIBTOOL],
27[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
27dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX 28dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
28dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. 29dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
29 AC_PROVIDE_IFELSE([AC_PROG_CXX], 30 AC_PROVIDE_IFELSE([AC_PROG_CXX],
@@ -50,7 +51,7 @@ dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
50 [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ 51 [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ
51])])])])])]) 52])])])])])])
52 53
53AC_DEFUN(_AC_PROG_LIBTOOL, 54AC_DEFUN([_AC_PROG_LIBTOOL],
54[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl 55[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
55AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl 56AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
56AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl 57AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
@@ -84,7 +85,7 @@ AC_SUBST(LIBTOOL)dnl
84exec 5>>./config.log 85exec 5>>./config.log
85]) 86])
86 87
87AC_DEFUN(AC_LIBTOOL_SETUP, 88AC_DEFUN([AC_LIBTOOL_SETUP],
88[AC_PREREQ(2.13)dnl 89[AC_PREREQ(2.13)dnl
89AC_REQUIRE([AC_ENABLE_SHARED])dnl 90AC_REQUIRE([AC_ENABLE_SHARED])dnl
90AC_REQUIRE([AC_ENABLE_STATIC])dnl 91AC_REQUIRE([AC_ENABLE_STATIC])dnl
@@ -103,7 +104,7 @@ AC_REQUIRE([AC_EXEEXT])dnl
103dnl 104dnl
104 105
105# Only perform the check for file, if the check method requires it 106# Only perform the check for file, if the check method requires it
106case "$deplibs_check_method" in 107case $deplibs_check_method in
107file_magic*) 108file_magic*)
108 if test "$file_magic_cmd" = '$MAGIC_CMD'; then 109 if test "$file_magic_cmd" = '$MAGIC_CMD'; then
109 AC_PATH_MAGIC 110 AC_PATH_MAGIC
@@ -119,8 +120,8 @@ libtool_flags="--cache-file=$cache_file"
119test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" 120test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
120test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" 121test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
121test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" 122test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
122test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" 123test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
123test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" 124test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
124ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], 125ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
125[libtool_flags="$libtool_flags --enable-dlopen"]) 126[libtool_flags="$libtool_flags --enable-dlopen"])
126ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], 127ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
@@ -138,12 +139,12 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
138 139
139# Some flags need to be propagated to the compiler or linker for good 140# Some flags need to be propagated to the compiler or linker for good
140# libtool support. 141# libtool support.
141case "$host" in 142case $host in
142*-*-irix6*) 143*-*-irix6*)
143 # Find out which ABI we are using. 144 # Find out which ABI we are using.
144 echo '[#]line __oline__ "configure"' > conftest.$ac_ext 145 echo '[#]line __oline__ "configure"' > conftest.$ac_ext
145 if AC_TRY_EVAL(ac_compile); then 146 if AC_TRY_EVAL(ac_compile); then
146 case "`/usr/bin/file conftest.o`" in 147 case `/usr/bin/file conftest.$ac_objext` in
147 *32-bit*) 148 *32-bit*)
148 LD="${LD-ld} -32" 149 LD="${LD-ld} -32"
149 ;; 150 ;;
@@ -187,7 +188,7 @@ ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
187 DllMain (0, 0, 0);], 188 DllMain (0, 0, 0);],
188 [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])]) 189 [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
189 190
190 case "$host/$CC" in 191 case $host/$CC in
191 *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*) 192 *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
192 # old mingw systems require "-dll" to link a DLL, while more recent ones 193 # old mingw systems require "-dll" to link a DLL, while more recent ones
193 # require "-mdll" 194 # require "-mdll"
@@ -207,23 +208,23 @@ esac
207]) 208])
208 209
209# AC_LIBTOOL_DLOPEN - enable checks for dlopen support 210# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
210AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) 211AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
211 212
212# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's 213# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
213AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])]) 214AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
214 215
215# AC_ENABLE_SHARED - implement the --enable-shared flag 216# AC_ENABLE_SHARED - implement the --enable-shared flag
216# Usage: AC_ENABLE_SHARED[(DEFAULT)] 217# Usage: AC_ENABLE_SHARED[(DEFAULT)]
217# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to 218# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
218# `yes'. 219# `yes'.
219AC_DEFUN(AC_ENABLE_SHARED, [dnl 220AC_DEFUN([AC_ENABLE_SHARED],
220define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl 221[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
221AC_ARG_ENABLE(shared, 222AC_ARG_ENABLE(shared,
222changequote(<<, >>)dnl 223changequote(<<, >>)dnl
223<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT], 224<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
224changequote([, ])dnl 225changequote([, ])dnl
225[p=${PACKAGE-default} 226[p=${PACKAGE-default}
226case "$enableval" in 227case $enableval in
227yes) enable_shared=yes ;; 228yes) enable_shared=yes ;;
228no) enable_shared=no ;; 229no) enable_shared=no ;;
229*) 230*)
@@ -242,21 +243,21 @@ enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
242]) 243])
243 244
244# AC_DISABLE_SHARED - set the default shared flag to --disable-shared 245# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
245AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl 246AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
246AC_ENABLE_SHARED(no)]) 247AC_ENABLE_SHARED(no)])
247 248
248# AC_ENABLE_STATIC - implement the --enable-static flag 249# AC_ENABLE_STATIC - implement the --enable-static flag
249# Usage: AC_ENABLE_STATIC[(DEFAULT)] 250# Usage: AC_ENABLE_STATIC[(DEFAULT)]
250# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to 251# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
251# `yes'. 252# `yes'.
252AC_DEFUN(AC_ENABLE_STATIC, [dnl 253AC_DEFUN([AC_ENABLE_STATIC],
253define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl 254[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
254AC_ARG_ENABLE(static, 255AC_ARG_ENABLE(static,
255changequote(<<, >>)dnl 256changequote(<<, >>)dnl
256<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT], 257<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
257changequote([, ])dnl 258changequote([, ])dnl
258[p=${PACKAGE-default} 259[p=${PACKAGE-default}
259case "$enableval" in 260case $enableval in
260yes) enable_static=yes ;; 261yes) enable_static=yes ;;
261no) enable_static=no ;; 262no) enable_static=no ;;
262*) 263*)
@@ -275,7 +276,8 @@ enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
275]) 276])
276 277
277# AC_DISABLE_STATIC - set the default static flag to --disable-static 278# AC_DISABLE_STATIC - set the default static flag to --disable-static
278AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl 279AC_DEFUN([AC_DISABLE_STATIC],
280[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
279AC_ENABLE_STATIC(no)]) 281AC_ENABLE_STATIC(no)])
280 282
281 283
@@ -283,14 +285,14 @@ AC_ENABLE_STATIC(no)])
283# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)] 285# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
284# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to 286# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
285# `yes'. 287# `yes'.
286AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl 288AC_DEFUN([AC_ENABLE_FAST_INSTALL],
287define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl 289[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
288AC_ARG_ENABLE(fast-install, 290AC_ARG_ENABLE(fast-install,
289changequote(<<, >>)dnl 291changequote(<<, >>)dnl
290<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT], 292<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
291changequote([, ])dnl 293changequote([, ])dnl
292[p=${PACKAGE-default} 294[p=${PACKAGE-default}
293case "$enableval" in 295case $enableval in
294yes) enable_fast_install=yes ;; 296yes) enable_fast_install=yes ;;
295no) enable_fast_install=no ;; 297no) enable_fast_install=no ;;
296*) 298*)
@@ -309,22 +311,24 @@ enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
309]) 311])
310 312
311# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install 313# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
312AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl 314AC_DEFUN([AC_DISABLE_FAST_INSTALL],
315[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
313AC_ENABLE_FAST_INSTALL(no)]) 316AC_ENABLE_FAST_INSTALL(no)])
314 317
315# AC_LIBTOOL_PICMODE - implement the --with-pic flag 318# AC_LIBTOOL_PICMODE - implement the --with-pic flag
316# Usage: AC_LIBTOOL_PICMODE[(MODE)] 319# Usage: AC_LIBTOOL_PICMODE[(MODE)]
317# Where MODE is either `yes' or `no'. If omitted, it defaults to 320# Where MODE is either `yes' or `no'. If omitted, it defaults to
318# `both'. 321# `both'.
319AC_DEFUN(AC_LIBTOOL_PICMODE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl 322AC_DEFUN([AC_LIBTOOL_PICMODE],
323[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
320pic_mode=ifelse($#,1,$1,default)]) 324pic_mode=ifelse($#,1,$1,default)])
321 325
322 326
323# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library 327# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
324AC_DEFUN(AC_PATH_TOOL_PREFIX, 328AC_DEFUN([AC_PATH_TOOL_PREFIX],
325[AC_MSG_CHECKING([for $1]) 329[AC_MSG_CHECKING([for $1])
326AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, 330AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
327[case "$MAGIC_CMD" in 331[case $MAGIC_CMD in
328 /*) 332 /*)
329 lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. 333 lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
330 ;; 334 ;;
@@ -343,7 +347,7 @@ dnl not every word. This closes a longstanding sh security hole.
343 if test -f $ac_dir/$1; then 347 if test -f $ac_dir/$1; then
344 lt_cv_path_MAGIC_CMD="$ac_dir/$1" 348 lt_cv_path_MAGIC_CMD="$ac_dir/$1"
345 if test -n "$file_magic_test_file"; then 349 if test -n "$file_magic_test_file"; then
346 case "$deplibs_check_method" in 350 case $deplibs_check_method in
347 "file_magic "*) 351 "file_magic "*)
348 file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" 352 file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
349 MAGIC_CMD="$lt_cv_path_MAGIC_CMD" 353 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
@@ -383,7 +387,7 @@ fi
383 387
384 388
385# AC_PATH_MAGIC - find a file program which can recognise a shared library 389# AC_PATH_MAGIC - find a file program which can recognise a shared library
386AC_DEFUN(AC_PATH_MAGIC, 390AC_DEFUN([AC_PATH_MAGIC],
387[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl 391[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
388AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH) 392AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
389if test -z "$lt_cv_path_MAGIC_CMD"; then 393if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -397,7 +401,7 @@ fi
397 401
398 402
399# AC_PROG_LD - find the path to the GNU or non-GNU linker 403# AC_PROG_LD - find the path to the GNU or non-GNU linker
400AC_DEFUN(AC_PROG_LD, 404AC_DEFUN([AC_PROG_LD],
401[AC_ARG_WITH(gnu-ld, 405[AC_ARG_WITH(gnu-ld,
402[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], 406[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
403test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) 407test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
@@ -405,7 +409,7 @@ AC_REQUIRE([AC_PROG_CC])dnl
405AC_REQUIRE([AC_CANONICAL_HOST])dnl 409AC_REQUIRE([AC_CANONICAL_HOST])dnl
406AC_REQUIRE([AC_CANONICAL_BUILD])dnl 410AC_REQUIRE([AC_CANONICAL_BUILD])dnl
407ac_prog=ld 411ac_prog=ld
408if test "$ac_cv_prog_gcc" = yes; then 412if test "$GCC" = yes; then
409 # Check if gcc -print-prog-name=ld gives a path. 413 # Check if gcc -print-prog-name=ld gives a path.
410 AC_MSG_CHECKING([for ld used by GCC]) 414 AC_MSG_CHECKING([for ld used by GCC])
411 case $host in 415 case $host in
@@ -415,12 +419,10 @@ if test "$ac_cv_prog_gcc" = yes; then
415 *) 419 *)
416 ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; 420 ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
417 esac 421 esac
418 case "$ac_prog" in 422 case $ac_prog in
419 # Accept absolute paths. 423 # Accept absolute paths.
420changequote(,)dnl 424 [[\\/]* | [A-Za-z]:[\\/]*)]
421 [\\/]* | [A-Za-z]:[\\/]*) 425 re_direlt=['/[^/][^/]*/\.\./']
422 re_direlt='/[^/][^/]*/\.\./'
423changequote([,])dnl
424 # Canonicalize the path of ld 426 # Canonicalize the path of ld
425 ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` 427 ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
426 while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do 428 while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
@@ -442,17 +444,17 @@ elif test "$with_gnu_ld" = yes; then
442else 444else
443 AC_MSG_CHECKING([for non-GNU ld]) 445 AC_MSG_CHECKING([for non-GNU ld])
444fi 446fi
445AC_CACHE_VAL(ac_cv_path_LD, 447AC_CACHE_VAL(lt_cv_path_LD,
446[if test -z "$LD"; then 448[if test -z "$LD"; then
447 IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" 449 IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
448 for ac_dir in $PATH; do 450 for ac_dir in $PATH; do
449 test -z "$ac_dir" && ac_dir=. 451 test -z "$ac_dir" && ac_dir=.
450 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then 452 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
451 ac_cv_path_LD="$ac_dir/$ac_prog" 453 lt_cv_path_LD="$ac_dir/$ac_prog"
452 # Check to see if the program is GNU ld. I'd rather use --version, 454 # Check to see if the program is GNU ld. I'd rather use --version,
453 # but apparently some GNU ld's only accept -v. 455 # but apparently some GNU ld's only accept -v.
454 # Break only if it was the GNU/non-GNU ld that we prefer. 456 # Break only if it was the GNU/non-GNU ld that we prefer.
455 if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then 457 if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
456 test "$with_gnu_ld" != no && break 458 test "$with_gnu_ld" != no && break
457 else 459 else
458 test "$with_gnu_ld" != yes && break 460 test "$with_gnu_ld" != yes && break
@@ -461,9 +463,9 @@ AC_CACHE_VAL(ac_cv_path_LD,
461 done 463 done
462 IFS="$ac_save_ifs" 464 IFS="$ac_save_ifs"
463else 465else
464 ac_cv_path_LD="$LD" # Let the user override the test with a path. 466 lt_cv_path_LD="$LD" # Let the user override the test with a path.
465fi]) 467fi])
466LD="$ac_cv_path_LD" 468LD="$lt_cv_path_LD"
467if test -n "$LD"; then 469if test -n "$LD"; then
468 AC_MSG_RESULT($LD) 470 AC_MSG_RESULT($LD)
469else 471else
@@ -473,20 +475,20 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
473AC_PROG_LD_GNU 475AC_PROG_LD_GNU
474]) 476])
475 477
476AC_DEFUN(AC_PROG_LD_GNU, 478AC_DEFUN([AC_PROG_LD_GNU],
477[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld, 479[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
478[# I'd rather use --version here, but apparently some GNU ld's only accept -v. 480[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
479if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then 481if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
480 ac_cv_prog_gnu_ld=yes 482 lt_cv_prog_gnu_ld=yes
481else 483else
482 ac_cv_prog_gnu_ld=no 484 lt_cv_prog_gnu_ld=no
483fi]) 485fi])
484with_gnu_ld=$ac_cv_prog_gnu_ld 486with_gnu_ld=$lt_cv_prog_gnu_ld
485]) 487])
486 488
487# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker 489# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
488# -- PORTME Some linkers may need a different reload flag. 490# -- PORTME Some linkers may need a different reload flag.
489AC_DEFUN(AC_PROG_LD_RELOAD_FLAG, 491AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
490[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag, 492[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
491[lt_cv_ld_reload_flag='-r']) 493[lt_cv_ld_reload_flag='-r'])
492reload_flag=$lt_cv_ld_reload_flag 494reload_flag=$lt_cv_ld_reload_flag
@@ -495,7 +497,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag"
495 497
496# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies 498# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
497# -- PORTME fill in with the dynamic library characteristics 499# -- PORTME fill in with the dynamic library characteristics
498AC_DEFUN(AC_DEPLIBS_CHECK_METHOD, 500AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
499[AC_CACHE_CHECK([how to recognise dependant libraries], 501[AC_CACHE_CHECK([how to recognise dependant libraries],
500lt_cv_deplibs_check_method, 502lt_cv_deplibs_check_method,
501[lt_cv_file_magic_cmd='$MAGIC_CMD' 503[lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -512,8 +514,8 @@ lt_cv_deplibs_check_method='unknown'
512# If you have `file' or equivalent on your system and you're not sure 514# If you have `file' or equivalent on your system and you're not sure
513# whether `pass_all' will *always* work, you probably want this one. 515# whether `pass_all' will *always* work, you probably want this one.
514 516
515case "$host_os" in 517case $host_os in
516aix4*) 518aix*)
517 lt_cv_deplibs_check_method=pass_all 519 lt_cv_deplibs_check_method=pass_all
518 ;; 520 ;;
519 521
@@ -522,9 +524,7 @@ beos*)
522 ;; 524 ;;
523 525
524bsdi4*) 526bsdi4*)
525 changequote(,)dnl 527 lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
526 lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
527 changequote([, ])dnl
528 lt_cv_file_magic_cmd='/usr/bin/file -L' 528 lt_cv_file_magic_cmd='/usr/bin/file -L'
529 lt_cv_file_magic_test_file=/shlib/libc.so 529 lt_cv_file_magic_test_file=/shlib/libc.so
530 ;; 530 ;;
@@ -534,15 +534,19 @@ cygwin* | mingw* |pw32*)
534 lt_cv_file_magic_cmd='$OBJDUMP -f' 534 lt_cv_file_magic_cmd='$OBJDUMP -f'
535 ;; 535 ;;
536 536
537darwin* | rhapsody*)
538 lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
539 lt_cv_file_magic_cmd=/usr/bin/file
540 lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
541 ;;
542
537freebsd* ) 543freebsd* )
538 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then 544 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
539 case "$host_cpu" in 545 case $host_cpu in
540 i*86 ) 546 i*86 )
541 # Not sure whether the presence of OpenBSD here was a mistake. 547 # Not sure whether the presence of OpenBSD here was a mistake.
542 # Let's accept both of them until this is cleared up. 548 # Let's accept both of them until this is cleared up.
543 changequote(,)dnl 549 lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
544 lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
545 changequote([, ])dnl
546 lt_cv_file_magic_cmd=/usr/bin/file 550 lt_cv_file_magic_cmd=/usr/bin/file
547 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` 551 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
548 ;; 552 ;;
@@ -556,30 +560,27 @@ gnu*)
556 lt_cv_deplibs_check_method=pass_all 560 lt_cv_deplibs_check_method=pass_all
557 ;; 561 ;;
558 562
559hpux10.20*) 563hpux10.20*|hpux11*)
560 # TODO: Does this work for hpux-11 too? 564 lt_cv_deplibs_check_method=['file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
561 lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
562 lt_cv_file_magic_cmd=/usr/bin/file 565 lt_cv_file_magic_cmd=/usr/bin/file
563 lt_cv_file_magic_test_file=/usr/lib/libc.sl 566 lt_cv_file_magic_test_file=/usr/lib/libc.sl
564 ;; 567 ;;
565 568
566irix5* | irix6*) 569irix5* | irix6*)
567 case "$host_os" in 570 case $host_os in
568 irix5*) 571 irix5*)
569 # this will be overridden with pass_all, but let us keep it just in case 572 # this will be overridden with pass_all, but let us keep it just in case
570 lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" 573 lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
571 ;; 574 ;;
572 *) 575 *)
573 case "$LD" in 576 case $LD in
574 *-32|*"-32 ") libmagic=32-bit;; 577 *-32|*"-32 ") libmagic=32-bit;;
575 *-n32|*"-n32 ") libmagic=N32;; 578 *-n32|*"-n32 ") libmagic=N32;;
576 *-64|*"-64 ") libmagic=64-bit;; 579 *-64|*"-64 ") libmagic=64-bit;;
577 *) libmagic=never-match;; 580 *) libmagic=never-match;;
578 esac 581 esac
579 # this will be overridden with pass_all, but let us keep it just in case 582 # this will be overridden with pass_all, but let us keep it just in case
580 changequote(,)dnl 583 lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
581 lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
582 changequote([, ])dnl
583 ;; 584 ;;
584 esac 585 esac
585 lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` 586 lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
@@ -588,27 +589,30 @@ irix5* | irix6*)
588 589
589# This must be Linux ELF. 590# This must be Linux ELF.
590linux-gnu*) 591linux-gnu*)
591 case "$host_cpu" in 592 case $host_cpu in
592 alpha* | i*86 | powerpc* | sparc* | ia64* ) 593 alpha* | i*86 | powerpc* | sparc* | ia64* )
593 lt_cv_deplibs_check_method=pass_all ;; 594 lt_cv_deplibs_check_method=pass_all ;;
594 *) 595 *)
595 # glibc up to 2.1.1 does not perform some relocations on ARM 596 # glibc up to 2.1.1 does not perform some relocations on ARM
596 changequote(,)dnl 597 lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
597 lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
598 changequote([, ])dnl
599 esac 598 esac
600 lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` 599 lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
601 ;; 600 ;;
602 601
603netbsd*) 602netbsd*)
604 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then : 603 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
604 [lt_cv_deplibs_check_method='file_magic NetBSD/[a-z0-9]* demand paged shared library']
605 else 605 else
606 changequote(,)dnl 606 [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object']
607 lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
608 changequote([, ])dnl
609 lt_cv_file_magic_cmd='/usr/bin/file -L'
610 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
611 fi 607 fi
608 lt_cv_file_magic_cmd='/usr/bin/file -L'
609 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
610 ;;
611
612newsos6)
613 [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
614 lt_cv_file_magic_cmd=/usr/bin/file
615 lt_cv_file_magic_test_file=/usr/lib/libnls.so
612 ;; 616 ;;
613 617
614osf3* | osf4* | osf5*) 618osf3* | osf4* | osf5*)
@@ -628,14 +632,12 @@ solaris*)
628 ;; 632 ;;
629 633
630sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) 634sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
631 case "$host_vendor" in 635 case $host_vendor in
632 ncr) 636 ncr)
633 lt_cv_deplibs_check_method=pass_all 637 lt_cv_deplibs_check_method=pass_all
634 ;; 638 ;;
635 motorola) 639 motorola)
636 changequote(,)dnl 640 lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
637 lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
638 changequote([, ])dnl
639 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` 641 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
640 ;; 642 ;;
641 esac 643 esac
@@ -648,12 +650,12 @@ deplibs_check_method=$lt_cv_deplibs_check_method
648 650
649 651
650# AC_PROG_NM - find the path to a BSD-compatible name lister 652# AC_PROG_NM - find the path to a BSD-compatible name lister
651AC_DEFUN(AC_PROG_NM, 653AC_DEFUN([AC_PROG_NM],
652[AC_MSG_CHECKING([for BSD-compatible nm]) 654[AC_MSG_CHECKING([for BSD-compatible nm])
653AC_CACHE_VAL(ac_cv_path_NM, 655AC_CACHE_VAL(lt_cv_path_NM,
654[if test -n "$NM"; then 656[if test -n "$NM"; then
655 # Let the user override the test. 657 # Let the user override the test.
656 ac_cv_path_NM="$NM" 658 lt_cv_path_NM="$NM"
657else 659else
658 IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" 660 IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
659 for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do 661 for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
@@ -665,29 +667,29 @@ else
665 # nm: unknown option "B" ignored 667 # nm: unknown option "B" ignored
666 # Tru64's nm complains that /dev/null is an invalid object file 668 # Tru64's nm complains that /dev/null is an invalid object file
667 if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then 669 if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
668 ac_cv_path_NM="$tmp_nm -B" 670 lt_cv_path_NM="$tmp_nm -B"
669 break 671 break
670 elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then 672 elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
671 ac_cv_path_NM="$tmp_nm -p" 673 lt_cv_path_NM="$tmp_nm -p"
672 break 674 break
673 else 675 else
674 ac_cv_path_NM=${ac_cv_path_NM="$tmp_nm"} # keep the first match, but 676 lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
675 continue # so that we can try to find one that supports BSD flags 677 continue # so that we can try to find one that supports BSD flags
676 fi 678 fi
677 fi 679 fi
678 done 680 done
679 IFS="$ac_save_ifs" 681 IFS="$ac_save_ifs"
680 test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm 682 test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
681fi]) 683fi])
682NM="$ac_cv_path_NM" 684NM="$lt_cv_path_NM"
683AC_MSG_RESULT([$NM]) 685AC_MSG_RESULT([$NM])
684]) 686])
685 687
686# AC_CHECK_LIBM - check for math library 688# AC_CHECK_LIBM - check for math library
687AC_DEFUN(AC_CHECK_LIBM, 689AC_DEFUN([AC_CHECK_LIBM],
688[AC_REQUIRE([AC_CANONICAL_HOST])dnl 690[AC_REQUIRE([AC_CANONICAL_HOST])dnl
689LIBM= 691LIBM=
690case "$host" in 692case $host in
691*-*-beos* | *-*-cygwin* | *-*-pw32*) 693*-*-beos* | *-*-cygwin* | *-*-pw32*)
692 # These system don't have libm 694 # These system don't have libm
693 ;; 695 ;;
@@ -711,8 +713,9 @@ esac
711# '${top_srcdir}/' (note the single quotes!). If your package is not 713# '${top_srcdir}/' (note the single quotes!). If your package is not
712# flat and you're not using automake, define top_builddir and 714# flat and you're not using automake, define top_builddir and
713# top_srcdir appropriately in the Makefiles. 715# top_srcdir appropriately in the Makefiles.
714AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl 716AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
715 case "$enable_ltdl_convenience" in 717[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
718 case $enable_ltdl_convenience in
716 no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; 719 no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
717 "") enable_ltdl_convenience=yes 720 "") enable_ltdl_convenience=yes
718 ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; 721 ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
@@ -732,7 +735,8 @@ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
732# not flat and you're not using automake, define top_builddir and 735# not flat and you're not using automake, define top_builddir and
733# top_srcdir appropriately in the Makefiles. 736# top_srcdir appropriately in the Makefiles.
734# In the future, this macro may have to be called after AC_PROG_LIBTOOL. 737# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
735AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl 738AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
739[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
736 AC_CHECK_LIB(ltdl, main, 740 AC_CHECK_LIB(ltdl, main,
737 [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], 741 [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
738 [if test x"$enable_ltdl_install" = xno; then 742 [if test x"$enable_ltdl_install" = xno; then
@@ -760,10 +764,10 @@ ifdef([AC_PROVIDE_IFELSE],
760 [$2], [$3])])]) 764 [$2], [$3])])])
761 765
762# AC_LIBTOOL_CXX - enable support for C++ libraries 766# AC_LIBTOOL_CXX - enable support for C++ libraries
763AC_DEFUN(AC_LIBTOOL_CXX,[AC_REQUIRE([_AC_LIBTOOL_CXX])]) 767AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
764AC_DEFUN(_AC_LIBTOOL_CXX, 768
765[AC_REQUIRE([AC_PROG_LIBTOOL]) 769AC_DEFUN([_AC_LIBTOOL_CXX],
766AC_REQUIRE([AC_PROG_CXX]) 770[AC_REQUIRE([AC_PROG_CXX])
767AC_REQUIRE([AC_PROG_CXXCPP]) 771AC_REQUIRE([AC_PROG_CXXCPP])
768LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh" 772LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
769lt_save_CC="$CC" 773lt_save_CC="$CC"
@@ -771,7 +775,7 @@ lt_save_CFLAGS="$CFLAGS"
771dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC 775dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
772dnl is set to the C++ compiler. 776dnl is set to the C++ compiler.
773AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \ 777AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
774MAGIC_CMD="$MAGIC_CMD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ 778MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
775LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \ 779LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
776AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \ 780AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
777objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \ 781objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
@@ -789,8 +793,9 @@ exec 5>>./config.log
789]) 793])
790 794
791# AC_LIBTOOL_GCJ - enable support for GCJ libraries 795# AC_LIBTOOL_GCJ - enable support for GCJ libraries
792AC_DEFUN(AC_LIBTOOL_GCJ,[AC_REQUIRE([_AC_LIBTOOL_GCJ])]) 796AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
793AC_DEFUN(_AC_LIBTOOL_GCJ, 797
798AC_DEFUN([_AC_LIBTOOL_GCJ],
794[AC_REQUIRE([AC_PROG_LIBTOOL]) 799[AC_REQUIRE([AC_PROG_LIBTOOL])
795AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], 800AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
796 [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], 801 [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
@@ -804,7 +809,7 @@ lt_save_CFLAGS="$CFLAGS"
804dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC 809dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
805dnl is set to the C++ compiler. 810dnl is set to the C++ compiler.
806AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \ 811AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
807MAGIC_CMD="$MAGIC_CMD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ 812MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
808LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \ 813LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
809AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \ 814AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
810objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \ 815objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
@@ -822,19 +827,19 @@ exec 5>>./config.log
822]) 827])
823 828
824dnl old names 829dnl old names
825AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl 830AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
826AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl 831AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
827AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl 832AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
828AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl 833AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
829AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl 834AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
830AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl 835AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
831AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl 836AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
832 837
833dnl This is just to silence aclocal about the macro not being used 838dnl This is just to silence aclocal about the macro not being used
834ifelse([AC_DISABLE_FAST_INSTALL])dnl 839ifelse([AC_DISABLE_FAST_INSTALL])dnl
835 840
836AC_DEFUN([LT_AC_PROG_GCJ],[ 841AC_DEFUN([LT_AC_PROG_GCJ],
837 AC_CHECK_TOOL(GCJ, gcj, no) 842[AC_CHECK_TOOL(GCJ, gcj, no)
838 test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" 843 test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
839 AC_SUBST(GCJFLAGS) 844 AC_SUBST(GCJFLAGS)
840]) 845])