* ltconfig, ltmain.sh, libtool.m4, ltcf-c.sh: Updated from libtool
multi-language branch.
This commit is contained in:
		| @@ -1,3 +1,8 @@ | |||||||
|  | 2000-09-06  Alexandre Oliva  <aoliva@redhat.com> | ||||||
|  |  | ||||||
|  | 	* ltconfig, ltmain.sh, libtool.m4, ltcf-c.sh: Updated from libtool | ||||||
|  | 	multi-language branch. | ||||||
|  |  | ||||||
| 2000-09-05  Alexandre Oliva  <aoliva@redhat.com> | 2000-09-05  Alexandre Oliva  <aoliva@redhat.com> | ||||||
|  |  | ||||||
| 	* Makefile.in (all-bootstrap): Added all-texinfo and all-zlib. | 	* Makefile.in (all-bootstrap): Added all-texinfo and all-zlib. | ||||||
|   | |||||||
							
								
								
									
										15
									
								
								libtool.m4
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										15
									
								
								libtool.m4
									
									
									
									
										vendored
									
									
								
							| @@ -532,8 +532,10 @@ freebsd* ) | |||||||
|   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then |   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | ||||||
|     case "$host_cpu" in |     case "$host_cpu" in | ||||||
|     i*86 ) |     i*86 ) | ||||||
|  |       # Not sure whether the presence of OpenBSD here was a mistake. | ||||||
|  |       # Let's accept both of them until this is cleared up. | ||||||
|       changequote(,)dnl |       changequote(,)dnl | ||||||
|       lt_cv_deplibs_check_method=='file_magic OpenBSD/i[3-9]86 demand paged shared library' |       lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' | ||||||
|       changequote([, ])dnl |       changequote([, ])dnl | ||||||
|       lt_cv_file_magic_cmd=/usr/bin/file |       lt_cv_file_magic_cmd=/usr/bin/file | ||||||
|       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` |       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` | ||||||
| @@ -579,7 +581,7 @@ irix5* | irix6*) | |||||||
|   ;; |   ;; | ||||||
|  |  | ||||||
| # This must be Linux ELF. | # This must be Linux ELF. | ||||||
| linux*) | linux-gnu*) | ||||||
|   case "$host_cpu" in |   case "$host_cpu" in | ||||||
|   alpha* | i*86 | powerpc* | sparc* | ia64* ) |   alpha* | i*86 | powerpc* | sparc* | ia64* ) | ||||||
|     lt_cv_deplibs_check_method=pass_all ;; |     lt_cv_deplibs_check_method=pass_all ;; | ||||||
| @@ -655,7 +657,8 @@ else | |||||||
|       # Check to see if the nm accepts a BSD-compat flag. |       # Check to see if the nm accepts a BSD-compat flag. | ||||||
|       # Adding the `sed 1q' prevents false positives on HP-UX, which says: |       # Adding the `sed 1q' prevents false positives on HP-UX, which says: | ||||||
|       #   nm: unknown option "B" ignored |       #   nm: unknown option "B" ignored | ||||||
|       if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then |       # Tru64's nm complains that /dev/null is an invalid object file | ||||||
|  |       if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then | ||||||
| 	ac_cv_path_NM="$tmp_nm -B" | 	ac_cv_path_NM="$tmp_nm -B" | ||||||
| 	break | 	break | ||||||
|       elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then |       elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then | ||||||
| @@ -822,3 +825,9 @@ AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl | |||||||
|  |  | ||||||
| dnl This is just to silence aclocal about the macro not being used | dnl This is just to silence aclocal about the macro not being used | ||||||
| ifelse([AC_DISABLE_FAST_INSTALL])dnl | ifelse([AC_DISABLE_FAST_INSTALL])dnl | ||||||
|  |  | ||||||
|  | AC_DEFUN([LT_AC_PROG_GCJ],[ | ||||||
|  |   AC_CHECK_TOOL(GCJ, gcj, no) | ||||||
|  |   test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" | ||||||
|  |   AC_SUBST(GCJFLAGS) | ||||||
|  | ]) | ||||||
|   | |||||||
							
								
								
									
										14
									
								
								ltcf-c.sh
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								ltcf-c.sh
									
									
									
									
									
								
							| @@ -1,7 +1,5 @@ | |||||||
| #### This script is meant to be sourced by ltconfig. | #### This script is meant to be sourced by ltconfig. | ||||||
|  |  | ||||||
| # $Id$ |  | ||||||
|  |  | ||||||
| # ltcf-c.sh - Create a C compiler specific configuration | # ltcf-c.sh - Create a C compiler specific configuration | ||||||
| # | # | ||||||
| # Copyright (C) 1996-2000 Free Software Foundation, Inc. | # Copyright (C) 1996-2000 Free Software Foundation, Inc. | ||||||
| @@ -92,7 +90,7 @@ EOF | |||||||
|       allow_undefined_flag=unsupported |       allow_undefined_flag=unsupported | ||||||
|       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc |       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc | ||||||
|       # support --undefined.  This deserves some investigation.  FIXME |       # support --undefined.  This deserves some investigation.  FIXME | ||||||
|       archive_cmds='$CC -nostart $libobjs $deplibs $linker_flags ${wl}-soname $wl$soname -o $lib' |       archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||||||
|     else |     else | ||||||
|       ld_shlibs=no |       ld_shlibs=no | ||||||
|     fi |     fi | ||||||
| @@ -193,8 +191,8 @@ EOF | |||||||
|  |  | ||||||
| EOF | EOF | ||||||
|     elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then |     elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then | ||||||
|       archive_cmds='$CC -shared $libobjs $deplibs $linker_flags ${wl}-soname $wl$soname -o $lib' |       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||||||
|       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linker_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |       archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | ||||||
|     else |     else | ||||||
|       ld_shlibs=no |       ld_shlibs=no | ||||||
|     fi |     fi | ||||||
| @@ -219,8 +217,8 @@ EOF | |||||||
|  |  | ||||||
|   if test "$ld_shlibs" = yes; then |   if test "$ld_shlibs" = yes; then | ||||||
|     runpath_var=LD_RUN_PATH |     runpath_var=LD_RUN_PATH | ||||||
|     hardcode_libdir_flag_spec="$wlarc"'--rpath '"$wlarc"'$libdir' |     hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' | ||||||
|     export_dynamic_flag_spec="$wlarc"'--export-dynamic' |     export_dynamic_flag_spec='${wl}--export-dynamic' | ||||||
|     case $host_os in |     case $host_os in | ||||||
|     cygwin* | mingw*) |     cygwin* | mingw*) | ||||||
|       # dlltool doesn't understand --whole-archive et. al. |       # dlltool doesn't understand --whole-archive et. al. | ||||||
| @@ -673,10 +671,12 @@ if test "$enable_shared" = yes && test "$with_gcc" = yes; then | |||||||
| 	verstring= | 	verstring= | ||||||
| 	output_objdir=. | 	output_objdir=. | ||||||
| 	libname=conftest | 	libname=conftest | ||||||
|  | 	save_allow_undefined_flag=$allow_undefined_flag | ||||||
| 	allow_undefined_flag= | 	allow_undefined_flag= | ||||||
| 	if { (eval echo ltcf-c.sh:need_lc: \"$archive_cmds\") 1>&5; (eval $archive_cmds) 2>&1 | grep " -lc " 1>&5 ; }; then | 	if { (eval echo ltcf-c.sh:need_lc: \"$archive_cmds\") 1>&5; (eval $archive_cmds) 2>&1 | grep " -lc " 1>&5 ; }; then | ||||||
| 	  need_lc=no | 	  need_lc=no | ||||||
| 	fi | 	fi | ||||||
|  | 	allow_undefined_flag=$save_allow_undefined_flag | ||||||
|       else |       else | ||||||
| 	cat conftest.err 1>&5 | 	cat conftest.err 1>&5 | ||||||
|       fi |       fi | ||||||
|   | |||||||
							
								
								
									
										137
									
								
								ltconfig
									
									
									
									
									
								
							
							
						
						
									
										137
									
								
								ltconfig
									
									
									
									
									
								
							| @@ -181,7 +181,7 @@ progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'` | |||||||
| PROGRAM=ltconfig | PROGRAM=ltconfig | ||||||
| PACKAGE=libtool | PACKAGE=libtool | ||||||
| VERSION=1.4a | VERSION=1.4a | ||||||
| TIMESTAMP=" (1.641.2.77 2000/08/01 04:25:15)" | TIMESTAMP=" (1.641.2.111 2000/09/05 10:29:18)" | ||||||
| ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' | ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' | ||||||
| ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' | ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' | ||||||
| rm="rm -f" | rm="rm -f" | ||||||
| @@ -483,7 +483,7 @@ exec 5>>./config.log | |||||||
| if test "X${LC_ALL+set}" = Xset; then LC_ALL=C; export LC_ALL; fi | if test "X${LC_ALL+set}" = Xset; then LC_ALL=C; export LC_ALL; fi | ||||||
| if test "X${LANG+set}"   = Xset; then LANG=C;   export LANG;   fi | if test "X${LANG+set}"   = Xset; then LANG=C;   export LANG;   fi | ||||||
|  |  | ||||||
| if test -n "$cache_file" && test -r "$cache_file"; then | if test -n "$cache_file" && test -r "$cache_file" && test -f "$cache_file"; then | ||||||
|   echo "loading cache $cache_file within ltconfig" |   echo "loading cache $cache_file within ltconfig" | ||||||
|   . $cache_file |   . $cache_file | ||||||
| fi | fi | ||||||
| @@ -620,6 +620,11 @@ old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' | |||||||
| old_postinstall_cmds='chmod 644 $oldlib' | old_postinstall_cmds='chmod 644 $oldlib' | ||||||
| old_postuninstall_cmds= | old_postuninstall_cmds= | ||||||
|  |  | ||||||
|  | if test -n "$RANLIB"; then | ||||||
|  |   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" | ||||||
|  |   old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" | ||||||
|  | fi | ||||||
|  |  | ||||||
| # Source the script associated with the $tagname tag configuration. | # Source the script associated with the $tagname tag configuration. | ||||||
| if test -n "$tagname"; then | if test -n "$tagname"; then | ||||||
|   . $ltmain |   . $ltmain | ||||||
| @@ -667,7 +672,7 @@ compiler="$2" | |||||||
| # in isolation, and that seeing it set (from the cache) indicates that | # in isolation, and that seeing it set (from the cache) indicates that | ||||||
| # the associated values are set (in the cache) correctly too. | # the associated values are set (in the cache) correctly too. | ||||||
| echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6 | echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6 | ||||||
| echo "$progname:670:checking for $compiler option to produce PIC" 1>&5 | echo "$progname:675:checking for $compiler option to produce PIC" 1>&5 | ||||||
|  |  | ||||||
| if test -z "$ac_cv_prog_cc_pic"; then | if test -z "$ac_cv_prog_cc_pic"; then | ||||||
|   echo "$ac_t"none 1>&6 |   echo "$ac_t"none 1>&6 | ||||||
| @@ -676,7 +681,7 @@ else | |||||||
|  |  | ||||||
|   # Check to make sure the pic_flag actually works. |   # Check to make sure the pic_flag actually works. | ||||||
|   echo $ac_n "checking if $compiler PIC flag $ac_cv_prog_cc_pic works... $ac_c" 1>&6 |   echo $ac_n "checking if $compiler PIC flag $ac_cv_prog_cc_pic works... $ac_c" 1>&6 | ||||||
|   echo "$progname:679:checking that $compiler PIC flag $ac_cv_prog_cc_pic works." 1>&5 |   echo "$progname:684:checking that $compiler PIC flag $ac_cv_prog_cc_pic works." 1>&5 | ||||||
|   if test "X${ac_cv_prog_cc_pic_works+set}" = Xset && \ |   if test "X${ac_cv_prog_cc_pic_works+set}" = Xset && \ | ||||||
|      test "X${ac_cv_prog_cc_pic_works}" != X; then |      test "X${ac_cv_prog_cc_pic_works}" != X; then | ||||||
|     echo $ac_n "(cached) $ac_c" 1>&6 |     echo $ac_n "(cached) $ac_c" 1>&6 | ||||||
| @@ -686,7 +691,7 @@ else | |||||||
|     echo $lt_simple_compile_test_code > conftest.$ac_ext |     echo $lt_simple_compile_test_code > conftest.$ac_ext | ||||||
|     save_CFLAGS="$CFLAGS" |     save_CFLAGS="$CFLAGS" | ||||||
|     CFLAGS="$CFLAGS $ac_cv_prog_cc_pic -DPIC" |     CFLAGS="$CFLAGS $ac_cv_prog_cc_pic -DPIC" | ||||||
|     if { (eval echo $progname:689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then |     if { (eval echo $progname:694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then | ||||||
|       # Append any warnings to the config.log. |       # Append any warnings to the config.log. | ||||||
|       cat conftest.err 1>&5 |       cat conftest.err 1>&5 | ||||||
|  |  | ||||||
| @@ -738,7 +743,7 @@ if test -n "$ac_cv_prog_cc_shlib"; then | |||||||
| fi | fi | ||||||
|  |  | ||||||
| echo $ac_n "checking if $compiler static flag $ac_cv_prog_cc_static works... $ac_c" 1>&6 | echo $ac_n "checking if $compiler static flag $ac_cv_prog_cc_static works... $ac_c" 1>&6 | ||||||
| echo "$progname:741: checking if $compiler static flag $ac_cv_prog_cc_static works" >&5 | echo "$progname:746: checking if $compiler static flag $ac_cv_prog_cc_static works" >&5 | ||||||
| if test "X${ac_cv_prog_cc_static_works+set}" = Xset && \ | if test "X${ac_cv_prog_cc_static_works+set}" = Xset && \ | ||||||
|    test "X${ac_cv_prog_cc_static_works}" != X; then |    test "X${ac_cv_prog_cc_static_works}" != X; then | ||||||
|   echo $ac_n "(cached) $ac_c" 1>&6 |   echo $ac_n "(cached) $ac_c" 1>&6 | ||||||
| @@ -747,7 +752,7 @@ else | |||||||
|   echo $lt_simple_link_test_code > conftest.$ac_ext |   echo $lt_simple_link_test_code > conftest.$ac_ext | ||||||
|   save_LDFLAGS="$LDFLAGS" |   save_LDFLAGS="$LDFLAGS" | ||||||
|   LDFLAGS="$LDFLAGS $ac_cv_prog_cc_static" |   LDFLAGS="$LDFLAGS $ac_cv_prog_cc_static" | ||||||
|   if { (eval echo $progname:750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then |   if { (eval echo $progname:755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then | ||||||
|     ac_cv_prog_cc_static_works=yes |     ac_cv_prog_cc_static_works=yes | ||||||
|   else |   else | ||||||
|     ac_cv_prog_cc_static_works=no |     ac_cv_prog_cc_static_works=no | ||||||
| @@ -784,8 +789,8 @@ mkdir out | |||||||
| chmod -w . | chmod -w . | ||||||
| save_CFLAGS="$CFLAGS" | save_CFLAGS="$CFLAGS" | ||||||
| CFLAGS="$CFLAGS -o out/conftest2.$objext" | CFLAGS="$CFLAGS -o out/conftest2.$objext" | ||||||
| echo "$progname:787: checking if $compiler supports -c -o file.$objext" >&5 | echo "$progname:792: checking if $compiler supports -c -o file.$objext" >&5 | ||||||
| if { (eval echo $progname:788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$objext; then | if { (eval echo $progname:793: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$objext; then | ||||||
|  |  | ||||||
|   # The compiler can only warn and ignore the option if not recognized |   # The compiler can only warn and ignore the option if not recognized | ||||||
|   # So say no if there are warnings |   # So say no if there are warnings | ||||||
| @@ -838,8 +843,8 @@ if test "$with_gcc" = yes; then | |||||||
|   echo $lt_simple_compile_test_code > conftest.$ac_ext |   echo $lt_simple_compile_test_code > conftest.$ac_ext | ||||||
|   save_CFLAGS="$CFLAGS" |   save_CFLAGS="$CFLAGS" | ||||||
|   CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" |   CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" | ||||||
|   echo "$progname:841: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 |   echo "$progname:846: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 | ||||||
|   if { (eval echo $progname:842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then |   if { (eval echo $progname:847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then | ||||||
|  |  | ||||||
|     # The compiler can only warn and ignore the option if not recognized |     # The compiler can only warn and ignore the option if not recognized | ||||||
|     # So say no if there are warnings |     # So say no if there are warnings | ||||||
| @@ -1017,11 +1022,7 @@ freebsd*) | |||||||
|   freebsd2*) |   freebsd2*) | ||||||
|     shlibpath_overrides_runpath=yes |     shlibpath_overrides_runpath=yes | ||||||
|     ;; |     ;; | ||||||
|   freebsd3.[01]* | freebsdelf3.[01]*) |   *) | ||||||
|     shlibpath_overrides_runpath=yes |  | ||||||
|     hardcode_into_libs=yes |  | ||||||
|     ;; |  | ||||||
|   *) # from 3.2 on |  | ||||||
|     shlibpath_overrides_runpath=no |     shlibpath_overrides_runpath=no | ||||||
|     hardcode_into_libs=yes |     hardcode_into_libs=yes | ||||||
|     ;; |     ;; | ||||||
| @@ -1306,11 +1307,11 @@ void nm_test_func(){} | |||||||
| main(){nm_test_var='a';nm_test_func();return(0);} | main(){nm_test_var='a';nm_test_func();return(0);} | ||||||
| EOF | EOF | ||||||
|  |  | ||||||
|   echo "$progname:1309: checking if global_symbol_pipe works" >&5 |   echo "$progname:1310: checking if global_symbol_pipe works" >&5 | ||||||
|   if { (eval echo $progname:1310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then |   if { (eval echo $progname:1311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then | ||||||
|     # Now try to grab the symbols. |     # Now try to grab the symbols. | ||||||
|     nlist=conftest.nm |     nlist=conftest.nm | ||||||
|     if { echo "$progname:1313: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then |     if { echo "$progname:1314: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then | ||||||
|  |  | ||||||
|       # Try sorting and uniquifying the output. |       # Try sorting and uniquifying the output. | ||||||
|       if sort "$nlist" | uniq > "$nlist"T; then |       if sort "$nlist" | uniq > "$nlist"T; then | ||||||
| @@ -1362,7 +1363,7 @@ EOF | |||||||
| 	  save_CFLAGS="$CFLAGS" | 	  save_CFLAGS="$CFLAGS" | ||||||
| 	  LIBS="conftstm.$objext" | 	  LIBS="conftstm.$objext" | ||||||
| 	  CFLAGS="$CFLAGS$no_builtin_flag" | 	  CFLAGS="$CFLAGS$no_builtin_flag" | ||||||
| 	  if { (eval echo $progname:1365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then | 	  if { (eval echo $progname:1366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then | ||||||
| 	    pipe_works=yes | 	    pipe_works=yes | ||||||
| 	  else | 	  else | ||||||
| 	    echo "$progname: failed program was:" >&5 | 	    echo "$progname: failed program was:" >&5 | ||||||
| @@ -1441,7 +1442,7 @@ test "$enable_shared" = yes || enable_static=yes | |||||||
|  |  | ||||||
| echo "checking whether to build static libraries... $enable_static" 1>&6 | echo "checking whether to build static libraries... $enable_static" 1>&6 | ||||||
|  |  | ||||||
| if test "$hardcode_action" = relink || test "$hardcode_into_libs" = all; then | if test "$hardcode_action" = relink; then | ||||||
|   # Fast installation is not supported |   # Fast installation is not supported | ||||||
|   enable_fast_install=no |   enable_fast_install=no | ||||||
| elif test "$shlibpath_overrides_runpath" = yes || | elif test "$shlibpath_overrides_runpath" = yes || | ||||||
| @@ -1466,14 +1467,14 @@ else | |||||||
| if test "X${lt_cv_dlopen+set}" != Xset; then | if test "X${lt_cv_dlopen+set}" != Xset; then | ||||||
|   lt_cv_dlopen=no lt_cv_dlopen_libs= |   lt_cv_dlopen=no lt_cv_dlopen_libs= | ||||||
| echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 | echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 | ||||||
| echo "$progname:1469: checking for dlopen in -ldl" >&5 | echo "$progname:1470: checking for dlopen in -ldl" >&5 | ||||||
| if test "X${ac_cv_lib_dl_dlopen+set}" = Xset; then | if test "X${ac_cv_lib_dl_dlopen+set}" = Xset; then | ||||||
|   echo $ac_n "(cached) $ac_c" 1>&6 |   echo $ac_n "(cached) $ac_c" 1>&6 | ||||||
| else | else | ||||||
|   ac_save_LIBS="$LIBS" |   ac_save_LIBS="$LIBS" | ||||||
| LIBS="-ldl  $LIBS" | LIBS="-ldl  $LIBS" | ||||||
| cat > conftest.$ac_ext <<EOF | cat > conftest.$ac_ext <<EOF | ||||||
| #line 1476 "ltconfig" | #line 1477 "ltconfig" | ||||||
| /* Override any gcc2 internal prototype to avoid an error.  */ | /* Override any gcc2 internal prototype to avoid an error.  */ | ||||||
| /* We use char because int might match the return type of a gcc2 | /* We use char because int might match the return type of a gcc2 | ||||||
|     builtin and then its argument prototype would still apply.  */ |     builtin and then its argument prototype would still apply.  */ | ||||||
| @@ -1486,7 +1487,7 @@ int main() { | |||||||
| dlopen() | dlopen() | ||||||
| ; return 0; } | ; return 0; } | ||||||
| EOF | EOF | ||||||
| if { (eval echo $progname:1489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | if { (eval echo $progname:1490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||||||
|   rm -rf conftest* |   rm -rf conftest* | ||||||
|   ac_cv_lib_dl_dlopen=yes |   ac_cv_lib_dl_dlopen=yes | ||||||
| else | else | ||||||
| @@ -1505,12 +1506,12 @@ if test "X$ac_cv_lib_dl_dlopen" = Xyes; then | |||||||
| else | else | ||||||
|   echo "$ac_t""no" 1>&6 |   echo "$ac_t""no" 1>&6 | ||||||
| echo $ac_n "checking for dlopen""... $ac_c" 1>&6 | echo $ac_n "checking for dlopen""... $ac_c" 1>&6 | ||||||
| echo "$progname:1508: checking for dlopen" >&5 | echo "$progname:1509: checking for dlopen" >&5 | ||||||
| if test "X${ac_cv_func_dlopen+set}" = Xset; then | if test "X${ac_cv_func_dlopen+set}" = Xset; then | ||||||
|   echo $ac_n "(cached) $ac_c" 1>&6 |   echo $ac_n "(cached) $ac_c" 1>&6 | ||||||
| else | else | ||||||
|   cat > conftest.$ac_ext <<EOF |   cat > conftest.$ac_ext <<EOF | ||||||
| #line 1513 "ltconfig" | #line 1514 "ltconfig" | ||||||
| /* System header to define __stub macros and hopefully few prototypes, | /* System header to define __stub macros and hopefully few prototypes, | ||||||
|     which can conflict with char dlopen(); below.  */ |     which can conflict with char dlopen(); below.  */ | ||||||
| #include <assert.h> | #include <assert.h> | ||||||
| @@ -1535,7 +1536,7 @@ dlopen(); | |||||||
|  |  | ||||||
| ; return 0; } | ; return 0; } | ||||||
| EOF | EOF | ||||||
| if { (eval echo $progname:1538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | if { (eval echo $progname:1539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||||||
|   rm -rf conftest* |   rm -rf conftest* | ||||||
|   ac_cv_func_dlopen=yes |   ac_cv_func_dlopen=yes | ||||||
| else | else | ||||||
| @@ -1551,15 +1552,54 @@ if test "X$ac_cv_func_dlopen" = Xyes; then | |||||||
|   lt_cv_dlopen="dlopen" |   lt_cv_dlopen="dlopen" | ||||||
| else | else | ||||||
|   echo "$ac_t""no" 1>&6 |   echo "$ac_t""no" 1>&6 | ||||||
|  | echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 | ||||||
|  | echo "$progname:1556: checking for dlopen in -lsvld" >&5 | ||||||
|  | if test "X${ac_cv_lib_svld_dlopen+set}" = Xset; then | ||||||
|  |   echo $ac_n "(cached) $ac_c" 1>&6 | ||||||
|  | else | ||||||
|  |   ac_save_LIBS="$LIBS" | ||||||
|  | LIBS="-lsvld  $LIBS" | ||||||
|  | cat > conftest.$ac_ext <<EOF | ||||||
|  | #line 1563 "ltconfig" | ||||||
|  | /* Override any gcc2 internal prototype to avoid an error.  */ | ||||||
|  | /* We use char because int might match the return type of a gcc2 | ||||||
|  |     builtin and then its argument prototype would still apply.  */ | ||||||
|  | #ifdef __cplusplus | ||||||
|  | extern "C" | ||||||
|  | #endif | ||||||
|  | char dlopen(); | ||||||
|  |  | ||||||
|  | int main() { | ||||||
|  | dlopen() | ||||||
|  | ; return 0; } | ||||||
|  | EOF | ||||||
|  | if { (eval echo $progname:1576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||||||
|  |   rm -rf conftest* | ||||||
|  |   ac_cv_lib_svld_dlopen=yes | ||||||
|  | else | ||||||
|  |   echo "$progname: failed program was:" >&5 | ||||||
|  |   cat conftest.$ac_ext >&5 | ||||||
|  |   rm -rf conftest* | ||||||
|  |   ac_cv_lib_svld_dlopen=no | ||||||
|  | fi | ||||||
|  | rm -f conftest* | ||||||
|  | LIBS="$ac_save_LIBS" | ||||||
|  |  | ||||||
|  | fi | ||||||
|  | if test "X$ac_cv_lib_svld_dlopen" = Xyes; then | ||||||
|  |   echo "$ac_t""yes" 1>&6 | ||||||
|  |   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" | ||||||
|  | else | ||||||
|  |   echo "$ac_t""no" 1>&6 | ||||||
| echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 | echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 | ||||||
| echo "$progname:1555: checking for dld_link in -ldld" >&5 | echo "$progname:1595: checking for dld_link in -ldld" >&5 | ||||||
| if test "X${ac_cv_lib_dld_dld_link+set}" = Xset; then | if test "X${ac_cv_lib_dld_dld_link+set}" = Xset; then | ||||||
|   echo $ac_n "(cached) $ac_c" 1>&6 |   echo $ac_n "(cached) $ac_c" 1>&6 | ||||||
| else | else | ||||||
|   ac_save_LIBS="$LIBS" |   ac_save_LIBS="$LIBS" | ||||||
| LIBS="-ldld  $LIBS" | LIBS="-ldld  $LIBS" | ||||||
| cat > conftest.$ac_ext <<EOF | cat > conftest.$ac_ext <<EOF | ||||||
| #line 1562 "ltconfig" | #line 1602 "ltconfig" | ||||||
| /* Override any gcc2 internal prototype to avoid an error.  */ | /* Override any gcc2 internal prototype to avoid an error.  */ | ||||||
| /* We use char because int might match the return type of a gcc2 | /* We use char because int might match the return type of a gcc2 | ||||||
|     builtin and then its argument prototype would still apply.  */ |     builtin and then its argument prototype would still apply.  */ | ||||||
| @@ -1572,7 +1612,7 @@ int main() { | |||||||
| dld_link() | dld_link() | ||||||
| ; return 0; } | ; return 0; } | ||||||
| EOF | EOF | ||||||
| if { (eval echo $progname:1575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | if { (eval echo $progname:1615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||||||
|   rm -rf conftest* |   rm -rf conftest* | ||||||
|   ac_cv_lib_dld_dld_link=yes |   ac_cv_lib_dld_dld_link=yes | ||||||
| else | else | ||||||
| @@ -1591,12 +1631,12 @@ if test "X$ac_cv_lib_dld_dld_link" = Xyes; then | |||||||
| else | else | ||||||
|   echo "$ac_t""no" 1>&6 |   echo "$ac_t""no" 1>&6 | ||||||
| echo $ac_n "checking for shl_load""... $ac_c" 1>&6 | echo $ac_n "checking for shl_load""... $ac_c" 1>&6 | ||||||
| echo "$progname:1594: checking for shl_load" >&5 | echo "$progname:1634: checking for shl_load" >&5 | ||||||
| if test "X${ac_cv_func_shl_load+set}" = Xset; then | if test "X${ac_cv_func_shl_load+set}" = Xset; then | ||||||
|   echo $ac_n "(cached) $ac_c" 1>&6 |   echo $ac_n "(cached) $ac_c" 1>&6 | ||||||
| else | else | ||||||
|   cat > conftest.$ac_ext <<EOF |   cat > conftest.$ac_ext <<EOF | ||||||
| #line 1599 "ltconfig" | #line 1639 "ltconfig" | ||||||
| /* System header to define __stub macros and hopefully few prototypes, | /* System header to define __stub macros and hopefully few prototypes, | ||||||
|     which can conflict with char shl_load(); below.  */ |     which can conflict with char shl_load(); below.  */ | ||||||
| #include <assert.h> | #include <assert.h> | ||||||
| @@ -1621,7 +1661,7 @@ shl_load(); | |||||||
|  |  | ||||||
| ; return 0; } | ; return 0; } | ||||||
| EOF | EOF | ||||||
| if { (eval echo $progname:1624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | if { (eval echo $progname:1664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||||||
|   rm -rf conftest* |   rm -rf conftest* | ||||||
|   ac_cv_func_shl_load=yes |   ac_cv_func_shl_load=yes | ||||||
| else | else | ||||||
| @@ -1639,14 +1679,14 @@ if test "X$ac_cv_func_shl_load" = Xyes; then | |||||||
| else | else | ||||||
|   echo "$ac_t""no" 1>&6 |   echo "$ac_t""no" 1>&6 | ||||||
| echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 | echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 | ||||||
| echo "$progname:1642: checking for shl_load in -ldld" >&5 | echo "$progname:1682: checking for shl_load in -ldld" >&5 | ||||||
| if test "X${ac_cv_lib_dld_shl_load+set}" = Xset; then | if test "X${ac_cv_lib_dld_shl_load+set}" = Xset; then | ||||||
|   echo $ac_n "(cached) $ac_c" 1>&6 |   echo $ac_n "(cached) $ac_c" 1>&6 | ||||||
| else | else | ||||||
|   ac_save_LIBS="$LIBS" |   ac_save_LIBS="$LIBS" | ||||||
| LIBS="-ldld  $LIBS" | LIBS="-ldld  $LIBS" | ||||||
| cat > conftest.$ac_ext <<EOF | cat > conftest.$ac_ext <<EOF | ||||||
| #line 1649 "ltconfig" | #line 1689 "ltconfig" | ||||||
| #include "confdefs.h" | #include "confdefs.h" | ||||||
| /* Override any gcc2 internal prototype to avoid an error.  */ | /* Override any gcc2 internal prototype to avoid an error.  */ | ||||||
| /* We use char because int might match the return type of a gcc2 | /* We use char because int might match the return type of a gcc2 | ||||||
| @@ -1660,7 +1700,7 @@ int main() { | |||||||
| shl_load() | shl_load() | ||||||
| ; return 0; } | ; return 0; } | ||||||
| EOF | EOF | ||||||
| if { (eval echo $progname:1663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | if { (eval echo $progname:1703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||||||
|   rm -rf conftest* |   rm -rf conftest* | ||||||
|   ac_cv_lib_dld_shl_load=yes |   ac_cv_lib_dld_shl_load=yes | ||||||
| else | else | ||||||
| @@ -1692,10 +1732,14 @@ fi | |||||||
|  |  | ||||||
| fi | fi | ||||||
|  |  | ||||||
|  | fi | ||||||
|  |  | ||||||
| fi | fi | ||||||
|  |  | ||||||
|   if test "x$lt_cv_dlopen" != xno; then |   if test "x$lt_cv_dlopen" != xno; then | ||||||
|     enable_dlopen=yes |     enable_dlopen=yes | ||||||
|  |   else | ||||||
|  |     enable_dlopen=no | ||||||
|   fi |   fi | ||||||
|  |  | ||||||
|   case "$lt_cv_dlopen" in |   case "$lt_cv_dlopen" in | ||||||
| @@ -1703,18 +1747,18 @@ fi | |||||||
| for ac_hdr in dlfcn.h; do | for ac_hdr in dlfcn.h; do | ||||||
| ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||||||
| echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||||||
| echo "$progname:1706: checking for $ac_hdr" >&5 | echo "$progname:1750: checking for $ac_hdr" >&5 | ||||||
| if eval "test \"`echo 'X$''{'ac_cv_header_$ac_safe'+set}'`\" = Xset"; then | if eval "test \"`echo 'X$''{'ac_cv_header_$ac_safe'+set}'`\" = Xset"; then | ||||||
|   echo $ac_n "(cached) $ac_c" 1>&6 |   echo $ac_n "(cached) $ac_c" 1>&6 | ||||||
| else | else | ||||||
|   cat > conftest.$ac_ext <<EOF |   cat > conftest.$ac_ext <<EOF | ||||||
| #line 1711 "ltconfig" | #line 1755 "ltconfig" | ||||||
| #include <$ac_hdr> | #include <$ac_hdr> | ||||||
| int fnord = 0; | int fnord = 0; | ||||||
| int main () { return(0); } | int main () { return(0); } | ||||||
| EOF | EOF | ||||||
| ac_try="$ac_compile >/dev/null 2>conftest.out" | ac_try="$ac_compile >/dev/null 2>conftest.out" | ||||||
| { (eval echo $progname:1717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | { (eval echo $progname:1761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||||||
| ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||||||
| if test -z "$ac_err"; then | if test -z "$ac_err"; then | ||||||
|   rm -rf conftest* |   rm -rf conftest* | ||||||
| @@ -1742,7 +1786,7 @@ done | |||||||
|     LIBS="$lt_cv_dlopen_libs $LIBS" |     LIBS="$lt_cv_dlopen_libs $LIBS" | ||||||
|  |  | ||||||
|   echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 |   echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 | ||||||
| echo "$progname:1745: checking whether a program can dlopen itself" >&5 | echo "$progname:1789: checking whether a program can dlopen itself" >&5 | ||||||
| if test "X${lt_cv_dlopen_self+set}" = Xset; then | if test "X${lt_cv_dlopen_self+set}" = Xset; then | ||||||
|   echo $ac_n "(cached) $ac_c" 1>&6 |   echo $ac_n "(cached) $ac_c" 1>&6 | ||||||
| else | else | ||||||
| @@ -1750,7 +1794,7 @@ else | |||||||
|     lt_cv_dlopen_self=cross |     lt_cv_dlopen_self=cross | ||||||
|   else |   else | ||||||
|     cat > conftest.c <<EOF |     cat > conftest.c <<EOF | ||||||
| #line 1753 "ltconfig" | #line 1797 "ltconfig" | ||||||
|  |  | ||||||
| #if HAVE_DLFCN_H | #if HAVE_DLFCN_H | ||||||
| #include <dlfcn.h> | #include <dlfcn.h> | ||||||
| @@ -1796,7 +1840,7 @@ main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW); | |||||||
|                if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } |                if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } | ||||||
|  |  | ||||||
| EOF | EOF | ||||||
| if { (eval echo $progname:1799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null | if { (eval echo $progname:1843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null | ||||||
| then | then | ||||||
|   lt_cv_dlopen_self=yes |   lt_cv_dlopen_self=yes | ||||||
| else | else | ||||||
| @@ -1815,7 +1859,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6 | |||||||
|   if test "$lt_cv_dlopen_self" = yes; then |   if test "$lt_cv_dlopen_self" = yes; then | ||||||
|     LDFLAGS="$LDFLAGS $link_static_flag" |     LDFLAGS="$LDFLAGS $link_static_flag" | ||||||
|   echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 |   echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 | ||||||
| echo "$progname:1818: checking whether a statically linked program can dlopen itself" >&5 | echo "$progname:1862: checking whether a statically linked program can dlopen itself" >&5 | ||||||
| if test "X${lt_cv_dlopen_self_static+set}" = Xset; then | if test "X${lt_cv_dlopen_self_static+set}" = Xset; then | ||||||
|   echo $ac_n "(cached) $ac_c" 1>&6 |   echo $ac_n "(cached) $ac_c" 1>&6 | ||||||
| else | else | ||||||
| @@ -1823,7 +1867,7 @@ else | |||||||
|     lt_cv_dlopen_self_static=cross |     lt_cv_dlopen_self_static=cross | ||||||
|   else |   else | ||||||
|     cat > conftest.c <<EOF |     cat > conftest.c <<EOF | ||||||
| #line 1826 "ltconfig" | #line 1870 "ltconfig" | ||||||
|  |  | ||||||
| #if HAVE_DLFCN_H | #if HAVE_DLFCN_H | ||||||
| #include <dlfcn.h> | #include <dlfcn.h> | ||||||
| @@ -1869,7 +1913,7 @@ main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW); | |||||||
|     if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } |     if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } | ||||||
|  |  | ||||||
| EOF | EOF | ||||||
| if { (eval echo $progname:1872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null | if { (eval echo $progname:1916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null | ||||||
| then | then | ||||||
|   lt_cv_dlopen_self_static=yes |   lt_cv_dlopen_self_static=yes | ||||||
| else | else | ||||||
| @@ -2090,6 +2134,9 @@ LTCC=$LTCC | |||||||
| # A language-specific compiler. | # A language-specific compiler. | ||||||
| CC=$CC | CC=$CC | ||||||
|  |  | ||||||
|  | # Is the compiler the GNU C compiler? | ||||||
|  | with_gcc=$with_gcc | ||||||
|  |  | ||||||
| # The linker used to build libraries. | # The linker used to build libraries. | ||||||
| LD=$LD | LD=$LD | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										76
									
								
								ltmain.sh
									
									
									
									
									
								
							
							
						
						
									
										76
									
								
								ltmain.sh
									
									
									
									
									
								
							| @@ -55,7 +55,7 @@ modename="$progname" | |||||||
| PROGRAM=ltmain.sh | PROGRAM=ltmain.sh | ||||||
| PACKAGE=libtool | PACKAGE=libtool | ||||||
| VERSION=1.4a | VERSION=1.4a | ||||||
| TIMESTAMP=" (1.641.2.77 2000/08/01 04:25:15)" | TIMESTAMP=" (1.641.2.111 2000/09/05 10:29:18)" | ||||||
|  |  | ||||||
| default_mode= | default_mode= | ||||||
| help="Try \`$progname --help' for more information." | help="Try \`$progname --help' for more information." | ||||||
| @@ -483,7 +483,7 @@ if test -z "$show_help"; then | |||||||
|       "$CC "*) ;; |       "$CC "*) ;; | ||||||
|       # Blanks in the command may have been stripped by the calling shell, |       # Blanks in the command may have been stripped by the calling shell, | ||||||
|       # but not from the CC environment variable when ltconfig was run. |       # but not from the CC environment variable when ltconfig was run. | ||||||
|       "`$echo X$CC | $Xsed` "*) ;; |       "`$echo $CC` "*) ;; | ||||||
|       *) |       *) | ||||||
|         for z in $available_tags; do |         for z in $available_tags; do | ||||||
|           if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then |           if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then | ||||||
| @@ -497,7 +497,7 @@ if test -z "$show_help"; then | |||||||
|               tagname=$z |               tagname=$z | ||||||
|               break |               break | ||||||
|               ;; |               ;; | ||||||
| 	    "`$echo X$CC | $Xsed` "*) | 	    "`$echo $CC` "*) | ||||||
| 	      tagname=$z | 	      tagname=$z | ||||||
| 	      break | 	      break | ||||||
| 	      ;; | 	      ;; | ||||||
| @@ -570,7 +570,7 @@ if test -z "$show_help"; then | |||||||
|     # Lock this critical section if it is needed |     # Lock this critical section if it is needed | ||||||
|     # We use this script file to make the link, it avoids creating a new file |     # We use this script file to make the link, it avoids creating a new file | ||||||
|     if test "$need_locks" = yes; then |     if test "$need_locks" = yes; then | ||||||
|       until ln "$0" "$lockfile" 2>/dev/null; do |       until $run ln "$0" "$lockfile" 2>/dev/null; do | ||||||
| 	$show "Waiting for $lockfile to be removed" | 	$show "Waiting for $lockfile to be removed" | ||||||
| 	sleep 2 | 	sleep 2 | ||||||
|       done |       done | ||||||
| @@ -768,7 +768,7 @@ EOF | |||||||
|  |  | ||||||
|     # Unlock the critical section if it was locked |     # Unlock the critical section if it was locked | ||||||
|     if test "$need_locks" != no; then |     if test "$need_locks" != no; then | ||||||
|       $rm "$lockfile" |       $run $rm "$lockfile" | ||||||
|     fi |     fi | ||||||
|  |  | ||||||
|     exit 0 |     exit 0 | ||||||
| @@ -1046,6 +1046,18 @@ EOF | |||||||
| 	continue | 	continue | ||||||
| 	;; | 	;; | ||||||
|  |  | ||||||
|  |       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* | ||||||
|  |       # so, if we see these flags be careful not to treat them like -L | ||||||
|  |       -L[A-Z][A-Z]*:*) | ||||||
|  | 	case $with_gcc/$host in | ||||||
|  | 	no/*-*-irix*) | ||||||
|  | 	  compile_command="$compile_command $arg" | ||||||
|  | 	  finalize_command="$finalize_command $arg" | ||||||
|  | 	  ;; | ||||||
|  | 	esac | ||||||
|  | 	continue | ||||||
|  | 	;; | ||||||
|  |         | ||||||
|       -L*) |       -L*) | ||||||
| 	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` | 	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` | ||||||
| 	# We need an absolute path. | 	# We need an absolute path. | ||||||
| @@ -1168,11 +1180,11 @@ EOF | |||||||
| 	;; | 	;; | ||||||
|  |  | ||||||
|       -static) |       -static) | ||||||
| 	# If we have no pic_flag, then this is the same as -all-static. |         # The effects of -static are defined in a previous loop. | ||||||
| 	if test -z "$pic_flag" && test -n "$link_static_flag"; then | 	# We used to do the same as -all-static on platforms that | ||||||
| 	  compile_command="$compile_command $link_static_flag" | 	# didn't have a PIC flag, but the assumption that the effects | ||||||
| 	  finalize_command="$finalize_command $link_static_flag" | 	# would be equivalent was wrong.  It would break on at least | ||||||
| 	fi | 	# Digital Unix and AIX. | ||||||
| 	continue | 	continue | ||||||
| 	;; | 	;; | ||||||
|  |  | ||||||
| @@ -1402,7 +1414,7 @@ EOF | |||||||
|       "$CC "*) ;; |       "$CC "*) ;; | ||||||
|       # Blanks in the command may have been stripped by the calling shell, |       # Blanks in the command may have been stripped by the calling shell, | ||||||
|       # but not from the CC environment variable when ltconfig was run. |       # but not from the CC environment variable when ltconfig was run. | ||||||
|       "`$echo X$CC | $Xsed` "*) ;; |       "`$echo $CC` "*) ;; | ||||||
|       *) |       *) | ||||||
|         for z in $available_tags; do |         for z in $available_tags; do | ||||||
|           if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then |           if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then | ||||||
| @@ -1416,7 +1428,7 @@ EOF | |||||||
|               tagname=$z |               tagname=$z | ||||||
|               break |               break | ||||||
| 	      ;; | 	      ;; | ||||||
| 	    "`$echo X$CC | $Xsed` "*) | 	    "`$echo $CC` "*) | ||||||
| 	      tagname=$z | 	      tagname=$z | ||||||
| 	      break | 	      break | ||||||
| 	      ;; | 	      ;; | ||||||
| @@ -1809,6 +1821,9 @@ EOF | |||||||
| 	  # are required to link). | 	  # are required to link). | ||||||
| 	  if test -n "$old_library"; then | 	  if test -n "$old_library"; then | ||||||
| 	    newdlprefiles="$newdlprefiles $dir/$old_library" | 	    newdlprefiles="$newdlprefiles $dir/$old_library" | ||||||
|  | 	  # Otherwise, use the dlname, so that lt_dlopen finds it. | ||||||
|  | 	  elif test -n "$dlname"; then | ||||||
|  | 	    newdlprefiles="$newdlprefiles $dir/$dlname" | ||||||
| 	  else | 	  else | ||||||
| 	    newdlprefiles="$newdlprefiles $dir/$linklib" | 	    newdlprefiles="$newdlprefiles $dir/$linklib" | ||||||
| 	  fi | 	  fi | ||||||
| @@ -1860,7 +1875,6 @@ EOF | |||||||
|  |  | ||||||
| 	if test "$linkmode,$pass" = "prog,link"; then | 	if test "$linkmode,$pass" = "prog,link"; then | ||||||
| 	  if test -n "$library_names" && | 	  if test -n "$library_names" && | ||||||
| 	     { test "$hardcode_into_libs" != all || test "$alldeplibs" != yes; } && |  | ||||||
| 	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then | 	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then | ||||||
| 	    # We need to hardcode the library path | 	    # We need to hardcode the library path | ||||||
| 	    if test -n "$shlibpath_var"; then | 	    if test -n "$shlibpath_var"; then | ||||||
| @@ -1913,7 +1927,8 @@ EOF | |||||||
| 	    need_relink=yes | 	    need_relink=yes | ||||||
| 	  fi | 	  fi | ||||||
| 	  # This is a shared library | 	  # This is a shared library | ||||||
| 	  if test $linkmode = lib && test "$hardcode_into_libs" = all; then | 	  if test $linkmode = lib && | ||||||
|  | 	     test $hardcode_into_libs = yes; then | ||||||
| 	    # Hardcode the library path. | 	    # Hardcode the library path. | ||||||
| 	    # Skip directories that are in the system default run-time | 	    # Skip directories that are in the system default run-time | ||||||
| 	    # search path. | 	    # search path. | ||||||
| @@ -2113,7 +2128,7 @@ EOF | |||||||
|  |  | ||||||
| 	if test $linkmode = lib; then | 	if test $linkmode = lib; then | ||||||
| 	  if test -n "$dependency_libs" && | 	  if test -n "$dependency_libs" && | ||||||
| 	     { test "$hardcode_into_libs" = no || test $build_old_libs = yes || | 	     { test $hardcode_into_libs != yes || test $build_old_libs = yes || | ||||||
| 	       test $link_static = yes; }; then | 	       test $link_static = yes; }; then | ||||||
| 	    # Extract -R from dependency_libs | 	    # Extract -R from dependency_libs | ||||||
| 	    temp_deplibs= | 	    temp_deplibs= | ||||||
| @@ -2556,7 +2571,7 @@ EOF | |||||||
| 	  *) finalize_rpath="$finalize_rpath $libdir" ;; | 	  *) finalize_rpath="$finalize_rpath $libdir" ;; | ||||||
| 	  esac | 	  esac | ||||||
| 	done | 	done | ||||||
| 	if test "$hardcode_into_libs" = no || test $build_old_libs = yes; then | 	if test $hardcode_into_libs != yes || test $build_old_libs = yes; then | ||||||
| 	  dependency_libs="$temp_xrpath $dependency_libs" | 	  dependency_libs="$temp_xrpath $dependency_libs" | ||||||
| 	fi | 	fi | ||||||
|       fi |       fi | ||||||
| @@ -2806,7 +2821,7 @@ EOF | |||||||
|  |  | ||||||
|       # Test again, we may have decided not to build it any more |       # Test again, we may have decided not to build it any more | ||||||
|       if test "$build_libtool_libs" = yes; then |       if test "$build_libtool_libs" = yes; then | ||||||
| 	if test "$hardcode_into_libs" != no; then | 	if test $hardcode_into_libs = yes; then | ||||||
| 	  # Hardcode the library paths | 	  # Hardcode the library paths | ||||||
| 	  hardcode_libdirs= | 	  hardcode_libdirs= | ||||||
| 	  dep_rpath= | 	  dep_rpath= | ||||||
| @@ -2972,7 +2987,7 @@ EOF | |||||||
| 	fi | 	fi | ||||||
|  |  | ||||||
| 	# Make a backup of the uninstalled library when relinking | 	# Make a backup of the uninstalled library when relinking | ||||||
| 	if test "$mode" = relink && test "$hardcode_into_libs" = all; then | 	if test "$mode" = relink; then | ||||||
| 	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? | 	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? | ||||||
| 	fi | 	fi | ||||||
|  |  | ||||||
| @@ -2991,7 +3006,7 @@ EOF | |||||||
| 	IFS="$save_ifs" | 	IFS="$save_ifs" | ||||||
|  |  | ||||||
| 	# Restore the uninstalled library and exit | 	# Restore the uninstalled library and exit | ||||||
| 	if test "$mode" = relink && test "$hardcode_into_libs" = all; then | 	if test "$mode" = relink; then | ||||||
| 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? | 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? | ||||||
| 	  exit 0 | 	  exit 0 | ||||||
| 	fi | 	fi | ||||||
| @@ -3552,7 +3567,7 @@ static const void *lt_preloaded_setup() { | |||||||
| 	exit 0 | 	exit 0 | ||||||
|       fi |       fi | ||||||
|  |  | ||||||
|       if test "$hardcode_action" = relink || test "$hardcode_into_libs" = all; then |       if test "$hardcode_action" = relink; then | ||||||
| 	# Fast installation is not supported | 	# Fast installation is not supported | ||||||
| 	link_command="$compile_var$compile_command$compile_rpath" | 	link_command="$compile_var$compile_command$compile_rpath" | ||||||
| 	relink_command="$finalize_var$finalize_command$finalize_rpath" | 	relink_command="$finalize_var$finalize_command$finalize_rpath" | ||||||
| @@ -3590,9 +3605,14 @@ static const void *lt_preloaded_setup() { | |||||||
|       if test -n "$relink_command"; then |       if test -n "$relink_command"; then | ||||||
| 	# Preserve any variables that may affect compiler behavior | 	# Preserve any variables that may affect compiler behavior | ||||||
| 	for var in $variables_saved_for_relink; do | 	for var in $variables_saved_for_relink; do | ||||||
| 	  eval var_value=\$$var | 	  if eval test -z \"\${$var+set}\"; then | ||||||
|  | 	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" | ||||||
|  | 	  elif eval var_value=\$$var; test -z "$var_value"; then | ||||||
|  | 	    relink_command="$var=; export $var; $relink_command" | ||||||
|  | 	  else | ||||||
| 	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` | 	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` | ||||||
| 	    relink_command="$var=\"$var_value\"; export $var; $relink_command" | 	    relink_command="$var=\"$var_value\"; export $var; $relink_command" | ||||||
|  | 	  fi | ||||||
| 	done | 	done | ||||||
| 	relink_command="cd `pwd`; $relink_command" | 	relink_command="cd `pwd`; $relink_command" | ||||||
| 	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` | 	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` | ||||||
| @@ -3908,9 +3928,14 @@ fi\ | |||||||
|  |  | ||||||
|       # Preserve any variables that may affect compiler behavior |       # Preserve any variables that may affect compiler behavior | ||||||
|       for var in $variables_saved_for_relink; do |       for var in $variables_saved_for_relink; do | ||||||
| 	eval var_value=\$$var | 	if eval test -z \"\${$var+set}\"; then | ||||||
|  | 	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" | ||||||
|  | 	elif eval var_value=\$$var; test -z "$var_value"; then | ||||||
|  | 	  relink_command="$var=; export $var; $relink_command" | ||||||
|  | 	else | ||||||
| 	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` | 	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` | ||||||
| 	  relink_command="$var=\"$var_value\"; export $var; $relink_command" | 	  relink_command="$var=\"$var_value\"; export $var; $relink_command" | ||||||
|  | 	fi | ||||||
|       done |       done | ||||||
|       # Quote the link command for shipping. |       # Quote the link command for shipping. | ||||||
|       relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args" |       relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args" | ||||||
| @@ -3998,8 +4023,7 @@ dlpreopen='$dlprefiles' | |||||||
|  |  | ||||||
| # Directory that this library needs to be installed in: | # Directory that this library needs to be installed in: | ||||||
| libdir='$install_libdir'" | libdir='$install_libdir'" | ||||||
| 	  if test $hardcode_into_libs = all && | 	  if test "$installed" = no && test $need_relink = yes; then | ||||||
| 	     test "$installed" = no && test $need_relink = yes; then |  | ||||||
| 	    $echo >> $output "\ | 	    $echo >> $output "\ | ||||||
| relink_command=\"$relink_command\"" | relink_command=\"$relink_command\"" | ||||||
| 	  fi | 	  fi | ||||||
| @@ -4209,7 +4233,7 @@ relink_command=\"$relink_command\"" | |||||||
| 	test "X$dir" = "X$file/" && dir= | 	test "X$dir" = "X$file/" && dir= | ||||||
| 	dir="$dir$objdir" | 	dir="$dir$objdir" | ||||||
|  |  | ||||||
| 	if test "$hardcode_into_libs" = all && test -n "$relink_command"; then | 	if test -n "$relink_command"; then | ||||||
| 	  $echo "$modename: warning: relinking \`$file'" 1>&2 | 	  $echo "$modename: warning: relinking \`$file'" 1>&2 | ||||||
| 	  $show "$relink_command" | 	  $show "$relink_command" | ||||||
| 	  if $run eval "$relink_command"; then : | 	  if $run eval "$relink_command"; then : | ||||||
| @@ -4227,7 +4251,7 @@ relink_command=\"$relink_command\"" | |||||||
| 	  shift | 	  shift | ||||||
|  |  | ||||||
| 	  srcname="$realname" | 	  srcname="$realname" | ||||||
| 	  test "$hardcode_into_libs" = all && test -n "$relink_command" && srcname="$realname"T | 	  test -n "$relink_command" && srcname="$realname"T | ||||||
|  |  | ||||||
| 	  # Install the shared library and build the symlinks. | 	  # Install the shared library and build the symlinks. | ||||||
| 	  $show "$install_prog $dir/$srcname $destdir/$realname" | 	  $show "$install_prog $dir/$srcname $destdir/$realname" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user