Index: ChangeLog from Akim Demaille * ltmain.sh: Don't quote the argument of case/esac and assignments. * libtool.m4: Likewise. Index: libtool.m4 =================================================================== RCS file: /cvs/libtool/libtool.m4,v retrieving revision 1.141 diff -u -r1.141 libtool.m4 --- libtool.m4 2000/12/22 23:40:11 1.141 +++ libtool.m4 2001/01/11 17:14:57 @@ -55,7 +55,7 @@ _LT_AC_PROG_ECHO_BACKSLASH # Only perform the check for file, if the check method requires it -case "$deplibs_check_method" in +case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then AC_PATH_MAGIC @@ -76,12 +76,12 @@ # Some flags need to be propagated to the compiler or linker for good # libtool support. -case "$host" in +case $host in *-*-irix6*) # Find out which ABI we are using. echo '[#]line __oline__ "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case "`/usr/bin/file conftest.$ac_objext`" in + case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -125,7 +125,7 @@ DllMain (0, 0, 0);], [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])]) - case "$host/$CC" in + case $host/$CC in *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*) # old mingw systems require "-dll" to link a DLL, while more recent ones # require "-mdll" @@ -179,7 +179,7 @@ lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" # Define system-specific variables. -case "$host_os" in +case $host_os in aix*) [symcode='[BCDT]'] ;; @@ -202,7 +202,7 @@ # Handle CRLF in mingw tool chain opt_cr= -case "$host_os" in +case $host_os in mingw*) opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp ;; @@ -395,8 +395,8 @@ # 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, ... - if (echo_test_string="`eval $cmd`") 2>/dev/null && - echo_test_string="`eval $cmd`" && + if (echo_test_string=`eval $cmd`) 2>/dev/null && + echo_test_string=`eval $cmd` && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then break @@ -600,7 +600,7 @@ lt_cv_dlopen=no lt_cv_dlopen_libs= - case "$host_os" in + case $host_os in beos*) lt_cv_dlopen="load_add_on" lt_cv_dlopen_libs= @@ -633,7 +633,7 @@ enable_dlopen=no fi - case "$lt_cv_dlopen" in + case $lt_cv_dlopen in dlopen) save_CPPFLAGS="$CPP_FLAGS" AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl @@ -668,12 +668,12 @@ ;; esac - case "$lt_cv_dlopen_self" in + case $lt_cv_dlopen_self in yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; *) enable_dlopen_self=unknown ;; esac - case "$lt_cv_dlopen_self_static" in + case $lt_cv_dlopen_self_static in yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; *) enable_dlopen_self_static=unknown ;; esac @@ -734,12 +734,12 @@ fi # Transform linux* to *-*-linux-gnu*, to support old configure scripts. -case "$host_os" in +case $host_os in linux-gnu*) ;; linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` esac -case "$host_os" in +case $host_os in aix3*) # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems @@ -805,7 +805,7 @@ lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_static='-static' - case "$host_os" in + case $host_os in beos* | irix5* | irix6* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; @@ -840,7 +840,7 @@ esac else # PORTME Check for PIC flags for the system compiler. - case "$host_os" in + case $host_os in aix3* | aix4*) # All AIX code is PIC. lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' @@ -933,7 +933,7 @@ save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" AC_TRY_COMPILE([], [], [dnl - case "$host_os" in + case $host_os in hpux9* | hpux10* | hpux11*) # On HP-UX, both CC and GCC only warn that PIC is supported... then # they create non-PIC objects. So, if there were any warnings, we @@ -1161,7 +1161,7 @@ # preloaded symbol tables. extract_expsyms_cmds= -case "$host_os" in +case $host_os in cygwin* | mingw* | pw32* ) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using @@ -1179,7 +1179,7 @@ wlarc='${wl}' # See if GNU ld supports shared libraries. - case "$host_os" in + case $host_os in aix3* | aix4*) # On AIX, the GNU linker is very broken ld_shlibs=no @@ -1240,7 +1240,7 @@ # FIXME: what about values for MSVC? address@hidden address@hidden,address@hidden,address@hidden - case "$host_os" in + case $host_os in mingw*) # mingw values address@hidden @@ -1359,7 +1359,7 @@ fi else # PORTME fill in a description of your system's linker (not GNU ld) - case "$host_os" in + case $host_os in aix3*) allow_undefined_flag=unsupported always_export_symbols=yes @@ -1402,7 +1402,7 @@ allow_undefined_flag=' ${wl}-berok' archive_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}' archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}' - case "$host_os" in [aix4.[01]|aix4.[01].*]) + case $host_os in [aix4.[01]|aix4.[01].*]) # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on always_export_symbols=yes ;; esac @@ -1478,7 +1478,7 @@ ;; hpux9* | hpux10* | hpux11*) - case "$host_os" in + case $host_os in hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;; *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; esac @@ -1578,7 +1578,7 @@ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' hardcode_libdir_flag_spec='-R$libdir' hardcode_shlibpath_var=no - case "$host_os" in + 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' ;; @@ -1743,7 +1743,7 @@ sys_lib_dlsearch_path_spec="/lib /usr/lib" sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -case "$host_os" in +case $host_os in aix3*) version_type=linux library_names_spec='${libname}${release}.so$versuffix $libname.a' @@ -1821,7 +1821,7 @@ freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat - case "$version_type" in + case $version_type in freebsd-elf*) library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' need_version=no @@ -1833,7 +1833,7 @@ ;; esac shlibpath_var=LD_LIBRARY_PATH - case "$host_os" in + case $host_os in freebsd2*) shlibpath_overrides_runpath=yes ;; @@ -1875,12 +1875,12 @@ 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 + case $host_os in irix5*) libsuff= shlibsuff= ;; *) - case "$LD" in # libtool.m4 will add one of these switches to LD + 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;; @@ -2012,7 +2012,7 @@ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' soname_spec='${libname}${release}.so$major' shlibpath_var=LD_LIBRARY_PATH - case "$host_vendor" in + case $host_vendor in sni) shlibpath_overrides_runpath=no ;; @@ -2086,7 +2086,7 @@ ## FIXME: this should be a separate macro ## if test "$enable_shared" = yes && test "$GCC" = yes; then - case "$archive_cmds" in + case $archive_cmds in *'~'*) # FIXME: we may have to deal with multi-command sequences. ;; @@ -2170,7 +2170,7 @@ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do - case "$var" in + case $var in reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \ old_postinstall_cmds | old_postuninstall_cmds | \ export_symbols_cmds | archive_cmds | archive_expsym_cmds | \ @@ -2472,7 +2472,7 @@ __EOF__ - case "$host_os" in + case $host_os in aix3*) cat <<\EOF >> "${ofile}T" @@ -2487,7 +2487,7 @@ ;; esac - case "$host_os" in + case $host_os in cygwin* | mingw* | pw32* | os2*) cat <<'EOF' >> "${ofile}T" # This is a source program that is used to create dlls on Windows @@ -2699,7 +2699,7 @@ << --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT], changequote([, ])dnl [p=${PACKAGE-default} -case "$enableval" in +case $enableval in yes) enable_shared=yes ;; no) enable_shared=no ;; *) @@ -2733,7 +2733,7 @@ << --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT], changequote([, ])dnl [p=${PACKAGE-default} -case "$enableval" in +case $enableval in yes) enable_static=yes ;; no) enable_static=no ;; *) @@ -2768,7 +2768,7 @@ << --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT], changequote([, ])dnl [p=${PACKAGE-default} -case "$enableval" in +case $enableval in yes) enable_fast_install=yes ;; no) enable_fast_install=no ;; *) @@ -2804,7 +2804,7 @@ AC_DEFUN([AC_PATH_TOOL_PREFIX], [AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case "$MAGIC_CMD" in +[case $MAGIC_CMD in /*) lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ;; @@ -2823,7 +2823,7 @@ if test -f $ac_dir/$1; then lt_cv_path_MAGIC_CMD="$ac_dir/$1" if test -n "$file_magic_test_file"; then - case "$deplibs_check_method" in + case $deplibs_check_method in "file_magic "*) file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" MAGIC_CMD="$lt_cv_path_MAGIC_CMD" @@ -2895,7 +2895,7 @@ *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; esac - case "$ac_prog" in + case $ac_prog in # Accept absolute paths. [[\\/]* | [A-Za-z]:[\\/]*)] [re_direlt='/[^/][^/]*/\.\./'] @@ -2991,7 +2991,7 @@ # If you have `file' or equivalent on your system and you're not sure # whether `pass_all' will *always* work, you probably want this one. -case "$host_os" in +case $host_os in aix4*) lt_cv_deplibs_check_method=pass_all ;; @@ -3019,7 +3019,7 @@ freebsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case "$host_cpu" in + case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. @@ -3044,13 +3044,13 @@ ;; irix5* | irix6*) - case "$host_os" in + case $host_os in irix5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" ;; *) - case "$LD" in + case $LD in *-32|*"-32 ") libmagic=32-bit;; *-n32|*"-n32 ") libmagic=N32;; *-64|*"-64 ") libmagic=64-bit;; @@ -3066,7 +3066,7 @@ # This must be Linux ELF. linux-gnu*) - case "$host_cpu" in + case $host_cpu in alpha* | i*86 | powerpc* | sparc* | ia64* ) lt_cv_deplibs_check_method=pass_all ;; *) @@ -3109,7 +3109,7 @@ ;; sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - case "$host_vendor" in + case $host_vendor in motorola) [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'] lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` @@ -3175,7 +3175,7 @@ AC_DEFUN([AC_CHECK_LIBM], [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= -case "$host" in +case $host in *-*-beos* | *-*-cygwin* | *-*-pw32*) # These system don't have libm ;; @@ -3201,7 +3201,7 @@ # top_srcdir appropriately in the Makefiles. AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - case "$enable_ltdl_convenience" in + case $enable_ltdl_convenience in no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; "") enable_ltdl_convenience=yes ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; Index: ltmain.in =================================================================== RCS file: /cvs/libtool/ltmain.in,v retrieving revision 1.243 diff -u -r1.243 ltmain.in --- ltmain.in 2000/12/20 22:40:59 1.243 +++ ltmain.in 2001/01/11 17:14:57 @@ -107,14 +107,14 @@ arg="$1" shift - case "$arg" in + case $arg in -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; *) optarg= ;; esac # If the previous option needs an argument, assign it. if test -n "$prev"; then - case "$prev" in + case $prev in execute_dlfiles) execute_dlfiles="$execute_dlfiles $arg" ;; @@ -129,7 +129,7 @@ fi # Have we seen a non-optional argument yet? - case "$arg" in + case $arg in --help) show_help=yes ;; @@ -205,12 +205,12 @@ # Infer the operation mode. if test -z "$mode"; then - case "$nonopt" in + case $nonopt in *cc | *++ | gcc* | *-gcc*) mode=link for arg do - case "$arg" in + case $arg in -c) mode=compile break @@ -255,7 +255,7 @@ help="Try \`$modename --help --mode=$mode' for more information." # These modes are in order of execution frequency so that they run quickly. - case "$mode" in + case $mode in # libtool compile mode compile) modename="$modename: compile" @@ -269,14 +269,14 @@ user_target=no for arg do - case "$prev" in + case $prev in "") ;; xcompiler) # Aesthetically quote the previous argument. prev= lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case "$arg" in + case $arg in # Double-quote args containing other shell metacharacters. # Many Bourne shells cannot handle close brackets correctly # in scan sets, so we specify it separately. @@ -296,7 +296,7 @@ esac # Accept any command-line options. - case "$arg" in + case $arg in -o) if test "$user_target" != "no"; then $echo "$modename: you cannot specify \`-o' more than once" 1>&2 @@ -335,7 +335,7 @@ # Double-quote args containing other shell metacharacters. # Many Bourne shells cannot handle close brackets correctly # in scan sets, so we specify it separately. - case "$arg" in + case $arg in *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") arg="\"$arg\"" ;; @@ -355,7 +355,7 @@ ;; esac - case "$user_target" in + case $user_target in next) # The next one is the -o target name user_target=yes @@ -383,7 +383,7 @@ # Double-quote args containing other shell metacharacters. # Many Bourne shells cannot handle close brackets correctly # in scan sets, so we specify it separately. - case "$lastarg" in + case $lastarg in *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") lastarg="\"$lastarg\"" ;; @@ -397,7 +397,7 @@ fi done - case "$user_target" in + case $user_target in set) ;; no) @@ -413,7 +413,7 @@ # Recognize several different file suffixes. # If the user specifies -o file.o, it is replaced with file.lo xform='[cCFSfmso]' - case "$libobj" in + case $libobj in *.ada) xform=ada ;; *.adb) xform=adb ;; *.ads) xform=ads ;; @@ -428,7 +428,7 @@ libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` - case "$libobj" in + case $libobj in *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; *) $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 @@ -453,7 +453,7 @@ trap "$run $rm $removelist; exit 1" 1 2 15 # On Cygwin there's no "real" PIC flag so we must build both object types - case "$host_os" in + case $host_os in cygwin* | mingw* | pw32* | os2*) pic_mode=default ;; @@ -709,7 +709,7 @@ # libtool link mode link | relink) modename="$modename: link" - case "$host" in + case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out @@ -773,7 +773,7 @@ # We need to know -static, to get the right output filenames. for arg do - case "$arg" in + 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 @@ -802,7 +802,7 @@ while test $# -gt 0; do arg="$1" shift - case "$arg" in + case $arg in *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test ;; @@ -812,14 +812,14 @@ # If the previous option needs an argument, assign it. if test -n "$prev"; then - case "$prev" in + case $prev in output) compile_command="$compile_command @OUTPUT@" finalize_command="$finalize_command @OUTPUT@" ;; esac - case "$prev" in + case $prev in dlfiles|dlprefiles) if test "$preload" = no; then # Add the symbol object into the linking commands. @@ -827,7 +827,7 @@ finalize_command="$finalize_command @SYMFILE@" preload=yes fi - case "$arg" in + case $arg in *.la | *.lo) ;; # We handle these cases below. force) if test "$dlself" = no; then @@ -881,7 +881,7 @@ ;; rpath | xrpath) # We need an absolute path. - case "$arg" in + case $arg in [\\/]* | [A-Za-z]:[\\/]*) ;; *) $echo "$modename: only absolute run-paths are allowed" 1>&2 @@ -927,7 +927,7 @@ prevarg="$arg" - case "$arg" in + case $arg in -all-static) if test -n "$link_static_flag"; then compile_command="$compile_command $link_static_flag" @@ -986,11 +986,11 @@ esac continue ;; - + -L*) dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` # We need an absolute path. - case "$dir" in + case $dir in [\\/]* | [A-Za-z]:[\\/]*) ;; *) absdir=`cd "$dir" && pwd` @@ -1008,7 +1008,7 @@ lib_search_path="$lib_search_path $dir" ;; esac - case "$host" in + case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) case ":$dllsearchpath:" in *":$dir:"*) ;; @@ -1021,7 +1021,7 @@ -l*) if test "$arg" = "-lc"; then - case "$host" in + case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) # These systems don't actually have c library (as such) continue @@ -1032,7 +1032,7 @@ ;; esac elif test "$arg" = "-lm"; then - case "$host" in + case $host in *-*-cygwin* | *-*-pw32* | *-*-beos*) # These systems don't actually have math library (as such) continue @@ -1058,7 +1058,7 @@ ;; -no-install) - case "$host" in + case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) # The PATH hackery in wrapper scripts is required on Windows # in order for the loader to find any dlls it needs. @@ -1102,7 +1102,7 @@ -R*) dir=`$echo "X$arg" | $Xsed -e 's/^-R//'` # We need an absolute path. - case "$dir" in + case $dir in [\\/]* | [A-Za-z]:[\\/]*) ;; *) $echo "$modename: only absolute run-paths are allowed" 1>&2 @@ -1141,7 +1141,7 @@ IFS="${IFS= }"; save_ifs="$IFS"; IFS=',' for flag in $args; do IFS="$save_ifs" - case "$flag" in + case $flag in *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") flag="\"$flag\"" ;; @@ -1159,7 +1159,7 @@ IFS="${IFS= }"; save_ifs="$IFS"; IFS=',' for flag in $args; do IFS="$save_ifs" - case "$flag" in + case $flag in *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") flag="\"$flag\"" ;; @@ -1187,7 +1187,7 @@ # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case "$arg" in + case $arg in *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") arg="\"$arg\"" ;; @@ -1251,7 +1251,7 @@ # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case "$arg" in + case $arg in *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") arg="\"$arg\"" ;; @@ -1309,7 +1309,7 @@ fi # Determine the type of output - case "$output" in + case $output in "") $echo "$modename: you must specify an output file" 1>&2 $echo "$help" 1>&2 @@ -1341,7 +1341,7 @@ lib) passes="conv link" for file in $dlfiles $dlprefiles; do - case "$file" in + case $file in *.la) ;; *) $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 @@ -1382,7 +1382,7 @@ for deplib in $libs; do lib= found=no - case "$deplib" in + case $deplib in -l*) if test $linkmode != lib && test $linkmode != prog; then $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 @@ -1532,7 +1532,7 @@ installed=yes # Read the .la file - case "$lib" in + case $lib in */* | *\\*) . $lib ;; *) . ./$lib ;; esac @@ -1599,7 +1599,7 @@ fi # We need an absolute path. - case "$ladir" in + case $ladir in [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; *) abs_ladir=`cd "$ladir" && pwd` @@ -1674,7 +1674,7 @@ tmp_libs= for deplib in $dependency_libs; do - case "$deplib" in + case $deplib in -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test esac # Need to link against all dependency_libs? @@ -1823,12 +1823,12 @@ add_dir= add= lib_linked=yes - case "$hardcode_action" in + case $hardcode_action in immediate | unsupported) if test "$hardcode_direct" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = no; then - case "$host" in + case $host in *-*-sunos*) add_shlibpath="$dir" ;; esac add_dir="-L$dir" @@ -1953,7 +1953,7 @@ # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do - case "$libdir" in + case $libdir in -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'` case " $xrpath " in *" $temp_xrpath "*) ;; @@ -1981,13 +1981,13 @@ if test $link_all_deplibs != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do - case "$deplib" in + case $deplib in -L*) path="$deplib" ;; *.la) dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'` test "X$dir" = "X$deplib" && dir="." # We need an absolute path. - case "$dir" in + case $dir in [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; *) absdir=`cd "$dir" && pwd` @@ -2052,7 +2052,7 @@ eval tmp_libs=\"\$$var\" new_libs= for deplib in $tmp_libs; do - case "$deplib" in + case $deplib in -L*) new_libs="$deplib $new_libs" ;; *) case " $specialdeplibs " in @@ -2069,7 +2069,7 @@ done tmp_libs= for deplib in $new_libs; do - case "$deplib" in + case $deplib in -L*) case " $tmp_libs " in *" $deplib "*) ;; @@ -2126,7 +2126,7 @@ lib) # Make sure we only generate libraries of the form `libNAME.la'. - case "$outputname" in + case $outputname in lib*) name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` eval libname=\"$libname_spec\" @@ -2204,7 +2204,7 @@ age="$4" # Check that each of the things are valid numbers. - case "$current" in + case $current in 0 | [1-9] | [1-9][0-9]*) ;; *) $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 @@ -2213,7 +2213,7 @@ ;; esac - case "$revision" in + case $revision in 0 | [1-9] | [1-9][0-9]*) ;; *) $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 @@ -2222,7 +2222,7 @@ ;; esac - case "$age" in + case $age in 0 | [1-9] | [1-9][0-9]*) ;; *) $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 @@ -2241,7 +2241,7 @@ major= versuffix= verstring= - case "$version_type" in + case $version_type in none) ;; irix) @@ -2401,7 +2401,7 @@ if test "$build_libtool_libs" = yes; then if test -n "$rpath"; then - case "$host" in + case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) # these systems don't actually have a c library (as such)! ;; @@ -2428,7 +2428,7 @@ major="" newdeplibs= droppeddeps=no - case "$deplibs_check_method" in + 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 @@ -2451,7 +2451,7 @@ if test $? -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do - name="`expr $i : '-l\(.*\)'`" + name=`expr $i : '-l\(.*\)'` # If $name is empty we are operating on a -L argument. if test "$name" != "" -a "$name" != "0"; then libname=`eval \\$echo \"$libname_spec\"` @@ -2476,7 +2476,7 @@ # Error occured in the first compile. Let's try to salvage the situation: # Compile a seperate program for each library. for i in $deplibs; do - name="`expr $i : '-l\(.*\)'`" + name=`expr $i : '-l\(.*\)'` # If $name is empty we are operating on a -L argument. if test "$name" != "" -a "$name" != "0"; then $rm conftest @@ -2516,7 +2516,7 @@ set dummy $deplibs_check_method file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` for a_deplib in $deplibs; do - name="`expr $a_deplib : '-l\(.*\)'`" + name=`expr $a_deplib : '-l\(.*\)'` # If $name is empty we are operating on a -L argument. if test "$name" != "" -a "$name" != "0"; then libname=`eval \\$echo \"$libname_spec\"` @@ -2536,7 +2536,7 @@ potlib="$potent_lib" while test -h "$potlib" 2>/dev/null; do potliblink=`ls -ld $potlib | sed 's/.* -> //'` - case "$potliblink" in + case $potliblink in [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; esac @@ -2637,7 +2637,7 @@ hardcode_libdirs="$libdir" else # Just accumulate the unique libdirs. - case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) @@ -2761,7 +2761,7 @@ for xlib in $convenience; do # Extract the objects. - case "$xlib" in + case $xlib in [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; *) xabs=`pwd`"/$xlib" ;; esac @@ -2855,7 +2855,7 @@ $echo "$modename: warning: \`-release' is ignored for objects" 1>&2 fi - case "$output" in + case $output in *.lo) if test -n "$objs$old_deplibs"; then $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 @@ -2900,7 +2900,7 @@ for xlib in $convenience; do # Extract the objects. - case "$xlib" in + case $xlib in [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; *) xabs=`pwd`"/$xlib" ;; esac @@ -3035,7 +3035,7 @@ hardcode_libdirs="$libdir" else # Just accumulate the unique libdirs. - case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) @@ -3053,7 +3053,7 @@ *) perm_rpath="$perm_rpath $libdir" ;; esac fi - case "$host" in + case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) case ":$dllsearchpath:" in *":$libdir:"*) ;; @@ -3079,7 +3079,7 @@ hardcode_libdirs="$libdir" else # Just accumulate the unique libdirs. - case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) @@ -3122,7 +3122,7 @@ fi if test -n "$dlsyms"; then - case "$dlsyms" in + case $dlsyms in "") ;; *.c) # Discover the nlist of each of the dlfiles. @@ -3253,7 +3253,7 @@ fi pic_flag_for_symtable= - case "$host" in + 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 @@ -3321,7 +3321,7 @@ # We should set the shlibpath_var rpath= for dir in $temp_rpath; do - case "$dir" in + case $dir in [\\/]* | [A-Za-z]:[\\/]*) # Absolute path. rpath="$rpath$dir:" @@ -3429,7 +3429,7 @@ # Quote $echo for shipping. if test "X$echo" = "X$SHELL $0 --fallback-echo"; then - case "$0" in + case $0 in [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";; *) qecho="$SHELL `pwd`/$0 --fallback-echo";; esac @@ -3668,7 +3668,7 @@ # Add in members from convenience archives. for xlib in $addlibs; do # Extract the objects. - case "$xlib" in + case $xlib in [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; *) xabs=`pwd`"/$xlib" ;; esac @@ -3729,7 +3729,7 @@ fi # Now create the libtool archive. - case "$output" in + case $output in *.la) old_library= test "$build_old_libs" = yes && old_library="$libname.$libext" @@ -3761,7 +3761,7 @@ # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= for deplib in $dependency_libs; do - case "$deplib" in + case $deplib in *.la) name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` @@ -3859,7 +3859,7 @@ $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then # Aesthetically quote it. arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` - case "$arg" in + case $arg in *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) arg="\"$arg\"" ;; @@ -3875,7 +3875,7 @@ # The real first argument should be the name of the installation program. # Aesthetically quote it. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case "$arg" in + case $arg in *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) arg="\"$arg\"" ;; @@ -3898,7 +3898,7 @@ continue fi - case "$arg" in + case $arg in -d) isdir=yes ;; -f) prev="-f" ;; -g) prev="-g" ;; @@ -3923,7 +3923,7 @@ # Aesthetically quote the argument. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case "$arg" in + case $arg in *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) arg="\"$arg\"" ;; @@ -3974,11 +3974,11 @@ exit 1 fi fi - case "$destdir" in + case $destdir in [\\/]* | [A-Za-z]:[\\/]*) ;; *) for file in $files; do - case "$file" in + case $file in *.lo) ;; *) $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 @@ -4000,7 +4000,7 @@ for file in $files; do # Do each installation. - case "$file" in + case $file in *.$libext) # Do the static libraries later. staticlibs="$staticlibs $file" @@ -4019,7 +4019,7 @@ old_library= relink_command= # If there is no directory component, then add one. - case "$file" in + case $file in */* | *\\*) . $file ;; *) . ./$file ;; esac @@ -4115,7 +4115,7 @@ fi # Deduce the name of the destination old-style object file. - case "$destfile" in + case $destfile in *.lo) staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"` ;; @@ -4162,7 +4162,7 @@ relink_command= # If there is no directory component, then add one. - case "$file" in + case $file in */* | *\\*) . $file ;; *) . ./$file ;; esac @@ -4179,7 +4179,7 @@ libdir= if test -f "$lib"; then # If there is no directory component, then add one. - case "$lib" in + case $lib in */* | *\\*) . $lib ;; *) . ./$lib ;; esac @@ -4193,7 +4193,7 @@ relink_command= # If there is no directory component, then add one. - case "$file" in + case $file in */* | *\\*) . $file ;; *) . ./$file ;; esac @@ -4372,7 +4372,7 @@ fi dir= - case "$file" in + case $file in *.la) # Check to see that this really is a libtool archive. if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : @@ -4387,7 +4387,7 @@ library_names= # If there is no directory component, then add one. - case "$file" in + case $file in */* | *\\*) . $file ;; *) . ./$file ;; esac @@ -4442,13 +4442,13 @@ args= for file do - case "$file" in + case $file in -*) ;; *) # Do a test to see if this is really a libtool program. if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then # If there is no directory component, then add one. - case "$file" in + case $file in */* | *\\*) . $file ;; *) . ./$file ;; esac @@ -4505,7 +4505,7 @@ for arg do - case "$arg" in + case $arg in -*) rm="$rm $arg" ;; *) files="$files $arg" ;; esac @@ -4530,7 +4530,7 @@ rmfiles="$file" - case "$name" in + case $name in *.la) # Possibly a libtool archive, so verify it. if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then @@ -4612,7 +4612,7 @@ fi # test -z "$show_help" # We need to display help for each of the modes. -case "$mode" in +case $mode in "") $echo \ "Usage: $modename [OPTION]... [MODE-ARG]...