Index: gimp-1.0.4/ltconfig diff -c gimp-1.0.4/ltconfig:1.1.1.1 gimp-1.0.4/ltconfig:1.2 *** gimp-1.0.4/ltconfig:1.1.1.1 Mon Sep 11 15:17:41 2000 --- gimp-1.0.4/ltconfig Mon Sep 11 16:22:14 2000 *************** *** 2,8 **** # ltconfig - Create a system-specific libtool. # Copyright (C) 1996-1999 Free Software Foundation, Inc. ! # Gordon Matzigkeit , 1996 # # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by --- 2,8 ---- # ltconfig - Create a system-specific libtool. # Copyright (C) 1996-1999 Free Software Foundation, Inc. ! # Originally by Gordon Matzigkeit , 1996 # # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by *************** *** 32,43 **** # Discard the --no-reexec flag, and continue. shift elif test "X$1" = X--fallback-echo; then ! # used as fallback echo ! shift ! cat </dev/null`" = 'X\t'; then # Yippee, $echo works! : --- 32,39 ---- # Discard the --no-reexec flag, and continue. shift elif test "X$1" = X--fallback-echo; then ! # Avoid inline document here, it may be left over ! : elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then # Yippee, $echo works! : *************** *** 46,54 **** exec "$SHELL" "$0" --no-reexec ${1+"$@"} fi # Find the correct PATH separator. Usually this is `:', but # DJGPP uses `;' like DOS. ! if test "X${PATH_SEPARATOR+set}" != "Xset"; then UNAME=${UNAME-`uname 2>/dev/null`} case X$UNAME in *-DOS) PATH_SEPARATOR=';' ;; --- 42,59 ---- exec "$SHELL" "$0" --no-reexec ${1+"$@"} fi + if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat </dev/null`} case X$UNAME in *-DOS) PATH_SEPARATOR=';' ;; *************** *** 58,66 **** # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. ! if test "${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi ! if test "X${echo_test_string+set}" != "Xset"; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... --- 63,71 ---- # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. ! if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi ! if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... *************** *** 82,88 **** IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for dir in $PATH /usr/ucb; do ! if test -f $dir/echo && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && test "X`($dir/echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then echo="$dir/echo" --- 87,93 ---- IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for dir in $PATH /usr/ucb; do ! if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && test "X`($dir/echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then echo="$dir/echo" *************** *** 97,103 **** test "X`(print -r "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then # This shell has a builtin print -r that does the trick. echo='print -r' ! elif test -f /bin/ksh && test "X$CONFIG_SHELL" != X/bin/ksh; then # If we have ksh, try running ltconfig again with it. ORIGINAL_CONFIG_SHELL="${CONFIG_SHELL-/bin/sh}" export ORIGINAL_CONFIG_SHELL --- 102,109 ---- test "X`(print -r "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then # This shell has a builtin print -r that does the trick. echo='print -r' ! elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && ! test "X$CONFIG_SHELL" != X/bin/ksh; then # If we have ksh, try running ltconfig again with it. ORIGINAL_CONFIG_SHELL="${CONFIG_SHELL-/bin/sh}" export ORIGINAL_CONFIG_SHELL *************** *** 163,172 **** # Constants: PROGRAM=ltconfig PACKAGE=libtool ! VERSION=1.2f ! TIMESTAMP=" (1.385 1999/03/15 17:24:54)" ! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5' rm="rm -f" help="Try \`$progname --help' for more information." --- 169,178 ---- # Constants: PROGRAM=ltconfig PACKAGE=libtool ! VERSION=1.3.4 ! TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" ! 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' rm="rm -f" help="Try \`$progname --help' for more information." *************** *** 175,184 **** default_ofile=libtool can_build_shared=yes enable_shared=yes ! # All known linkers require a `.a' archive for static linking. enable_static=yes enable_fast_install=yes enable_dlopen=unknown ltmain= silent= srcdir= --- 181,192 ---- default_ofile=libtool can_build_shared=yes enable_shared=yes ! # All known linkers require a `.a' archive for static linking (except M$VC, ! # which needs '.lib'). enable_static=yes enable_fast_install=yes enable_dlopen=unknown + enable_win32_dll=no ltmain= silent= srcdir= *************** *** 194,210 **** --- 202,222 ---- ac_ext=c objext=o libext=a + exeext= cache_file= old_AR="$AR" old_CC="$CC" old_CFLAGS="$CFLAGS" old_CPPFLAGS="$CPPFLAGS" + old_LDFLAGS="$LDFLAGS" old_LD="$LD" old_LN_S="$LN_S" + old_LIBS="$LIBS" old_NM="$NM" old_RANLIB="$RANLIB" old_DLLTOOL="$DLLTOOL" + old_OBJDUMP="$OBJDUMP" old_AS="$AS" # Parse the command line options. *************** *** 235,241 **** --disable-static do not build static libraries --disable-fast-install do not optimize for fast installation --enable-dlopen enable dlopen support ! --enable-dlopen-self enable support for dlopening programs --help display this help and exit --no-verify do not verify that HOST is a valid host type -o, --output=FILE specify the output file [default=$default_ofile] --- 247,253 ---- --disable-static do not build static libraries --disable-fast-install do not optimize for fast installation --enable-dlopen enable dlopen support ! --enable-win32-dll enable building dlls on win32 hosts --help display this help and exit --no-verify do not verify that HOST is a valid host type -o, --output=FILE specify the output file [default=$default_ofile] *************** *** 269,274 **** --- 281,288 ---- --enable-dlopen) enable_dlopen=yes ;; + --enable-win32-dll) enable_win32_dll=yes ;; + --quiet | --silent) silent=yes ;; --srcdir) prev=srcdir ;; *************** *** 355,362 **** # Only set LANG and LC_ALL to C if already set. # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). ! if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi ! if test "${LANG+set}" = set; then LANG=C; export LANG; fi if test -n "$cache_file" && test -r "$cache_file"; then echo "loading cache $cache_file within ltconfig" --- 369,376 ---- # Only set LANG and LC_ALL to C if already set. # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). ! 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 -n "$cache_file" && test -r "$cache_file"; then echo "loading cache $cache_file within ltconfig" *************** *** 448,454 **** # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. ! if test "${COLLECT_NAMES+set}" != set; then COLLECT_NAMES= export COLLECT_NAMES fi --- 462,468 ---- # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. ! if test "X${COLLECT_NAMES+set}" != Xset; then COLLECT_NAMES= export COLLECT_NAMES fi *************** *** 463,468 **** --- 477,485 ---- # Set a sane default for `AR'. test -z "$AR" && AR=ar + # Set a sane default for `OBJDUMP'. + test -z "$OBJDUMP" && OBJDUMP=objdump + # If RANLIB is not set, then run the test. if test "${RANLIB+set}" != "set"; then result=no *************** *** 471,477 **** IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for dir in $PATH; do test -z "$dir" && dir=. ! if test -f $dir/ranlib; then RANLIB="ranlib" result="ranlib" break --- 488,494 ---- IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for dir in $PATH; do test -z "$dir" && dir=. ! if test -f $dir/ranlib || test -f $dir/ranlib$ac_exeext; then RANLIB="ranlib" result="ranlib" break *************** *** 487,494 **** old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" fi ! # Set sane defaults for `DLLTOOL' and `AS', used on cygwin. test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$AS" && AS=as # Check to see if we are using GCC. --- 504,512 ---- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" fi ! # Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin. test -z "$DLLTOOL" && DLLTOOL=dlltool + test -z "$OBJDUMP" && OBJDUMP=objdump test -z "$AS" && AS=as # Check to see if we are using GCC. *************** *** 498,506 **** echo $ac_n "checking for gcc... $ac_c" 1>&6 IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for dir in $PATH; do - IFS="$save_ifs" test -z "$dir" && dir=. ! if test -f $dir/gcc; then CC="gcc" break fi --- 516,523 ---- echo $ac_n "checking for gcc... $ac_c" 1>&6 IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for dir in $PATH; do test -z "$dir" && dir=. ! if test -f $dir/gcc || test -f $dir/gcc$ac_exeext; then CC="gcc" break fi *************** *** 521,527 **** cc_rejected=no for dir in $PATH; do test -z "$dir" && dir=. ! if test -f $dir/cc; then if test "$dir/cc" = "/usr/ucb/cc"; then cc_rejected=yes continue --- 538,544 ---- cc_rejected=no for dir in $PATH; do test -z "$dir" && dir=. ! if test -f $dir/cc || test -f $dir/cc$ac_exeext; then if test "$dir/cc" = "/usr/ucb/cc"; then cc_rejected=yes continue *************** *** 561,567 **** # Now see if the compiler is really GCC. with_gcc=no echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6 ! echo "$progname:564: checking whether we are using GNU C" >&5 $rm conftest.c cat > conftest.c <&6 ! echo "$progname:581: checking whether we are using GNU C" >&5 $rm conftest.c cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then with_gcc=yes fi $rm conftest.c --- 586,592 ---- yes; #endif EOF ! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then with_gcc=yes fi $rm conftest.c *************** *** 583,590 **** echo $ac_n "checking for object suffix... $ac_c" 1>&6 $rm conftest* echo 'int i = 1;' > conftest.c ! echo "$progname:586: checking for object suffix" >& 5 ! if { (eval echo $progname:587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then # Append any warnings to the config.log. cat conftest.err 1>&5 --- 600,607 ---- echo $ac_n "checking for object suffix... $ac_c" 1>&6 $rm conftest* echo 'int i = 1;' > conftest.c ! echo "$progname:603: checking for object suffix" >& 5 ! if { (eval echo $progname:604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then # Append any warnings to the config.log. cat conftest.err 1>&5 *************** *** 602,607 **** --- 619,656 ---- $rm conftest* echo "$ac_t$objext" 1>&6 + echo $ac_n "checking for executable suffix... $ac_c" 1>&6 + if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_cv_exeext="no" + $rm conftest* + echo 'main () { return 0; }' > conftest.c + echo "$progname:629: checking for executable suffix" >& 5 + if { (eval echo $progname:630: \"$ac_link\") 1>&5; (eval $ac_link) 2>conftest.err; }; then + # Append any warnings to the config.log. + cat conftest.err 1>&5 + + for ac_file in conftest.*; do + case $ac_file in + *.c | *.err | *.$objext ) ;; + *) ac_cv_exeext=.`echo $ac_file | sed -e s/conftest.//` ;; + esac + done + else + cat conftest.err 1>&5 + echo "$progname: failed program was:" >&5 + cat conftest.c >&5 + fi + $rm conftest* + fi + if test "X$ac_cv_exeext" = Xno; then + exeext="" + else + exeext="$ac_cv_exeext" + fi + echo "$ac_t$ac_cv_exeext" 1>&6 + echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6 pic_flag= special_shlib_compile_flags= *************** *** 614,620 **** link_static_flag='-static' case "$host_os" in ! beos* | irix5* | irix6* | osf3* | osf4*) # PIC is the default for these OSes. ;; aix*) --- 663,669 ---- link_static_flag='-static' case "$host_os" in ! beos* | irix5* | irix6* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; aix*) *************** *** 635,640 **** --- 684,694 ---- # like `-m68040'. pic_flag='-m68020 -resident32 -malways-restore-a4' ;; + sysv4*MP*) + if test -d /usr/nec; then + pic_flag=-Kconform_pic + fi + ;; *) pic_flag='-fPIC' ;; *************** *** 642,648 **** else # PORTME Check for PIC flags for the system compiler. case "$host_os" in ! aix3* | aix4*) # All AIX code is PIC. link_static_flag='-bnso -bI:/lib/syscalls.exp' ;; --- 696,702 ---- else # PORTME Check for PIC flags for the system compiler. case "$host_os" in ! aix3* | aix4* | aix5*) # All AIX code is PIC. link_static_flag='-bnso -bI:/lib/syscalls.exp' ;; *************** *** 664,670 **** # We can build DLLs from non-PIC. ;; ! osf3* | osf4*) # All OSF/1 code is PIC. wl='-Wl,' link_static_flag='-non_shared' --- 718,724 ---- # We can build DLLs from non-PIC. ;; ! osf3* | osf4* | osf5*) # All OSF/1 code is PIC. wl='-Wl,' link_static_flag='-non_shared' *************** *** 688,694 **** wl='-Qoption ld ' ;; ! sysv4.2uw2* | sysv4.3* | sysv5*) pic_flag='-KPIC' link_static_flag='-Bstatic' wl='-Wl,' --- 742,748 ---- wl='-Qoption ld ' ;; ! sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) pic_flag='-KPIC' link_static_flag='-Bstatic' wl='-Wl,' *************** *** 698,704 **** pic_flag='-pic' link_static_flag='-Bstatic' ;; ! *) can_build_shared=no ;; --- 752,763 ---- pic_flag='-pic' link_static_flag='-Bstatic' ;; ! sysv4*MP*) ! if test -d /usr/nec ;then ! pic_flag='-Kconform_pic' ! link_static_flag='-Bstatic' ! fi ! ;; *) can_build_shared=no ;; *************** *** 714,721 **** echo "int some_variable = 0;" > conftest.c save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $pic_flag -DPIC" ! echo "$progname:717: checking if $compiler PIC flag $pic_flag works" >&5 ! if { (eval echo $progname:718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then # Append any warnings to the config.log. cat conftest.err 1>&5 --- 773,780 ---- echo "int some_variable = 0;" > conftest.c save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $pic_flag -DPIC" ! echo "$progname:776: checking if $compiler PIC flag $pic_flag works" >&5 ! if { (eval echo $progname:777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then # Append any warnings to the config.log. cat conftest.err 1>&5 *************** *** 753,768 **** # Check to see if options -o and -c are simultaneously supported by compiler echo $ac_n "checking if $compiler supports -c -o file.o... $ac_c" 1>&6 $rm conftest* echo "int some_variable = 0;" > conftest.c save_CFLAGS="$CFLAGS" ! CFLAGS="$CFLAGS -c -o conftest2.o" ! echo "$progname:760: checking if $compiler supports -c -o file.o" >&5 ! if { (eval echo $progname:761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest2.o; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings ! if test -s conftest.err; then echo "$ac_t"no 1>&6 compiler_c_o=no else --- 812,837 ---- # Check to see if options -o and -c are simultaneously supported by compiler echo $ac_n "checking if $compiler supports -c -o file.o... $ac_c" 1>&6 + $rm -r conftest 2>/dev/null + mkdir conftest + cd conftest $rm conftest* echo "int some_variable = 0;" > conftest.c + mkdir out + # According to Tom Tromey, Ian Lance Taylor reported there are C compilers + # that will create temporary files in the current directory regardless of + # the output directory. Thus, making CWD read-only will cause this test + # to fail, enabling locking or at least warning the user not to do parallel + # builds. + chmod -w . save_CFLAGS="$CFLAGS" ! CFLAGS="$CFLAGS -o out/conftest2.o" ! echo "$progname:829: checking if $compiler supports -c -o file.o" >&5 ! if { (eval echo $progname:830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings ! if test -s out/conftest.err; then echo "$ac_t"no 1>&6 compiler_c_o=no else *************** *** 771,782 **** fi else # Append any errors to the config.log. ! cat conftest.err 1>&5 compiler_c_o=no echo "$ac_t"no 1>&6 fi CFLAGS="$save_CFLAGS" ! $rm conftest* if test x"$compiler_c_o" = x"yes"; then # Check to see if we can write to a .lo --- 840,856 ---- fi else # Append any errors to the config.log. ! cat out/conftest.err 1>&5 compiler_c_o=no echo "$ac_t"no 1>&6 fi CFLAGS="$save_CFLAGS" ! chmod u+w . ! $rm conftest* out/* ! rmdir out ! cd .. ! rmdir conftest ! $rm -r conftest 2>/dev/null if test x"$compiler_c_o" = x"yes"; then # Check to see if we can write to a .lo *************** *** 785,792 **** echo "int some_variable = 0;" > conftest.c save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -c -o conftest.lo" ! echo "$progname:788: checking if $compiler supports -c -o file.lo" >&5 ! if { (eval echo $progname:789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings --- 859,866 ---- echo "int some_variable = 0;" > conftest.c save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -c -o conftest.lo" ! echo "$progname:862: checking if $compiler supports -c -o file.lo" >&5 ! if { (eval echo $progname:863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings *************** *** 837,844 **** echo "int some_variable = 0;" > conftest.c save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c" ! echo "$progname:840: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ! if { (eval echo $progname:841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings --- 911,918 ---- echo "int some_variable = 0;" > conftest.c save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c" ! echo "$progname:914: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ! if { (eval echo $progname:915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings *************** *** 881,888 **** echo 'main(){return(0);}' > conftest.c save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $link_static_flag" ! echo "$progname:884: checking if $compiler static flag $link_static_flag works" >&5 ! if { (eval echo $progname:885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then echo "$ac_t$link_static_flag" 1>&6 else echo "$ac_t"none 1>&6 --- 955,962 ---- echo 'main(){return(0);}' > conftest.c save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $link_static_flag" ! echo "$progname:958: checking if $compiler static flag $link_static_flag works" >&5 ! if { (eval echo $progname:959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then echo "$ac_t$link_static_flag" 1>&6 else echo "$ac_t"none 1>&6 *************** *** 894,902 **** if test -z "$LN_S"; then # Check to see if we can use ln -s, or we need hard links. echo $ac_n "checking whether ln -s works... $ac_c" 1>&6 ! $rm conftestdata ! if ln -s X conftestdata 2>/dev/null; then ! $rm conftestdata LN_S="ln -s" else LN_S=ln --- 968,976 ---- if test -z "$LN_S"; then # Check to see if we can use ln -s, or we need hard links. echo $ac_n "checking whether ln -s works... $ac_c" 1>&6 ! $rm conftest.dat ! if ln -s X conftest.dat 2>/dev/null; then ! $rm conftest.dat LN_S="ln -s" else LN_S=ln *************** *** 914,924 **** if test "$with_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6 ! echo "$progname:917: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. ! /* | [A-Za-z]:[\\/]*) re_direlt='/[^/][^/]*/\.\./' # Canonicalize the path of ld ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` --- 988,998 ---- if test "$with_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6 ! echo "$progname:991: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. ! [\\/]* | [A-Za-z]:[\\/]*) re_direlt='/[^/][^/]*/\.\./' # Canonicalize the path of ld ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` *************** *** 938,954 **** esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld... $ac_c" 1>&6 ! echo "$progname:941: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 ! echo "$progname:944: checking for non-GNU ld" >&5 fi if test -z "$LD"; then IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. ! if test -f "$ac_dir/$ac_prog"; then LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some GNU ld's only accept -v. --- 1012,1028 ---- esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld... $ac_c" 1>&6 ! echo "$progname:1015: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 ! echo "$progname:1018: checking for non-GNU ld" >&5 fi if test -z "$LD"; then IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. ! if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some GNU ld's only accept -v. *************** *** 1007,1013 **** hardcode_shlibpath_var=unsupported runpath_var= always_export_symbols=no ! export_symbols_cmds='$NM $libobjs | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols' # include_expsyms should be a list of space-separated symbols to be *always* # included in the symbol list include_expsyms= --- 1081,1087 ---- hardcode_shlibpath_var=unsupported runpath_var= always_export_symbols=no ! export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols' # include_expsyms should be a list of space-separated symbols to be *always* # included in the symbol list include_expsyms= *************** *** 1015,1021 **** # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. ! exclude_expsyms= case "$host_os" in cygwin* | mingw*) --- 1089,1100 ---- # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. ! exclude_expsyms="_GLOBAL_OFFSET_TABLE_" ! # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out ! # platforms (ab)use it in PIC code, but their linkers get confused if ! # the symbol is explicitly referenced. Since portable code cannot ! # rely on this symbol name, it's probably fine to never include it in ! # preloaded symbol tables. case "$host_os" in cygwin* | mingw*) *************** *** 1027,1036 **** fi ;; - freebsd2* | sunos4*) - exclude_expsyms="_GLOBAL_OFFSET_TABLE_" - ;; - esac ld_shlibs=yes --- 1106,1111 ---- *************** *** 1040,1046 **** # See if GNU ld supports shared libraries. case "$host_os" in ! aix3* | aix4*) # On AIX, the GNU linker is very broken ld_shlibs=no cat <&2 --- 1115,1121 ---- # See if GNU ld supports shared libraries. case "$host_os" in ! aix3* | aix4* | aix5*) # On AIX, the GNU linker is very broken ld_shlibs=no cat <&2 *************** *** 1058,1075 **** archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)' hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes - ;; ! sunos4*) ! archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts' ! wlarc= ! hardcode_direct=yes ! hardcode_minus_L=yes ! hardcode_shlibpath_var=no ;; beos*) if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -nostart $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' else ld_shlibs=no --- 1133,1153 ---- archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)' hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes ! # Samuel A. Falvo II reports ! # that the semantics of dynamic libraries on AmigaOS, at least up ! # to version 4, is to share data among multiple programs linked ! # with the same dynamic library. Since this doesn't match the ! # behavior of shared libraries on other platforms, we can use ! # them. ! ld_shlibs=no ;; beos*) if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME archive_cmds='$CC -nostart $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' else ld_shlibs=no *************** *** 1086,1110 **** # Extract the symbol export list from an `--export-all' def file, # then regenerate the def file from the symbol export list, so that # the compiled dll only exports the symbol export list. ! export_symbols_cmds='rm -f $objdir/$soname-ltdll.c~ ! sed -e "/^# \/\* ltdll.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~ ! (cd $objdir && $CC -c $soname-ltdll.c)~ ! $DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def $objdir/$soname-ltdll.$objext $libobjs~ sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]* ; *//" < $objdir/$soname-def > $export_symbols' archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~ _lt_hint=1; for symbol in `cat $export_symbols`; do ! echo " \$symbol @ \$_lt_hint ; " >> $objdir/$soname-def; _lt_hint=`expr 1 + \$_lt_hint`; done~ $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~ $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~ $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~ $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~ $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts' ! old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a' ;; *) --- 1164,1227 ---- # Extract the symbol export list from an `--export-all' def file, # then regenerate the def file from the symbol export list, so that # the compiled dll only exports the symbol export list. ! export_symbols_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~ ! test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~ ! $DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def $objdir/$soname-ltdll.$objext $libobjs $convenience~ sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]* ; *//" < $objdir/$soname-def > $export_symbols' archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~ _lt_hint=1; for symbol in `cat $export_symbols`; do ! echo " \$symbol @ \$_lt_hint ; " >> $objdir/$soname-def; _lt_hint=`expr 1 + \$_lt_hint`; done~ + test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~ + test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~ $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~ $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~ $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~ $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~ $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts' + + old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a' + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' + # can we support soname and/or expsyms with a.out? -oliva + fi + ;; + + solaris* | sysv5*) + if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + cat <&2 + + *** Warning: The releases 2.8.* of the GNU linker cannot reliably + *** create shared libraries on Solaris systems. Therefore, libtool + *** is disabling shared libraries support. We urge you to upgrade GNU + *** binutils to release 2.9.1 or newer. Another option is to modify + *** your PATH or compiler configuration so that the native linker is + *** used, and then restart. ! EOF ! elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then ! archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' ! archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ! else ! ld_shlibs=no ! fi ! ;; ! ! sunos4*) ! archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts' ! wlarc= ! hardcode_direct=yes ! hardcode_shlibpath_var=no ;; *) *************** *** 1121,1127 **** runpath_var=LD_RUN_PATH hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' export_dynamic_flag_spec='${wl}--export-dynamic' ! whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi else # PORTME fill in a description of your system's linker (not GNU ld) --- 1238,1257 ---- runpath_var=LD_RUN_PATH hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' export_dynamic_flag_spec='${wl}--export-dynamic' ! case $host_os in ! cygwin* | mingw*) ! # dlltool doesn't understand --whole-archive et. al. ! whole_archive_flag_spec= ! ;; ! *) ! # ancient GNU ld didn't support --whole-archive et. al. ! if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then ! whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ! else ! whole_archive_flag_spec= ! fi ! ;; ! esac fi else # PORTME fill in a description of your system's linker (not GNU ld) *************** *** 1140,1175 **** fi ;; ! aix4*) ! allow_undefined_flag= ! if test "$with_gcc" = yes; then ! if strings `${CC} -print-prog-name=collect2` | \ ! grep resolve_lib_name >/dev/null ! then ! # We have reworked collect2 ! hardcode_direct=yes else ! # We have old collect2 ! hardcode_direct=unsupported fi ! archive_cmds='$CC -shared ${wl}-bnoentry -o $objdir/$soname $libobjs $deplibs $linkopts' else always_export_symbols=yes - archive_expsym_cmds='$CC -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bM:SRE ${wl}-bnoentry' - hardcode_direct=yes fi ! hardcode_minus_L=yes ! # Though LIBPATH variable hardcodes shlibpath into executable, ! # it doesn't affect searching for -l* libraries; this confuses ! # tests in mdemo. ! hardcode_shlibpath_var=unsupported ! hardcode_libdir_flag_spec='-L$libdir' ! ;; amigaos*) archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)' hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes ;; cygwin* | mingw*) --- 1270,1356 ---- fi ;; ! aix4* | aix5*) ! # First test if we are trying to use run time linking, or normal AIX style linking. ! # If -brtl is somewhere in LDFLAGS, we need to do run time linking. ! aix_use_runtimelinking=no ! for ld_flag in $LDFLAGS; do ! if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then ! aix_use_runtimelinking=yes ! break ! fi ! done ! if test "$aix_use_runtimelinking" = yes; then ! hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' ! hardcode_libdir_separator=':' ! if test "$with_gcc" = yes; then ! collect2name=`${CC} -print-prog-name=collect2` ! if test -f "$collect2name" && \ ! strings "$collect2name" | grep resolve_lib_name >/dev/null ! then ! # We have reworked collect2 ! hardcode_direct=yes ! else ! # We have old collect2 ! hardcode_direct=unsupported ! # It fails to find uninstalled libraries when the uninstalled ! # path is not listed in the libpath. Setting hardcode_minus_L ! # to unsupported forces relinking ! hardcode_minus_L=yes ! hardcode_libdir_flag_spec='-L$libdir' ! hardcode_libdir_separator= ! fi ! shared_flag='-shared' else ! shared_flag='${wl}-bM:SRE' ! hardcode_direct=yes fi ! allow_undefined_flag=' -Wl,-G' ! archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bnoentry${allow_undefined_flag}' ! # It seems that -bexpall can do strange things, so it is better to ! # generate a list of symbols to export. ! always_export_symbols=yes ! archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}' else + hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' + hardcode_libdir_separator=':' + if test "$with_gcc" = yes; then + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + hardcode_direct=yes + else + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + shared_flag='-shared' + else + shared_flag='${wl}-bM:SRE' + hardcode_direct=yes + fi + # Warning - without using the other run time loading flags, -berok will + # link without error, but may produce a broken library. + allow_undefined_flag=' ${wl}-berok' + archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}' + archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}' always_export_symbols=yes fi ! ;; amigaos*) archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)' hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes + # see comment about different semantics on the GNU ld section + ld_shlibs=no ;; cygwin* | mingw*) *************** *** 1192,1198 **** freebsd1*) ld_shlibs=no - can_build_shared=no ;; # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor --- 1373,1378 ---- *************** *** 1203,1209 **** archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts /usr/lib/c++rt0.o' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes - hardcode_minus_L=no # verified on 2.2.6 hardcode_shlibpath_var=no ;; --- 1383,1388 ---- *************** *** 1220,1250 **** archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes - hardcode_minus_L=no hardcode_shlibpath_var=no ;; ! hpux9*) ! archive_cmds='$rm $objdir/$soname~$LD -b +s +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ! hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ! hardcode_direct=yes ! hardcode_minus_L=yes ! export_dynamic_flag_spec='${wl}-E' ! ;; ! ! hpux10* | hpux11*) ! archive_cmds='$LD -b +h $soname +s +b $install_libdir -o $lib $libobjs $deplibs $linkopts' hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' hardcode_direct=yes ! hardcode_minus_L=yes export_dynamic_flag_spec='${wl}-E' ;; irix5* | irix6*) if test "$with_gcc" = yes; then ! archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' else ! archive_cmds='$LD -shared $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -o $lib' fi hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: --- 1399,1425 ---- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no ;; ! hpux9* | hpux10* | hpux11*) ! case "$host_os" in ! hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; ! *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linkopts' ;; ! esac hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: hardcode_direct=yes ! hardcode_minus_L=yes # Not in the search PATH, but as the default ! # location of the library. export_dynamic_flag_spec='${wl}-E' ;; irix5* | irix6*) if test "$with_gcc" = yes; then ! archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' else ! archive_cmds='$LD -shared $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' fi hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: *************** *** 1276,1296 **** old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def' ;; ! osf3* | osf4*) if test "$with_gcc" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' ! archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' else allow_undefined_flag=' -expect_unresolved \*' ! archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -o $lib' fi hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: ;; sco3.2v5*) ! archive_cmds='$LD -G -o $lib $libobjs $deplibs $linkopts' ! hardcode_direct=yes ;; solaris*) --- 1451,1485 ---- old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def' ;; ! osf3*) if test "$with_gcc" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' ! archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' ! archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' fi hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: ;; + osf4* | osf5*) # As osf3* with the addition of the -msym flag + if test "$with_gcc" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + fi + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + sco3.2v5*) ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' ! hardcode_shlibpath_var=no ! runpath_var=LD_RUN_PATH ! hardcode_runpath_var=yes ;; solaris*) *************** *** 1302,1364 **** $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp' hardcode_libdir_flag_spec='-R$libdir' hardcode_shlibpath_var=no ;; sunos4*) ! # Why do we need -Bstatic? To avoid inter-library dependencies, maybe... ! if test "$with_gcc" = yes; then ! # Use -fPIC here because libgcc is multilibbed ! archive_cmds='$CC -shared ${wl}-Bstatic -fPIC -o $lib $libobjs $deplibs $linkopts' ! else ! archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts' ! fi hardcode_libdir_flag_spec='-L$libdir' hardcode_direct=yes hardcode_minus_L=yes hardcode_shlibpath_var=no ;; sysv4.3*) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - hardcode_direct=no - hardcode_minus_L=no hardcode_shlibpath_var=no export_dynamic_flag_spec='-Bexport' ;; uts4*) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=no - hardcode_minus_L=no hardcode_shlibpath_var=no ;; dgux*) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' hardcode_libdir_flag_spec='-L$libdir' ! hardcode_direct=no hardcode_minus_L=no hardcode_shlibpath_var=no ;; *) ld_shlibs=no - can_build_shared=no ;; esac fi echo "$ac_t$ld_shlibs" 1>&6 if test -z "$NM"; then echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6 case "$NM" in ! /* | [A-Za-z]:[/\\]*) ;; # Let the user override the test with a path. *) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for ac_dir in $PATH /usr/ucb /usr/ccs/bin /bin; do test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/nm; then # Check to see if the nm accepts a BSD-compat flag. # Adding the `sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored --- 1491,1590 ---- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp' hardcode_libdir_flag_spec='-R$libdir' hardcode_shlibpath_var=no + case "$host_os" in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) # Supported since Solaris 2.6 (maybe 2.5.1?) + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; + esac ;; sunos4*) ! archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts' hardcode_libdir_flag_spec='-L$libdir' hardcode_direct=yes hardcode_minus_L=yes hardcode_shlibpath_var=no ;; + sysv4) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + sysv4.3*) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' hardcode_shlibpath_var=no export_dynamic_flag_spec='-Bexport' ;; + sysv5*) + no_undefined_flag=' -z text' + # $CC -shared without GNU ld will not create a library from C++ + # object files and a static libstdc++, better avoid it by now + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts' + archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp' + hardcode_libdir_flag_spec= + hardcode_shlibpath_var=no + runpath_var='LD_RUN_PATH' + ;; + uts4*) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' hardcode_libdir_flag_spec='-L$libdir' hardcode_shlibpath_var=no ;; dgux*) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' hardcode_libdir_flag_spec='-L$libdir' ! hardcode_shlibpath_var=no ! ;; ! ! sysv4*MP*) ! if test -d /usr/nec; then ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' ! hardcode_shlibpath_var=no ! runpath_var=LD_RUN_PATH ! hardcode_runpath_var=yes ! ld_shlibs=yes ! fi ! ;; ! ! sysv4.2uw2*) ! archive_cmds='$LD -G -o $lib $libobjs $deplibs $linkopts' ! hardcode_direct=yes hardcode_minus_L=no hardcode_shlibpath_var=no + hardcode_runpath_var=yes + runpath_var=LD_RUN_PATH ;; + unixware7*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no + ;; + *) ld_shlibs=no ;; esac fi echo "$ac_t$ld_shlibs" 1>&6 + test "$ld_shlibs" = no && can_build_shared=no if test -z "$NM"; then echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6 case "$NM" in ! [\\/]* | [A-Za-z]:[\\/]*) ;; # Let the user override the test with a path. *) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for ac_dir in $PATH /usr/ucb /usr/ccs/bin /bin; do test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext; then # Check to see if the nm accepts a BSD-compat flag. # Adding the `sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored *************** *** 1416,1421 **** --- 1642,1650 ---- solaris*) symcode='[BDT]' ;; + sysv4) + symcode='[DFNSTU]' + ;; esac # If we're using GNU nm, then use its standard symbol codes. *************** *** 1444,1454 **** main(){nm_test_var='a';nm_test_func();return(0);} EOF ! echo "$progname:1447: checking if global_symbol_pipe works" >&5 ! if { (eval echo $progname:1448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then # Now try to grab the symbols. nlist=conftest.nm ! if { echo "$progname:1451: 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. if sort "$nlist" | uniq > "$nlist"T; then --- 1673,1683 ---- main(){nm_test_var='a';nm_test_func();return(0);} EOF ! echo "$progname:1635: checking if global_symbol_pipe works" >&5 ! if { (eval echo $progname:1636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then # Now try to grab the symbols. nlist=conftest.nm ! if { echo "$progname:1639: 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. if sort "$nlist" | uniq > "$nlist"T; then *************** *** 1495,1506 **** #endif EOF # Now try linking the two files. ! mv conftest.$objext conftestm.$objext save_LIBS="$LIBS" save_CFLAGS="$CFLAGS" ! LIBS="conftestm.$objext" CFLAGS="$CFLAGS$no_builtin_flag" ! if { (eval echo $progname:1503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then pipe_works=yes else echo "$progname: failed program was:" >&5 --- 1724,1735 ---- #endif EOF # Now try linking the two files. ! mv conftest.$objext conftstm.$objext save_LIBS="$LIBS" save_CFLAGS="$CFLAGS" ! LIBS="conftstm.$objext" CFLAGS="$CFLAGS$no_builtin_flag" ! if { (eval echo $progname:1691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then pipe_works=yes else echo "$progname: failed program was:" >&5 *************** *** 1520,1526 **** echo "$progname: failed program was:" >&5 cat conftest.c >&5 fi ! $rm conftest* # Do not use the global_symbol_pipe unless it works. if test "$pipe_works" = yes; then --- 1749,1755 ---- echo "$progname: failed program was:" >&5 cat conftest.c >&5 fi ! $rm conftest* conftst* # Do not use the global_symbol_pipe unless it works. if test "$pipe_works" = yes; then *************** *** 1529,1535 **** global_symbol_pipe= fi done ! echo "$ac_t$pipe_works" 1>&6 if test -z "$global_symbol_pipe"; then global_symbol_to_cdecl= --- 1758,1768 ---- global_symbol_pipe= fi done ! if test "$pipe_works" = yes; then ! echo "${ac_t}ok" 1>&6 ! else ! echo "${ac_t}failed" 1>&6 ! fi if test -z "$global_symbol_pipe"; then global_symbol_to_cdecl= *************** *** 1542,1551 **** test -n "$runpath_var"; then # We can hardcode non-existant directories. ! if test "$hardcode_direct" != no && \ ! test "$hardcode_minus_L" != no && \ ! test "$hardcode_shlibpath_var" != no; then ! # Linking always hardcodes the temporary library directory. hardcode_action=relink else --- 1775,1786 ---- test -n "$runpath_var"; then # We can hardcode non-existant directories. ! if test "$hardcode_direct" != no && ! # If the only mechanism to avoid hardcoding is shlibpath_var, we ! # have to relink, otherwise we might link with an installed library ! # when we should be linking with a yet-to-be-installed one ! ## test "$hardcode_shlibpath_var" != no && ! test "$hardcode_minus_L" != no; then # Linking always hardcodes the temporary library directory. hardcode_action=relink else *************** *** 1606,1619 **** soname_spec='${libname}${release}.so$major' ;; ! aix4*) version_type=linux # AIX has no versioning support, so currently we can not hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. ! # We preserve .a as extension for shared libraries though AIX4.2 ! # and later linker supports .so ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.a' shlibpath_var=LIBPATH deplibs_check_method=pass_all ;; --- 1841,1860 ---- soname_spec='${libname}${release}.so$major' ;; ! aix4* | aix5*) version_type=linux # AIX has no versioning support, so currently we can not hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. ! if test "$aix_use_runtimelinking" = yes; then ! # If using run time linking (on AIX 4.2 or later) use lib.so instead of ! # lib.a to let people know that these are not typical AIX shared libraries. ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' ! else ! # We preserve .a as extension for shared libraries though AIX4.2 ! # and later linker supports .so ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.a' ! fi shlibpath_var=LIBPATH deplibs_check_method=pass_all ;; *************** *** 1628,1646 **** library_names_spec='${libname}.so' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; bsdi4*) version_type=linux ! library_names_spec='${libname}.so$major ${libname}.so' ! soname_spec='${libname}.so' ! finish_cmds='PATH="$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH ! deplibs_check_method='file_magic ELF 32-bit LSB shared object' file_magic_cmd=/usr/bin/file file_magic_test_file=/shlib/libc.so sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" # the default ld.so.conf also contains /usr/contrib/lib and # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow # libtool to hard-code these into programs --- 1869,1893 ---- library_names_spec='${libname}.so' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH + deplibs_check_method=pass_all + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes ;; bsdi4*) version_type=linux ! need_version=no ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' ! soname_spec='${libname}${release}.so$major' ! finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH ! deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' file_magic_cmd=/usr/bin/file file_magic_test_file=/shlib/libc.so sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + export_dynamic_flag_spec=-rdynamic # the default ld.so.conf also contains /usr/contrib/lib and # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow # libtool to hard-code these into programs *************** *** 1648,1664 **** cygwin* | mingw*) version_type=windows if test "$with_gcc" = yes; then library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.a' else library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib' fi dynamic_linker='Win32 ld.exe' ! deplibs_check_method='file_magic file format pei*-i386.*architecture: i386' ! file_magic_cmd='objdump -f' ! need_lib_prefix=no # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; freebsd1*) --- 1895,1914 ---- cygwin* | mingw*) version_type=windows + need_version=no + need_lib_prefix=no if test "$with_gcc" = yes; then library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.a' else library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib' fi dynamic_linker='Win32 ld.exe' ! deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ! file_magic_cmd='${OBJDUMP} -f' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= ;; freebsd1*) *************** *** 1683,1695 **** need_version=yes ;; esac - finish_cmds='PATH="$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH ;; gnu*) version_type=linux ! library_names_spec='${libname}${release}.so$versuffix ${libname}.so' shlibpath_var=LD_LIBRARY_PATH ;; --- 1933,1955 ---- need_version=yes ;; esac shlibpath_var=LD_LIBRARY_PATH + case "$host_os" in + freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + ;; + *) # from 3.2 on + shlibpath_overrides_runpath=no + ;; + esac ;; gnu*) version_type=linux ! need_lib_prefix=no ! need_version=no ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so' ! soname_spec='${libname}${release}.so$major' shlibpath_var=LD_LIBRARY_PATH ;; *************** *** 1701,1746 **** need_lib_prefix=no need_version=no shlibpath_var=SHLIB_PATH library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' soname_spec='${libname}${release}.sl$major' # HP-UX runs *really* slowly unless shared libraries are mode 555. postinstall_cmds='chmod 555 $lib' ;; ! irix5*) version_type=irix - soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' - shlibpath_var=LD_LIBRARY_PATH - deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" # or should it be pass_all? - file_magic_cmd=/usr/bin/file - file_magic_test_file=`echo /lib/libc.so*` - shlibpath_overrides_runpath=no - ;; - - irix6*) - version_type=irix need_lib_prefix=no need_version=no ! soname_spec='${libname}${release}.so' ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' ! case "$LD" in # libtool.m4 will add one of these switches to LD ! *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;; ! *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;; ! *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;; ! *) libsuff= shlibsuff= libmagic=never-match;; esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no ! # even though /usr/local/lib is always searched, the man-page says ! # shared libraries should not be installed there if they use an ABI ! # different from -32, so we'd better not search for shared libraries ! # there either ! sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ! sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ! deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1" # or should it be pass_all? file_magic_cmd=/usr/bin/file file_magic_test_file=`echo /lib${libsuff}/libc.so*` ;; # No shared lib support for Linux oldld, aout, or coff. --- 1961,2001 ---- need_lib_prefix=no need_version=no shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' soname_spec='${libname}${release}.sl$major' # HP-UX runs *really* slowly unless shared libraries are mode 555. postinstall_cmds='chmod 555 $lib' ;; ! irix5* | irix6*) version_type=irix need_lib_prefix=no need_version=no ! soname_spec='${libname}${release}.so.$major' ! library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so' ! case "$host_os" in ! irix5*) ! libsuff= shlibsuff= ! # this will be overridden with pass_all, but let us keep it just in case ! deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" ! ;; ! *) ! case "$LD" in # libtool.m4 will add one of these switches to LD ! *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;; ! *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;; ! *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;; ! *) libsuff= shlibsuff= libmagic=never-match;; ! esac ! ;; esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no ! sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ! sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" file_magic_cmd=/usr/bin/file file_magic_test_file=`echo /lib${libsuff}/libc.so*` + deplibs_check_method='pass_all' ;; # No shared lib support for Linux oldld, aout, or coff. *************** *** 1755,1761 **** need_version=no library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' soname_spec='${libname}${release}.so$major' ! finish_cmds='PATH="$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' --- 2010,2016 ---- need_version=no library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' soname_spec='${libname}${release}.so$major' ! finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' *************** *** 1777,1783 **** version_type=sunos if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' ! finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' --- 2032,2038 ---- version_type=sunos if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' ! finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' *************** *** 1806,1824 **** shlibpath_var=LIBPATH ;; ! osf3* | osf4*) version_type=osf soname_spec='${libname}${release}.so' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' shlibpath_var=LD_LIBRARY_PATH ! # deplibs_check_method='pass_all' ! # Although pass_all appears to work, it copies symbols from static libraries ! # into shared ones and exports them. So, when a program is linked with two ! # or more libraries that have got copies of the same symbols, link fails ! # This was only tested on osf4: deplibs_check_method='file_magic COFF format alpha shared library' file_magic_cmd=/usr/bin/file file_magic_test_file=/shlib/libc.so sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; --- 2061,2077 ---- shlibpath_var=LIBPATH ;; ! osf3* | osf4* | osf5*) version_type=osf + need_version=no soname_spec='${libname}${release}.so' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' shlibpath_var=LD_LIBRARY_PATH ! # this will be overridden with pass_all, but let us keep it just in case deplibs_check_method='file_magic COFF format alpha shared library' file_magic_cmd=/usr/bin/file file_magic_test_file=/shlib/libc.so + deplibs_check_method='pass_all' sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; *************** *** 1857,1863 **** need_version=yes ;; ! sysv4.2uw2* | sysv4.3* | sysv5*) version_type=linux library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' soname_spec='${libname}${release}.so$major' --- 2110,2116 ---- need_version=yes ;; ! sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) version_type=linux library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' soname_spec='${libname}${release}.so$major' *************** *** 1866,1871 **** --- 2119,2133 ---- ncr) deplibs_check_method='pass_all' ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + 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]' + file_magic_cmd=/usr/bin/file + file_magic_test_file=`echo /usr/lib/libc.so*` + ;; esac ;; *************** *** 1885,1890 **** --- 2147,2161 ---- shlibpath_var=LD_LIBRARY_PATH ;; + sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so' + soname_spec='$libname.so.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + *) dynamic_linker=no ;; *************** *** 1895,1900 **** --- 2166,2182 ---- # Report the final consequences. echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6 + # Only try to build win32 dlls if AC_LIBTOOL_WIN32_DLL was used in + # configure.in, otherwise build static only libraries. + case "$host_os" in + cygwin* | mingw* | os2*) + if test x$can_build_shared = xyes; then + test x$enable_win32_dll = xno && can_build_shared=no + echo "checking if package supports dlls... $can_build_shared" 1>&6 + fi + ;; + esac + if test -n "$file_magic_test_file" && test -n "$file_magic_cmd"; then case "$deplibs_check_method" in "file_magic "*) *************** *** 1973,2062 **** else if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then lt_cv_dlopen=no lt_cv_dlopen_libs= ! echo $ac_n "checking for dlopen""... $ac_c" 1>&6 ! echo "$progname:1977: checking for dlopen" >&5 ! if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ! cat > conftest.$ac_ext < /* 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. */ char dlopen(); int main() { ! ! /* The GNU C library defines this for functions which it implements ! to always fail with ENOSYS. Some functions are actually named ! something starting with __ and the normal name is an alias. */ ! #if defined (__stub_dlopen) || defined (__stub___dlopen) ! choke me ! #else ! dlopen(); ! #endif ! ; return 0; } EOF ! if { (eval echo $progname:2004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ! eval "ac_cv_func_dlopen=yes" else echo "$progname: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* ! eval "ac_cv_func_dlopen=no" fi rm -f conftest* ! fi ! if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then echo "$ac_t""yes" 1>&6 ! lt_cv_dlopen="dlopen" else echo "$ac_t""no" 1>&6 ! echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 ! echo "$progname:2022: checking for dlopen in -ldl" >&5 ! ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` ! if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ! ac_save_LIBS="$LIBS" ! LIBS="-ldl $LIBS" ! cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ! eval "ac_cv_lib_$ac_lib_var=yes" else echo "$progname: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* ! eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* - LIBS="$ac_save_LIBS" - fi ! if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 ! lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 ! echo "$progname:2059: checking for dld_link in -ldld" >&5 ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 2255,2349 ---- else if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then lt_cv_dlopen=no lt_cv_dlopen_libs= ! echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 ! echo "$progname:2212: checking for dlopen in -ldl" >&5 ! ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` ! if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ! ac_save_LIBS="$LIBS" ! LIBS="-ldl $LIBS" ! cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ! eval "ac_cv_lib_$ac_lib_var=yes" else echo "$progname: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* ! eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* ! LIBS="$ac_save_LIBS" ! fi ! if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 ! lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else echo "$ac_t""no" 1>&6 ! echo $ac_n "checking for dlopen""... $ac_c" 1>&6 ! echo "$progname:2252: checking for dlopen" >&5 ! if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ! cat > conftest.$ac_ext < /* 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() { ! ! /* The GNU C library defines this for functions which it implements ! to always fail with ENOSYS. Some functions are actually named ! something starting with __ and the normal name is an alias. */ ! #if defined (__stub_dlopen) || defined (__stub___dlopen) ! choke me ! #else ! dlopen(); ! #endif ! ; return 0; } EOF ! if { (eval echo $progname:2282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ! eval "ac_cv_func_dlopen=yes" else echo "$progname: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* ! eval "ac_cv_func_dlopen=no" fi rm -f conftest* fi ! if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then echo "$ac_t""yes" 1>&6 ! lt_cv_dlopen="dlopen" else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 ! echo "$progname:2299: checking for dld_link in -ldld" >&5 ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 2064,2080 **** ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 2351,2370 ---- ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 2093,2110 **** else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load""... $ac_c" 1>&6 ! echo "$progname:2096: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < /* 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. */ char shl_load(); int main() { --- 2383,2403 ---- else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load""... $ac_c" 1>&6 ! echo "$progname:2339: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < /* 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 shl_load(); int main() { *************** *** 2120,2126 **** ; return 0; } EOF ! if { (eval echo $progname:2123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else --- 2413,2419 ---- ; return 0; } EOF ! if { (eval echo $progname:2369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else *************** *** 2137,2190 **** lt_cv_dlopen="shl_load" else echo "$ac_t""no" 1>&6 ! echo $ac_n "checking for LoadLibrary""... $ac_c" 1>&6 ! echo "$progname:2141: checking for LoadLibrary" >&5 ! if eval "test \"`echo '$''{'ac_cv_func_LoadLibrary'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ! cat > conftest.$ac_ext < /* 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. */ ! char LoadLibrary(); ! ! int main() { ! ! /* The GNU C library defines this for functions which it implements ! to always fail with ENOSYS. Some functions are actually named ! something starting with __ and the normal name is an alias. */ ! #if defined (__stub_LoadLibrary) || defined (__stub___LoadLibrary) ! choke me ! #else ! LoadLibrary(); #endif ; return 0; } EOF ! if { (eval echo $progname:2168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ! eval "ac_cv_func_LoadLibrary=yes" else echo "$progname: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* ! eval "ac_cv_func_LoadLibrary=no" fi rm -f conftest* ! fi ! if eval "test \"`echo '$ac_cv_func_'LoadLibrary`\" = yes"; then echo "$ac_t""yes" 1>&6 ! lt_cv_dlopen="LoadLibrary" else echo "$ac_t""no" 1>&6 fi - fi --- 2430,2479 ---- lt_cv_dlopen="shl_load" else echo "$ac_t""no" 1>&6 ! echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 ! echo "$progname:2387: checking for shl_load in -ldld" >&5 ! ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` ! if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ! ac_save_LIBS="$LIBS" ! LIBS="-ldld $LIBS" ! cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ! eval "ac_cv_lib_$ac_lib_var=yes" else echo "$progname: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* ! eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* ! LIBS="$ac_save_LIBS" ! fi ! if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 ! lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else echo "$ac_t""no" 1>&6 fi + fi *************** *** 2207,2223 **** for ac_hdr in dlfcn.h; do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "$progname:2210: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int fnord = 0; EOF ! ac_try="$ac_compile conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo $progname:2220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* --- 2496,2512 ---- for ac_hdr in dlfcn.h; do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "$progname:2452: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int fnord = 0; EOF ! ac_try="$ac_compile >/dev/null 2>conftest.out" ! { (eval echo $progname:2462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* *************** *** 2245,2251 **** LIBS="$lt_cv_dlopen_libs $LIBS" echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 ! echo "$progname:2248: checking whether a program can dlopen itself" >&5 if test "${lt_cv_dlopen_self+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 2534,2540 ---- LIBS="$lt_cv_dlopen_libs $LIBS" echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 ! echo "$progname:2490: checking whether a program can dlopen itself" >&5 if test "${lt_cv_dlopen_self+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 2253,2259 **** lt_cv_dlopen_self=cross else cat > conftest.c < --- 2542,2548 ---- lt_cv_dlopen_self=cross else cat > conftest.c < *************** *** 2296,2305 **** fnord() { int i=42;} main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW); if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord"); ! if(ptr1 || ptr2) exit(0); } exit(1); } EOF ! if { (eval echo $progname:2302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then lt_cv_dlopen_self=yes else --- 2585,2594 ---- fnord() { int i=42;} main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW); if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord"); ! if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } EOF ! if { (eval echo $progname:2544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then lt_cv_dlopen_self=yes else *************** *** 2318,2324 **** if test "$lt_cv_dlopen_self" = yes; then LDFLAGS="$LDFLAGS $link_static_flag" echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 ! echo "$progname:2321: checking whether a statically linked program can dlopen itself" >&5 if test "${lt_cv_dlopen_self_static+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 2607,2613 ---- if test "$lt_cv_dlopen_self" = yes; then LDFLAGS="$LDFLAGS $link_static_flag" echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 ! echo "$progname:2563: checking whether a statically linked program can dlopen itself" >&5 if test "${lt_cv_dlopen_self_static+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 2326,2332 **** lt_cv_dlopen_self_static=cross else cat > conftest.c < --- 2615,2621 ---- lt_cv_dlopen_self_static=cross else cat > conftest.c < *************** *** 2369,2378 **** fnord() { int i=42;} main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW); if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord"); ! if(ptr1 || ptr2) exit(0); } exit(1); } EOF ! if { (eval echo $progname:2375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then lt_cv_dlopen_self_static=yes else --- 2658,2667 ---- fnord() { int i=42;} main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW); if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord"); ! if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } EOF ! if { (eval echo $progname:2617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then lt_cv_dlopen_self_static=yes else *************** *** 2416,2423 **** case "$ltmain" in *.sh) # Now quote all the things that may contain metacharacters. ! for var in ltecho old_CC old_CFLAGS old_CPPFLAGS old_LD old_NM old_RANLIB \ ! old_LN_S old_DLLTOOL old_AS AR CC LD LN_S NM LTSHELL LTCONFIG_VERSION \ reload_flag reload_cmds wl \ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ thread_safe_flag_spec whole_archive_flag_spec libname_spec \ --- 2705,2714 ---- case "$ltmain" in *.sh) # Now quote all the things that may contain metacharacters. ! for var in ltecho old_CC old_CFLAGS old_CPPFLAGS \ ! old_LD old_LDFLAGS old_LIBS \ ! old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS \ ! AR CC LD LN_S NM LTSHELL LTCONFIG_VERSION \ reload_flag reload_cmds wl \ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ thread_safe_flag_spec whole_archive_flag_spec libname_spec \ *************** *** 2462,2468 **** # NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh. # # Copyright (C) 1996-1999 Free Software Foundation, Inc. ! # Gordon Matzigkeit , 1996 # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by --- 2753,2759 ---- # NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh. # # Copyright (C) 1996-1999 Free Software Foundation, Inc. ! # Originally by Gordon Matzigkeit , 1996 # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by *************** *** 2488,2494 **** # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. ! if test "\${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi ### BEGIN LIBTOOL CONFIG EOF --- 2779,2785 ---- # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. ! if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi ### BEGIN LIBTOOL CONFIG EOF *************** *** 2497,2504 **** *) # Double-quote the variables that need it (for aesthetics). ! for var in old_CC old_CFLAGS old_CPPFLAGS old_LD old_NM old_RANLIB \ ! old_LN_S old_DLLTOOL old_AS; do eval "$var=\\\"\$var\\\"" done --- 2788,2796 ---- *) # Double-quote the variables that need it (for aesthetics). ! for var in old_CC old_CFLAGS old_CPPFLAGS \ ! old_LD old_LDFLAGS old_LIBS \ ! old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS; do eval "$var=\\\"\$var\\\"" done *************** *** 2518,2525 **** # Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # # CC=$old_CC CFLAGS=$old_CFLAGS CPPFLAGS=$old_CPPFLAGS \\ ! # LD=$old_LD NM=$old_NM RANLIB=$old_RANLIB LN_S=$old_LN_S \\ ! # DLLTOOL="$old_DLLTOOL" AS="$old_AS" \\ # $0$ltconfig_args # # Compiler and other test output produced by $progname, useful for --- 2810,2818 ---- # Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # # CC=$old_CC CFLAGS=$old_CFLAGS CPPFLAGS=$old_CPPFLAGS \\ ! # LD=$old_LD LDFLAGS=$old_LDFLAGS LIBS=$old_LIBS \\ ! # NM=$old_NM RANLIB=$old_RANLIB LN_S=$old_LN_S \\ ! # DLLTOOL=$old_DLLTOOL OBJDUMP=$old_OBJDUMP AS=$old_AS \\ # $0$ltconfig_args # # Compiler and other test output produced by $progname, useful for *************** *** 2565,2570 **** --- 2858,2866 ---- # Used on cygwin: DLL creation program. DLLTOOL="$DLLTOOL" + # Used on cygwin: object dumper. + OBJDUMP="$OBJDUMP" + # Used on cygwin: assembler. AS="$AS" *************** *** 2584,2593 **** # Old archive suffix (normally "a"). libext="$libext" # Additional compiler flags for building library objects. pic_flag=$pic_flag ! # Does compiler simultaneously support -c and -o options compiler_c_o=$compiler_c_o # Can we write directly to a .lo ? --- 2880,2892 ---- # Old archive suffix (normally "a"). libext="$libext" + # Executable file suffix (normally ""). + exeext="$exeext" + # Additional compiler flags for building library objects. pic_flag=$pic_flag ! # Does compiler simultaneously support -c and -o options? compiler_c_o=$compiler_c_o # Can we write directly to a .lo ? *************** *** 2657,2663 **** # Method to check whether dependent libraries are shared objects. deplibs_check_method=$deplibs_check_method ! # Command to use when deplibs_check_method == file_magic file_magic_cmd=$file_magic_cmd # Flag that allows shared libraries with undefined symbols to be built. --- 2956,2962 ---- # Method to check whether dependent libraries are shared objects. deplibs_check_method=$deplibs_check_method ! # Command to use when deplibs_check_method == file_magic. file_magic_cmd=$file_magic_cmd # Flag that allows shared libraries with undefined symbols to be built. *************** *** 2718,2733 **** # Fix the shell variable \$srcfile for the compiler. fix_srcfile_path="$fix_srcfile_path" ! # Set to yes if exported symbols are required always_export_symbols=$always_export_symbols ! # The command to extract exported symbols export_symbols_cmds=$export_symbols_cmds ! # Symbols that should not be listed in the preloaded symbols exclude_expsyms=$exclude_expsyms ! # Symbols that must always be exported include_expsyms=$include_expsyms EOF --- 3017,3032 ---- # Fix the shell variable \$srcfile for the compiler. fix_srcfile_path="$fix_srcfile_path" ! # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols ! # The commands to list exported symbols. export_symbols_cmds=$export_symbols_cmds ! # Symbols that should not be listed in the preloaded symbols. exclude_expsyms=$exclude_expsyms ! # Symbols that must always be exported. include_expsyms=$include_expsyms EOF *************** *** 2743,2749 **** # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. ! if test "${COLLECT_NAMES+set}" != set; then COLLECT_NAMES= export COLLECT_NAMES fi --- 3042,3048 ---- # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. ! if test "X${COLLECT_NAMES+set}" != Xset; then COLLECT_NAMES= export COLLECT_NAMES fi *************** *** 2752,2758 **** esac # Append the ltmain.sh script. ! cat "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1) chmod +x "$ofile" ;; --- 3051,3061 ---- esac # Append the ltmain.sh script. ! sed '$q' "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1) ! # We use sed instead of cat because bash on DJGPP gets confused if ! # if finds mixed CR/LF and LF-only lines. Since sed operates in ! # text mode, it properly converts lines to CR/LF. This bash problem ! # is reportedly fixed, but why not run on old versions too? chmod +x "$ofile" ;; Index: gimp-1.0.4/ltmain.sh diff -c gimp-1.0.4/ltmain.sh:1.1.1.1 gimp-1.0.4/ltmain.sh:1.2 *** gimp-1.0.4/ltmain.sh:1.1.1.1 Mon Sep 11 15:17:41 2000 --- gimp-1.0.4/ltmain.sh Mon Sep 11 16:22:29 2000 *************** *** 2,8 **** # NOTE: Changing this file will not affect anything until you rerun ltconfig. # # Copyright (C) 1996-1999 Free Software Foundation, Inc. ! # Gordon Matzigkeit , 1996 # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by --- 2,8 ---- # NOTE: Changing this file will not affect anything until you rerun ltconfig. # # Copyright (C) 1996-1999 Free Software Foundation, Inc. ! # Originally by Gordon Matzigkeit , 1996 # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by *************** *** 28,39 **** # Discard the --no-reexec flag, and continue. shift elif test "X$1" = X--fallback-echo; then ! # used as fallback echo ! shift ! cat </dev/null`" = 'X\t'; then # Yippee, $echo works! : --- 28,35 ---- # Discard the --no-reexec flag, and continue. shift elif test "X$1" = X--fallback-echo; then ! # Avoid inline document here, it may be left over ! : elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then # Yippee, $echo works! : *************** *** 42,47 **** --- 38,52 ---- exec $SHELL "$0" --no-reexec ${1+"$@"} fi + if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat < # + # #ifndef __CYGWIN__ + # # ifdef __CYGWIN32__ + # # define __CYGWIN__ __CYGWIN32__ + # # endif + # #endif + # + # #ifdef __cplusplus + # extern "C" { + # #endif # BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); + # #ifdef __cplusplus + # } + # #endif # + # #ifdef __CYGWIN__ # #include # DECLARE_CYGWIN_DLL( DllMain ); + # #endif # HINSTANCE __hDllInstance_base; # # BOOL APIENTRY *************** *** 780,787 **** allow_undefined=yes ;; esac ! compile_command="$CC" ! finalize_command="$CC" compile_rpath= finalize_rpath= --- 808,815 ---- allow_undefined=yes ;; esac ! compile_command="$nonopt" ! finalize_command="$nonopt" compile_rpath= finalize_rpath= *************** *** 815,820 **** --- 843,849 ---- ltlibs= module=no objs= + prefer_static_libs=no preload=no prev= prevarg= *************** *** 831,841 **** do case "$arg" in -all-static | -static) ! if test "X$arg" = "X-all-static" && test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 fi build_libtool_libs=no build_old_libs=yes break ;; esac --- 860,880 ---- do case "$arg" in -all-static | -static) ! if test "X$arg" = "X-all-static"; then ! if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 + fi + if test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + else + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi fi build_libtool_libs=no build_old_libs=yes + prefer_static_libs=yes break ;; esac *************** *** 868,885 **** fi case "$arg" in *.la | *.lo) ;; # We handle these cases below. self) if test "$prev" = dlprefiles; then dlself=yes elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then dlself=yes fi prev= continue ;; *) ! dlprefiles="$dlprefiles $arg" ! test "$prev" = dlfiles && dlfiles="$dlfiles $arg" prev= ;; esac --- 907,938 ---- fi case "$arg" in *.la | *.lo) ;; # We handle these cases below. + force) + if test "$dlself" = no; then + dlself=needless + export_dynamic=yes + fi + prev= + continue + ;; self) if test "$prev" = dlprefiles; then dlself=yes elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then dlself=yes + else + dlself=needless + export_dynamic=yes fi prev= continue ;; *) ! if test "$prev" = dlfiles; then ! dlfiles="$dlfiles $arg" ! else ! dlprefiles="$dlprefiles $arg" ! fi prev= ;; esac *************** *** 903,915 **** prev= continue ;; ! rpath) ! rpath="$rpath $arg" ! prev= ! continue ! ;; ! xrpath) ! xrpath="$xrpath $arg" prev= continue ;; --- 956,981 ---- prev= continue ;; ! rpath | xrpath) ! # We need an absolute path. ! case "$arg" in ! [\\/]* | [A-Za-z]:[\\/]*) ;; ! *) ! $echo "$modename: only absolute run-paths are allowed" 1>&2 ! exit 1 ! ;; ! esac ! if test "$prev" = rpath; then ! case "$rpath " in ! *" $arg "*) ;; ! *) rpath="$rpath $arg" ;; ! esac ! else ! case "$xrpath " in ! *" $arg "*) ;; ! *) xrpath="$xrpath $arg" ;; ! esac ! fi prev= continue ;; *************** *** 928,934 **** if test -n "$link_static_flag"; then compile_command="$compile_command $link_static_flag" finalize_command="$finalize_command $link_static_flag" - dlopen_self=$dlopen_self_static fi continue ;; --- 994,999 ---- *************** *** 955,976 **** ;; -export-dynamic) ! if test "$export_dynamic" != yes; then ! export_dynamic=yes ! if test -n "$export_dynamic_flag_spec"; then ! eval arg=\"$export_dynamic_flag_spec\" ! else ! arg= ! fi ! fi ;; -export-symbols | -export-symbols-regex) if test -n "$export_symbols" || test -n "$export_symbols_regex"; then ! $echo "$modename: cannot have more than one -exported-symbols" exit 1 fi ! if test "$arg" = "-export-symbols"; then prev=expsyms else prev=expsyms_regex --- 1020,1035 ---- ;; -export-dynamic) ! export_dynamic=yes ! continue ;; -export-symbols | -export-symbols-regex) if test -n "$export_symbols" || test -n "$export_symbols_regex"; then ! $echo "$modename: not more than one -exported-symbols argument allowed" exit 1 fi ! if test "X$arg" = "X-export-symbols"; then prev=expsyms else prev=expsyms_regex *************** *** 979,992 **** ;; -L*) ! dir=`$echo "X$arg" | $Xsed -e 's%^-L\(.*\)$%\1%'` case "$dir" in ! /* | [A-Za-z]:[/\\]*) ! # Add the corresponding hardcode_libdir_flag, if it is not identical. ! ;; *) ! $echo "$modename: \`-L$dir' cannot specify a relative directory" 1>&2 ! exit 1 ;; esac case " $deplibs " in --- 1038,1055 ---- ;; -L*) ! dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` ! # We need an absolute path. case "$dir" in ! [\\/]* | [A-Za-z]:[\\/]*) ;; *) ! absdir=`cd "$dir" && pwd` ! if test -z "$absdir"; then ! $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 ! $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 ! absdir="$dir" ! fi ! dir="$absdir" ;; esac case " $deplibs " in *************** *** 1010,1029 **** ;; -l*) deplibs="$deplibs $arg" ;; -module) ! if test "$module" != yes; then ! module=yes ! if test -n "$export_dynamic_flag_spec"; then ! eval arg=\"$export_dynamic_flag_spec\" ! else ! arg= ! fi ! fi ;; ! -no-undefined) allow_undefined=no continue --- 1073,1101 ---- ;; -l*) + if test "$arg" = "-lc"; then + case "$host" in + *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) + # These systems don't actually have c library (as such) + continue + ;; + esac + elif test "$arg" = "-lm"; then + case "$host" in + *-*-cygwin* | *-*-beos*) + # These systems don't actually have math library (as such) + continue + ;; + esac + fi deplibs="$deplibs $arg" ;; -module) ! module=yes ! continue ;; ! -no-undefined) allow_undefined=no continue *************** *** 1047,1053 **** ;; -R*) ! xrpath="$xrpath "`$echo "X$arg" | $Xsed -e 's/^-R//'` continue ;; --- 1119,1137 ---- ;; -R*) ! dir=`$echo "X$arg" | $Xsed -e 's/^-R//'` ! # We need an absolute path. ! case "$dir" in ! [\\/]* | [A-Za-z]:[\\/]*) ;; ! *) ! $echo "$modename: only absolute run-paths are allowed" 1>&2 ! exit 1 ! ;; ! esac ! case "$xrpath " in ! *" $dir "*) ;; ! *) xrpath="$xrpath $dir" ;; ! esac continue ;; *************** *** 1056,1062 **** if test -z "$pic_flag" && test -n "$link_static_flag"; then compile_command="$compile_command $link_static_flag" finalize_command="$finalize_command $link_static_flag" - dlopen_self=$dlopen_self_static fi continue ;; --- 1140,1145 ---- *************** *** 1128,1133 **** --- 1211,1217 ---- # it will not redefine variable installed. installed=yes + # Read the .la file # If there is no directory component, then add one. case "$arg" in */* | *\\*) . $arg ;; *************** *** 1160,1166 **** fi if test -n "$dependency_libs"; then ! # Extract -R from dependency_libs temp_deplibs= for deplib in $dependency_libs; do case "$deplib" in --- 1244,1250 ---- fi if test -n "$dependency_libs"; then ! # Extract -R and -L from dependency_libs temp_deplibs= for deplib in $dependency_libs; do case "$deplib" in *************** *** 1172,1178 **** -L*) case "$compile_command $temp_deplibs " in *" $deplib "*) ;; *) temp_deplibs="$temp_deplibs $deplib";; ! esac;; *) temp_deplibs="$temp_deplibs $deplib";; esac done --- 1256,1268 ---- -L*) case "$compile_command $temp_deplibs " in *" $deplib "*) ;; *) temp_deplibs="$temp_deplibs $deplib";; ! esac ! temp_dir=`$echo "X$deplib" | $Xsed -e 's/^-L//'` ! case " $lib_search_path " in ! *" $temp_dir "*) ;; ! *) lib_search_path="$lib_search_path $temp_dir";; ! esac ! ;; *) temp_deplibs="$temp_deplibs $deplib";; esac done *************** *** 1218,1224 **** prev= fi ! if test "$build_libtool_libs" = yes && test -n "$library_names"; then link_against_libtool_libs="$link_against_libtool_libs $arg" if test -n "$shlibpath_var"; then # Make sure the rpath contains only unique directories. --- 1308,1315 ---- prev= fi ! if test -n "$library_names" && ! { test "$prefer_static_libs" = no || test -z "$old_library"; }; then link_against_libtool_libs="$link_against_libtool_libs $arg" if test -n "$shlibpath_var"; then # Make sure the rpath contains only unique directories. *************** *** 1230,1241 **** # We need an absolute path. case "$dir" in ! /* | [A-Za-z]:[/\\]*) absdir="$dir" ;; *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then ! $echo "$modename: cannot determine absolute directory name of \`$libdir'" 1>&2 ! exit 1 fi ;; esac --- 1321,1333 ---- # We need an absolute path. case "$dir" in ! [\\/] | [A-Za-z]:[\\/]*) absdir="$dir" ;; *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then ! $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 ! $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 ! absdir="$dir" fi ;; esac *************** *** 1244,1267 **** # Skip directories that are in the system default run-time # search path, unless they have been requested with -R. case " $sys_lib_dlsearch_path " in ! *" $absdir "*) ;; *) case "$compile_rpath " in *" $absdir "*) ;; *) compile_rpath="$compile_rpath $absdir" esac ;; ! esac case " $sys_lib_dlsearch_path " in ! *" $libdir "*) ;; *) case "$finalize_rpath " in *" $libdir "*) ;; *) finalize_rpath="$finalize_rpath $libdir" esac ;; ! esac lib_linked=yes case "$hardcode_action" in --- 1336,1359 ---- # Skip directories that are in the system default run-time # search path, unless they have been requested with -R. case " $sys_lib_dlsearch_path " in ! *" $absdir "*) ;; *) case "$compile_rpath " in *" $absdir "*) ;; *) compile_rpath="$compile_rpath $absdir" esac ;; ! esac case " $sys_lib_dlsearch_path " in ! *" $libdir "*) ;; *) case "$finalize_rpath " in *" $libdir "*) ;; *) finalize_rpath="$finalize_rpath $libdir" esac ;; ! esac lib_linked=yes case "$hardcode_action" in *************** *** 1419,1424 **** --- 1511,1522 ---- exit 1 fi + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + eval arg=\"$export_dynamic_flag_spec\" + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" + fi + oldlibs= # calculate the name of the file, without its directory outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` *************** *** 1441,1447 **** $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 fi ! if test -n "$dlfiles$dlprefiles"; then $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 fi --- 1539,1545 ---- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 fi ! if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 fi *************** *** 1461,1467 **** $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 fi ! if test -n "$export_symbols"; then $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2 fi --- 1559,1565 ---- $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 fi ! if test -n "$export_symbols" || test -n "$export_symbols_regex"; then $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2 fi *************** *** 1500,1510 **** output_objdir="$output_objdir/$objdir" fi - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - dlname= - if test -n "$objs"; then $echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1 exit 1 --- 1598,1603 ---- *************** *** 1516,1522 **** exit 1 fi ! if test -n "$dlfiles$dlprefiles"; then $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2 fi --- 1609,1615 ---- exit 1 fi ! if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2 fi *************** *** 1699,1705 **** dependency_libs="$deplibs" case "$host" in ! *-*-cygwin* | *-*-mingw* | *-*-os2*) # these systems don't actually have a c library (as such)! ;; *) --- 1792,1798 ---- dependency_libs="$deplibs" case "$host" in ! *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) # these systems don't actually have a c library (as such)! ;; *) *************** *** 1747,1758 **** droppeddeps=no case "$deplibs_check_method" in pass_all) newdeplibs=$deplibs ! ;; # Don't check for shared/static. Everything works. ! # This might be a little naive. We might want to check ! # whether the library exists or not. But this is on ! # osf3 & osf4 and I'm not really sure... Just ! # implementing what was already the behaviour. test_compile) # This code stresses the "libraries are programs" paradigm to its # limits. Maybe even breaks it. We compile a program, linking it --- 1840,1852 ---- droppeddeps=no case "$deplibs_check_method" in pass_all) + # Don't check for shared/static. Everything works. + # This might be a little naive. We might want to check + # whether the library exists or not. But this is on + # osf3 & osf4 and I'm not really sure... Just + # implementing what was already the behaviour. newdeplibs=$deplibs ! ;; test_compile) # This code stresses the "libraries are programs" paradigm to its # limits. Maybe even breaks it. We compile a program, linking it *************** *** 1763,1769 **** int main() { return 0; } EOF $rm conftest ! $C_compiler -o conftest conftest.c $deplibs if test $? -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do --- 1857,1863 ---- int main() { return 0; } EOF $rm conftest ! $CC -o conftest conftest.c $deplibs if test $? -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do *************** *** 1796,1819 **** # If $name is empty we are operating on a -L argument. if test "$name" != "" ; then $rm conftest ! $C_compiler -o conftest conftest.c $i # Did it work? if test $? -eq 0 ; then ldd_output=`ldd conftest` ! libname=`eval \\$echo \"$libname_spec\"` ! deplib_matches=`eval \\$echo \"$library_names_spec\"` ! set dummy $deplib_matches ! deplib_match=$2 ! if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then ! newdeplibs="$newdeplibs $i" ! else ! droppeddeps=yes ! echo ! echo "*** Warning: This library needs some functionality provided by $i." ! echo "*** I have the capability to make that library automatically link in when" ! echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have." ! fi else droppeddeps=yes echo --- 1890,1913 ---- # If $name is empty we are operating on a -L argument. if test "$name" != "" ; then $rm conftest ! $CC -o conftest conftest.c $i # Did it work? if test $? -eq 0 ; then ldd_output=`ldd conftest` ! libname=`eval \\$echo \"$libname_spec\"` ! deplib_matches=`eval \\$echo \"$library_names_spec\"` ! set dummy $deplib_matches ! deplib_match=$2 ! if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then ! newdeplibs="$newdeplibs $i" ! else ! droppeddeps=yes ! echo ! echo "*** Warning: This library needs some functionality provided by $i." ! echo "*** I have the capability to make that library automatically link in when" ! echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have." ! fi else droppeddeps=yes echo *************** *** 1827,1833 **** fi done fi - deplibs=$newdeplibs ;; file_magic*) set dummy $deplibs_check_method --- 1921,1926 ---- *************** *** 1841,1847 **** potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do # Follow soft links. ! if ls -lLd "$potlib" 2>/dev/null \ | grep " -> " >/dev/null; then continue fi --- 1934,1940 ---- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do # Follow soft links. ! if ls -lLd "$potent_lib" 2>/dev/null \ | grep " -> " >/dev/null; then continue fi *************** *** 1854,1864 **** while test -h "$potlib" 2>/dev/null; do potliblink=`ls -ld $potlib | sed 's/.* -> //'` case "$potliblink" in ! /*) potlib="$potliblink";; *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; esac done ! if eval $file_magic_cmd \"\$potlib\" \ | sed 10q \ | egrep "$file_magic_regex" > /dev/null; then newdeplibs="$newdeplibs $a_deplib" --- 1947,1957 ---- while test -h "$potlib" 2>/dev/null; do potliblink=`ls -ld $potlib | sed 's/.* -> //'` case "$potliblink" in ! [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; esac done ! if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ | sed 10q \ | egrep "$file_magic_regex" > /dev/null; then newdeplibs="$newdeplibs $a_deplib" *************** *** 1881,1887 **** fi done # Gone through all deplibs. ;; ! none | unknown | *) newdeplibs="" if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ -e 's/ -[LR][^ ]*//g' -e 's/[ ]//g' | grep . >/dev/null; then --- 1974,1981 ---- fi done # Gone through all deplibs. ;; ! none | unknown | *) ! newdeplibs="" if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ -e 's/ -[LR][^ ]*//g' -e 's/[ ]//g' | grep . >/dev/null; then *************** *** 1923,1943 **** else build_libtool_libs=no fi - dlname= - library_names= else echo "*** The inter-library dependencies that have been dropped here will be" echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." fi fi fi ! # test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then - deplibs=$newdeplibs - # Done checking deplibs! - # Get the real and link names of the library. eval library_names=\"$library_names_spec\" set dummy $library_names --- 2017,2039 ---- else build_libtool_libs=no fi else echo "*** The inter-library dependencies that have been dropped here will be" echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." fi fi + # Done checking deplibs! + deplibs=$newdeplibs fi ! # All the library-specific variables (install_libdir is set above). ! library_names= ! old_library= ! dlname= ! ! # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then # Get the real and link names of the library. eval library_names=\"$library_names_spec\" set dummy $library_names *************** *** 1957,2008 **** done # Ensure that we have .o objects for linkers which dislike .lo ! # (e.g. aix) incase we are running --disable-static for obj in $libobjs; do ! oldobj=`$echo "X$obj" | $Xsed -e "$lo2o"` ! test -f $oldobj || ${LN_S} $obj $oldobj done # Use standard objects if they are pic test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - if test -n "$whole_archive_flag_spec"; then - if test -n "$convenience"; then - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - fi - else - for xlib in $convenience; do - # Extract the objects. - xdir="$xlib"x - generated="$generated $xdir" - xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` - - $show "${rm}r $xdir" - $run ${rm}r "$xdir" - $show "mkdir $xdir" - $run mkdir "$xdir" - status=$? - if test $status -ne 0 && test ! -d "$xdir"; then - exit $status - fi - $show "(cd $xdir && $AR x ../$xlib)" - $run eval "(cd \$xdir && $AR x ../\$xlib)" || exit $? - - libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` - done - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - - linkopts="$linkopts $flag" - fi - # Prepare the list of exported symbols if test -z "$export_symbols"; then if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then $show "generating symbol list for \`$libname.la'" ! export_symbols="$objdir/$libname.exp" $run $rm $export_symbols eval cmds=\"$export_symbols_cmds\" IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' --- 2053,2082 ---- done # Ensure that we have .o objects for linkers which dislike .lo ! # (e.g. aix) in case we are running --disable-static for obj in $libobjs; do ! xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` ! if test "X$xdir" = "X$obj"; then ! xdir="." ! else ! xdir="$xdir" ! fi ! baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` ! oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` ! if test ! -f $xdir/$oldobj; then ! $show "(cd $xdir && ${LN_S} $baseobj $oldobj)" ! $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $? ! fi done # Use standard objects if they are pic test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` # Prepare the list of exported symbols if test -z "$export_symbols"; then if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then $show "generating symbol list for \`$libname.la'" ! export_symbols="$output_objdir/$libname.exp" $run $rm $export_symbols eval cmds=\"$export_symbols_cmds\" IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' *************** *** 2025,2030 **** --- 2099,2149 ---- $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' fi + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + else + gentop="$output_objdir/${outputname}x" + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + $show "mkdir $gentop" + $run mkdir "$gentop" + status=$? + if test $status -ne 0 && test ! -d "$gentop"; then + exit $status + fi + generated="$generated $gentop" + + for xlib in $convenience; do + # Extract the objects. + case "$xlib" in + [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; + *) xabs=`pwd`"/$xlib" ;; + esac + xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` + xdir="$gentop/$xlib" + + $show "${rm}r $xdir" + $run ${rm}r "$xdir" + $show "mkdir $xdir" + $run mkdir "$xdir" + status=$? + if test $status -ne 0 && test ! -d "$xdir"; then + exit $status + fi + $show "(cd $xdir && $AR x $xabs)" + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + + libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` + done + fi + fi + + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + eval flag=\"$thread_safe_flag_spec\" + linkopts="$linkopts $flag" + fi + # Do each of the archive commands. if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then eval cmds=\"$archive_expsym_cmds\" *************** *** 2065,2071 **** $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 fi ! if test -n "$dlfiles$dlprefiles"; then $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 fi --- 2184,2190 ---- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 fi ! if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 fi *************** *** 2103,2110 **** # Delete the old objects. $run $rm $obj $libobj # Create the old-style object. ! reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP` output="$obj" eval cmds=\"$reload_cmds\" --- 2222,2279 ---- # Delete the old objects. $run $rm $obj $libobj + # Objects from convenience libraries. This assumes + # single-version convenience libraries. Whenever we create + # different ones for PIC/non-PIC, this we'll have to duplicate + # the extraction. + reload_conv_objs= + gentop= + # reload_cmds runs $LD directly, so let us get rid of + # -Wl from whole_archive_flag_spec + wl= + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then + eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" + else + gentop="$output_objdir/${obj}x" + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + $show "mkdir $gentop" + $run mkdir "$gentop" + status=$? + if test $status -ne 0 && test ! -d "$gentop"; then + exit $status + fi + generated="$generated $gentop" + + for xlib in $convenience; do + # Extract the objects. + case "$xlib" in + [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; + *) xabs=`pwd`"/$xlib" ;; + esac + xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` + xdir="$gentop/$xlib" + + $show "${rm}r $xdir" + $run ${rm}r "$xdir" + $show "mkdir $xdir" + $run mkdir "$xdir" + status=$? + if test $status -ne 0 && test ! -d "$xdir"; then + exit $status + fi + $show "(cd $xdir && $AR x $xabs)" + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + + reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` + done + fi + fi + # Create the old-style object. ! reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" output="$obj" eval cmds=\"$reload_cmds\" *************** *** 2117,2125 **** IFS="$save_ifs" # Exit if we aren't doing a library object file. ! test -z "$libobj" && exit 0 if test "$build_libtool_libs" != yes; then # Create an invalid libtool object if no PIC, so that we don't # accidentally link it into a program. $show "echo timestamp > $libobj" --- 2286,2306 ---- IFS="$save_ifs" # Exit if we aren't doing a library object file. ! if test -z "$libobj"; then ! if test -n "$gentop"; then ! $show "${rm}r $gentop" ! $run ${rm}r $gentop ! fi + exit 0 + fi + if test "$build_libtool_libs" != yes; then + if test -n "$gentop"; then + $show "${rm}r $gentop" + $run ${rm}r $gentop + fi + # Create an invalid libtool object if no PIC, so that we don't # accidentally link it into a program. $show "echo timestamp > $libobj" *************** *** 2129,2135 **** if test -n "$pic_flag"; then # Only do commands if we really have different PIC objects. ! reload_objs="$libobjs" output="$libobj" eval cmds=\"$reload_cmds\" IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' --- 2310,2316 ---- if test -n "$pic_flag"; then # Only do commands if we really have different PIC objects. ! reload_objs="$libobjs $reload_conv_objs" output="$libobj" eval cmds=\"$reload_cmds\" IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' *************** *** 2143,2152 **** # Just create a symlink. $show $rm $libobj $run $rm $libobj ! $show "$LN_S $obj $libobj" ! $run $LN_S $obj $libobj || exit $? fi exit 0 ;; --- 2324,2346 ---- # Just create a symlink. $show $rm $libobj $run $rm $libobj ! xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'` ! if test "X$xdir" = "X$libobj"; then ! xdir="." ! else ! xdir="$xdir" ! fi ! baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'` ! oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` ! $show "(cd $xdir && $LN_S $oldobj $baseobj)" ! $run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $? fi + if test -n "$gentop"; then + $show "${rm}r $gentop" + $run ${rm}r $gentop + fi + exit 0 ;; *************** *** 2167,2177 **** fi fi - if test "$dlself" = yes && test "$export_dynamic" = no; then - $echo "$modename: error: \`-dlopen self' requires \`-export-dynamic'" 1>&2 - exit 1 - fi - if test -n "$rpath$xrpath"; then # If the user specified any rpath flags, then add them. for libdir in $rpath $xrpath; do --- 2361,2366 ---- *************** *** 2207,2213 **** fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" fi elif test -n "$runpath_var"; then --- 2396,2401 ---- *************** *** 2244,2250 **** fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" fi elif test -n "$runpath_var"; then --- 2432,2437 ---- *************** *** 2269,2274 **** --- 2456,2471 ---- output_objdir="$output_objdir/$objdir" fi + # Create the binary in the object directory, then wrap it. + if test ! -d $output_objdir; then + $show "$mkdir $output_objdir" + $run $mkdir $output_objdir + status=$? + if test $status -ne 0 && test ! -d $output_objdir; then + exit $status + fi + fi + if test -n "$libobjs" && test "$build_old_libs" = yes; then # Transform all the library objects into standard objects. compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` *************** *** 2276,2282 **** fi dlsyms= ! if test -n "$dlfiles$dlprefiles" || test "$dlself" = yes; then if test -n "$NM" && test -n "$global_symbol_pipe"; then dlsyms="${outputname}S.c" else --- 2473,2479 ---- fi dlsyms= ! if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then if test -n "$NM" && test -n "$global_symbol_pipe"; then dlsyms="${outputname}S.c" else *************** *** 2289,2312 **** "") ;; *.c) # Discover the nlist of each of the dlfiles. ! nlist="$objdir/${output}.nm" ! if test -d $objdir; then ! $show "$rm $nlist ${nlist}S ${nlist}T" ! $run $rm "$nlist" "${nlist}S" "${nlist}T" ! else ! $show "$mkdir $objdir" ! $run $mkdir $objdir ! status=$? ! if test $status -ne 0 && test ! -d $objdir; then ! exit $status ! fi ! fi # Parse the name list into a source file. ! $show "creating $objdir/$dlsyms" ! $echo > "$objdir/$dlsyms" "\ /* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */ /* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */ --- 2486,2500 ---- "") ;; *.c) # Discover the nlist of each of the dlfiles. ! nlist="$output_objdir/${outputname}.nm" ! $show "$rm $nlist ${nlist}S ${nlist}T" ! $run $rm "$nlist" "${nlist}S" "${nlist}T" # Parse the name list into a source file. ! $show "creating $output_objdir/$dlsyms" ! test -z "$run" && $echo > "$output_objdir/$dlsyms" "\ /* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */ /* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */ *************** *** 2323,2329 **** if test "$dlself" = yes; then $show "generating symbol list for \`$output'" ! echo ': @PROGRAM@ ' > "$nlist" # Add our own program objects to the symbol list. progfiles=`$echo "X$objs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` --- 2511,2517 ---- if test "$dlself" = yes; then $show "generating symbol list for \`$output'" ! test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist" # Add our own program objects to the symbol list. progfiles=`$echo "X$objs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` *************** *** 2344,2356 **** # Prepare the list of exported symbols if test -z "$export_symbols"; then ! export_symbols="$objdir/$output.exp" $run $rm $export_symbols $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' else ! $run $rm $export_symbols ! $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$objdir/$output.exp"' ! $run eval 'grep -f "$objdir/$output.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' fi fi --- 2532,2543 ---- # Prepare the list of exported symbols if test -z "$export_symbols"; then ! export_symbols="$output_objdir/$output.exp" $run $rm $export_symbols $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' else ! $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' ! $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' fi fi *************** *** 2426,2451 **** fi pic_flag_for_symtable= ! case "$host" in # compiling the symbol table file with pic_flag works around # a FreeBSD bug that causes programs to crash when -lm is # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. ! *-*-freebsd2*|*-*-freebsd3.0*) case "$compile_command " in *" -static "*) ;; *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";; esac esac # Now compile the dynamic symbol file. ! $show "(cd $objdir && $C_compiler -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" ! $run eval '(cd $objdir && $C_compiler -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? # Transform the symbol file into the correct name. ! compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.${objext}%"` ! finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.${objext}%"` ;; *) $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 --- 2613,2647 ---- fi pic_flag_for_symtable= ! case "$host" in # compiling the symbol table file with pic_flag works around # a FreeBSD bug that causes programs to crash when -lm is # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. ! *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) case "$compile_command " in *" -static "*) ;; *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";; + esac;; + *-*-hpux*) + case "$compile_command " in + *" -static "*) ;; + *) pic_flag_for_symtable=" $pic_flag -DPIC";; esac esac # Now compile the dynamic symbol file. ! $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" ! $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? + # Clean up the generated files. + $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" + $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" + # Transform the symbol file into the correct name. ! compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` ! finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` ;; *) $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 *************** *** 2470,2476 **** # We have no uninstalled library dependencies, so finalize right now. $show "$link_command" $run eval "$link_command" ! exit $? fi if test -n "$shlibpath_var"; then --- 2666,2680 ---- # We have no uninstalled library dependencies, so finalize right now. $show "$link_command" $run eval "$link_command" ! status=$? ! ! # Delete the generated files. ! if test -n "$dlsyms"; then ! $show "$rm $output_objdir/${outputname}S.${objext}" ! $run $rm "$output_objdir/${outputname}S.${objext}" ! fi ! ! exit $status fi if test -n "$shlibpath_var"; then *************** *** 2478,2484 **** rpath= for dir in $temp_rpath; do case "$dir" in ! /* | [A-Za-z]:[/\\]*) # Absolute path. rpath="$rpath$dir:" ;; --- 2682,2688 ---- rpath= for dir in $temp_rpath; do case "$dir" in ! [\\/]* | [A-Za-z]:[\\/]*) # Absolute path. rpath="$rpath$dir:" ;; *************** *** 2524,2530 **** link_command="$compile_var$compile_command$compile_rpath" relink_command="$finalize_var$finalize_command$finalize_rpath" - # AGH! Flame the AIX and HP-UX people for me, will ya? $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2 $echo "$modename: \`$output' will be relinked during installation" 1>&2 else --- 2728,2733 ---- *************** *** 2545,2561 **** # Replace the output file specification. link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` ! # Create the binary in the object directory, then wrap it. ! if test ! -d $output_objdir; then ! $show "$mkdir $output_objdir" ! $run $mkdir $output_objdir ! status=$? ! if test $status -ne 0 && test ! -d $objdir; then ! exit $status ! fi ! fi ! ! # Delete the old output file. $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname $show "$link_command" --- 2748,2754 ---- # Replace the output file specification. link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` ! # Delete the old output files. $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname $show "$link_command" *************** *** 2572,2578 **** # Quote $echo for shipping. if test "X$echo" = "X$SHELL $0 --fallback-echo"; then case "$0" in ! /* | [A-Za-z]:[/\\]*) qecho="$SHELL $0 --fallback-echo";; *) qecho="$SHELL `pwd`/$0 --fallback-echo";; esac qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` --- 2765,2771 ---- # Quote $echo for shipping. if test "X$echo" = "X$SHELL $0 --fallback-echo"; then case "$0" in ! [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";; *) qecho="$SHELL `pwd`/$0 --fallback-echo";; esac qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` *************** *** 2609,2615 **** # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. ! if test \"\${CDPATH+set}\" = set; then CDPATH=; export CDPATH; fi relink_command=\"$relink_command\" --- 2802,2808 ---- # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. ! if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi relink_command=\"$relink_command\" *************** *** 2649,2655 **** # If there was a directory component, then change thisdir. if test \"x\$destdir\" != \"x\$file\"; then case \"\$destdir\" in ! /* | [A-Za-z]:[/\\]*) thisdir=\"\$destdir\" ;; *) thisdir=\"\$thisdir/\$destdir\" ;; esac fi --- 2842,2848 ---- # If there was a directory component, then change thisdir. if test \"x\$destdir\" != \"x\$file\"; then case \"\$destdir\" in ! [\\/]* | [A-Za-z]:[\\/]*) thisdir=\"\$destdir\" ;; *) thisdir=\"\$thisdir/\$destdir\" ;; esac fi *************** *** 2787,2817 **** addlibs="$old_convenience" fi ! # Add in members from convenience archives. ! for xlib in $addlibs; do ! # Extract the objects. ! xdir="$xlib"x ! generated="$generated $xdir" ! xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` ! ! $show "${rm}r $xdir" ! $run ${rm}r "$xdir" ! $show "mkdir $xdir" ! $run mkdir "$xdir" status=$? ! if test $status -ne 0 && test ! -d "$xdir"; then exit $status fi ! $show "(cd $xdir && $AR x ../$xlib)" ! $run eval "(cd \$xdir && $AR x ../\$xlib)" || exit $? ! oldobjs="$oldobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` ! done # Do each command in the archive commands. if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then eval cmds=\"$old_archive_from_new_cmds\" else eval cmds=\"$old_archive_cmds\" fi IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' --- 2980,3044 ---- addlibs="$old_convenience" fi ! if test -n "$addlibs"; then ! gentop="$output_objdir/${outputname}x" ! $show "${rm}r $gentop" ! $run ${rm}r "$gentop" ! $show "mkdir $gentop" ! $run mkdir "$gentop" status=$? ! if test $status -ne 0 && test ! -d "$gentop"; then exit $status fi ! generated="$generated $gentop" ! ! # Add in members from convenience archives. ! for xlib in $addlibs; do ! # Extract the objects. ! case "$xlib" in ! [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; ! *) xabs=`pwd`"/$xlib" ;; ! esac ! xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` ! xdir="$gentop/$xlib" ! $show "${rm}r $xdir" ! $run ${rm}r "$xdir" ! $show "mkdir $xdir" ! $run mkdir "$xdir" ! status=$? ! if test $status -ne 0 && test ! -d "$xdir"; then ! exit $status ! fi ! $show "(cd $xdir && $AR x $xabs)" ! $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` + done + fi + # Do each command in the archive commands. if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then eval cmds=\"$old_archive_from_new_cmds\" else + # Ensure that we have .o objects in place in case we decided + # not to build a shared library, and have fallen back to building + # static libs even though --disable-static was passed! + for oldobj in $oldobjs; do + if test ! -f $oldobj; then + xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'` + if test "X$xdir" = "X$oldobj"; then + xdir="." + else + xdir="$xdir" + fi + baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'` + obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"` + $show "(cd $xdir && ${LN_S} $obj $baseobj)" + $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $? + fi + done + eval cmds=\"$old_archive_cmds\" fi IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' *************** *** 2845,2853 **** # Only create the output if not a dry run. if test -z "$run"; then ! $echo > $output "\ ! # $output - a libtool library file # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP # The name that we can dlopen(3). dlname='$dlname' --- 3072,3091 ---- # Only create the output if not a dry run. if test -z "$run"; then ! for installed in no yes; do ! if test "$installed" = yes; then ! if test -z "$install_libdir"; then ! break ! fi ! output="$output_objdir/$outputname"i ! fi ! $rm $output ! $echo > $output "\ ! # $outputname - a libtool library file # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP + # + # Please DO NOT delete this file! + # It is necessary for linking the library. # The name that we can dlopen(3). dlname='$dlname' *************** *** 2867,2881 **** revision=$revision # Is this an already installed library? ! installed=no # Directory that this library needs to be installed in: libdir='$install_libdir'\ " ! ! $rm "$output_objdir/$outputname"i ! sed 's/^installed=no$/installed=yes/' \ ! < "$output" > "$output_objdir/$outputname"i || exit 1 fi # Do a symbolic link so that the libtool archive can be found in --- 3105,3116 ---- revision=$revision # Is this an already installed library? ! installed=$installed # Directory that this library needs to be installed in: libdir='$install_libdir'\ " ! done fi # Do a symbolic link so that the libtool archive can be found in *************** *** 3012,3018 **** fi fi case "$destdir" in ! /* | [A-Za-z]:[/\\]*) ;; *) for file in $files; do case "$file" in --- 3247,3253 ---- fi fi case "$destdir" in ! [\\/]* | [A-Za-z]:[\\/]*) ;; *) for file in $files; do case "$file" in *************** *** 3088,3100 **** # Install the shared library and build the symlinks. $show "$install_prog $dir/$realname $destdir/$realname" $run eval "$install_prog $dir/$realname $destdir/$realname" || exit $? - test "X$dlname" = "X$realname" && dlname= if test $# -gt 0; then # Delete the old symlinks, and create new ones. for linkname do - test "X$dlname" = "X$linkname" && dlname= if test "$linkname" != "$realname"; then $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" --- 3323,3333 ---- *************** *** 3102,3113 **** done fi - if test -n "$dlname"; then - # Install the dynamically-loadable library. - $show "$install_prog $dir/$dlname $destdir/$dlname" - $run eval "$install_prog $dir/$dlname $destdir/$dlname" || exit $? - fi - # Do each command in the postinstall commands. lib="$destdir/$realname" eval cmds=\"$postinstall_cmds\" --- 3335,3340 ---- *************** *** 3123,3134 **** # Install the pseudo-library for information purposes. name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` instname="$dir/$name"i - if test ! -f "$instname"; then - # Just in case it was removed... - $show "Creating $instname" - $rm "$instname" - sed 's/^installed=no$/installed=yes/' "$file" > "$instname" - fi $show "$install_prog $instname $destdir/$name" $run eval "$install_prog $instname $destdir/$name" || exit $? --- 3350,3355 ---- *************** *** 3226,3246 **** outputname= if test "$fast_install" = no && test -n "$relink_command"; then ! if test "$finalize" = yes; then ! outputname="/tmp/$$-$file" # Replace the output file specification. relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` - $echo "$modename: warning: relinking \`$file' on behalf of your buggy system linker" 1>&2 $show "$relink_command" if $run eval "$relink_command"; then : else $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 continue fi file="$outputname" else ! $echo "$modename: warning: cannot relink \`$file' on behalf of your buggy system linker" 1>&2 fi else # Install the binary that we compiled earlier. --- 3447,3475 ---- outputname= if test "$fast_install" = no && test -n "$relink_command"; then ! if test "$finalize" = yes && test -z "$run"; then ! tmpdir="/tmp" ! test -n "$TMPDIR" && tmpdir="$TMPDIR" ! tmpdir="$tmpdir/libtool-$$" ! if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : ! else ! $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 ! continue ! fi ! outputname="$tmpdir/$file" # Replace the output file specification. relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` $show "$relink_command" if $run eval "$relink_command"; then : else $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 + ${rm}r "$tmpdir" continue fi file="$outputname" else ! $echo "$modename: warning: cannot relink \`$file'" 1>&2 fi else # Install the binary that we compiled earlier. *************** *** 3250,3256 **** $show "$install_prog$stripme $file $destfile" $run eval "$install_prog\$stripme \$file \$destfile" || exit $? ! test -n "$outputname" && $rm $outputname ;; esac done --- 3479,3485 ---- $show "$install_prog$stripme $file $destfile" $run eval "$install_prog\$stripme \$file \$destfile" || exit $? ! test -n "$outputname" && ${rm}r "$tmpdir" ;; esac done *************** *** 3476,3483 **** done if test -z "$run"; then ! # Export the shlibpath_var. ! eval "export $shlibpath_var" # Restore saved enviroment variables if test "${save_LC_ALL+set}" = set; then --- 3705,3714 ---- done if test -z "$run"; then ! if test -n "$shlibpath_var"; then ! # Export the shlibpath_var. ! eval "export $shlibpath_var" ! fi # Restore saved enviroment variables if test "${save_LC_ALL+set}" = set; then *************** *** 3494,3501 **** exit 1 else # Display what would be done. ! eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" ! $echo "export $shlibpath_var" $echo "$cmd$args" exit 0 fi --- 3725,3734 ---- exit 1 else # Display what would be done. ! if test -n "$shlibpath_var"; then ! eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" ! $echo "export $shlibpath_var" ! fi $echo "$cmd$args" exit 0 fi *************** *** 3537,3545 **** # Delete the libtool libraries and symlinks. for n in $library_names; do rmfiles="$rmfiles $dir/$n" - test "X$n" = "X$dlname" && dlname= done - test -n "$dlname" && rmfiles="$rmfiles $dir/$dlname" test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library" $show "$rm $rmfiles" --- 3770,3776 ---- *************** *** 3718,3723 **** --- 3949,3956 ---- -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE try to export only the symbols listed in SYMFILE + -export-symbols-regex REGEX + try to export only the symbols matching REGEX -LLIBDIR search LIBDIR for required installed libraries -lNAME OUTPUT-FILE requires the installed library libNAME -module build a library that can dlopened *************** *** 3748,3754 **** ;; uninstall) ! $echo "Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... Remove libraries from an installation directory. --- 3981,3987 ---- ;; uninstall) ! $echo \ "Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... Remove libraries from an installation directory. Index: gimp-1.0.4/libgimp/Makefile.in diff -c gimp-1.0.4/libgimp/Makefile.in:1.1.1.1 gimp-1.0.4/libgimp/Makefile.in:1.3 *** gimp-1.0.4/libgimp/Makefile.in:1.1.1.1 Mon Sep 11 15:17:47 2000 --- gimp-1.0.4/libgimp/Makefile.in Mon Sep 11 16:19:28 2000 *************** *** 163,173 **** AR = ar LTLIBRARIES = $(lib_LTLIBRARIES) ! libgimp_la_LIBADD = libgimp_la_OBJECTS = gimp.lo gimpchannel.lo gimpdisplay.lo \ gimpdrawable.lo gimpgradient.lo gimpimage.lo gimplayer.lo \ gimppalette.lo gimppixelrgn.lo gimpprotocol.lo gimptile.lo gimpwire.lo ! libgimpui_la_LIBADD = libgimpui_la_OBJECTS = gimpmenu.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --- 163,173 ---- AR = ar LTLIBRARIES = $(lib_LTLIBRARIES) ! libgimp_la_LIBADD = $(GTK_LIBS) libgimp_la_OBJECTS = gimp.lo gimpchannel.lo gimpdisplay.lo \ gimpdrawable.lo gimpgradient.lo gimpimage.lo gimplayer.lo \ gimppalette.lo gimppixelrgn.lo gimpprotocol.lo gimptile.lo gimpwire.lo ! libgimpui_la_LIBADD = $(GTK_LIBS) libgimpui_la_OBJECTS = gimpmenu.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)