Changeset 5878

Timestamp:

02/23/04 16:45:18 (5 years ago)

Author:

aamici

Message:

sync with libtool 1.5.2
move gdal code at the top of the file (and add warnings on keeping it there)

Files:

• trunk/aclocal.m4 (modified) (33 diffs)

trunk/aclocal.m4

@@ -552 +552 @@
-
-
+dnl ---------------------------------------------------------------------------
+dnl Message output
+dnl ---------------------------------------------------------------------------
+AC_DEFUN(LOC_MSG,[
+echo "$1"
+])
+
+AC_DEFUN(LOC_YES_NO,[if test -n "${$1}" ; then echo yes ; else echo no ; fi])
+
+AC_DEFUN(LOC_MSG_USE,[
+[echo "  $1: ]`LOC_YES_NO($2)`"])
+
+
+
+
+dnl --------------------------------------------------------------------------
+dnl DO NOT ADD GDAL-SPECIFIC MACROS BELOW THIS LINE!
+dnl --------------------------------------------------------------------------
+
-
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -578 +597 @@
-
-# serial 47 AC_PROG_LIBTOOL
-47
+192
-
-
@@ -1395 +1414 @@
-    ])
-   ;;
-
+
-  *)
-    AC_CHECK_FUNC([shl_load],
@@ -1483 +1502 @@
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   # 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 .
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
@@ -1635 +1647 @@
-  AC_MSG_RESULT([no])
-    ;;
-  
+
-fi
-])# AC_LIBTOOL_SYS_LIB_STRIP
@@ -2004 +2016 @@
-  hardcode_into_libs=yes
-
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
+  fi
+
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
@@ -2011 +2029 @@
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+knetbsd*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='GNU ld.so'
-  ;;
-
@@ -2022 +2052 @@
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-release}${shared_ext} ${libname}${
+
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
@@ -2051 +2081 @@
-  version_type=sunos
-  need_lib_prefix=no
-no
+yes
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -2661 +2691 @@
-  ;;
-
- | mingw* | pw32*
+
-  # win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
@@ -2667 +2697 @@
-  ;;
-
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # win32_libid shell function, so use a weaker test based on 'objdump'.
+  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
-darwin* | rhapsody*)
-  # this will be overwritten by pass_all, but leave it in just in case
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[[012]])
-    lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
@@ -2721 +2747 @@
-
-irix5* | irix6* | nonstopux*)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
@@ -2743 +2758 @@
-# This must be Linux ELF.
-linux*)
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
@@ -2782 +2790 @@
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
@@ -2794 +2799 @@
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
@@ -3060 +3064 @@
-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
-  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
-]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[
+_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)
-  else
-    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
@@ -3132 +3136 @@
-          10.*)
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-            
+
-        esac
-      fi
@@ -3150 +3154 @@
-  else
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-  
-  
+
+
-esac
-AC_MSG_RESULT([$enable_shared])
@@ -3469 +3473 @@
-          10.*)
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-            
+
-        esac
-      fi
@@ -3755 +3759 @@
-    esac
-    ;;
-
+ | knetbsd*-gnu
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
@@ -4407 +4411 @@
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  
+
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-
+
+
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -4461 +4466 @@
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(module_cmds, $1) | \
-   
+
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
@@ -4592 +4597 @@
-
-# A symbol stripping program
-"$STRIP"
+$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
@@ -4867 +4872 @@
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-
+
+
+
+
-fi
-])# AC_LIBTOOL_CONFIG
@@ -5224 +5232 @@
-            _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-            _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
- 
+
-          cxx)
-            # Compaq C++
@@ -5249 +5257 @@
-        esac
-        ;;
-
+ | knetbsd*-gnu
-        ;;
-      osf3* | osf4* | osf5*)
@@ -5584 +5592 @@
-  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
-  _LT_AC_TAGVAR(module_cmds, $1)=
-  
+
-  _LT_AC_TAGVAR(always_export_symbols, $1)=no
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -5689 +5697 @@
-      ;;
-
-
+ | knetbsd*-gnu
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -5956 +5964 @@
-          10.*)
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-            
+
-        esac
-      fi
@@ -5984 +5992 @@
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-  
+
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-  
+
-      ;;
-
@@ -6106 +6114 @@
-      ;;
-
-
+ | knetbsd*-gnu
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -6336 +6344 @@
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
+
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
@@ -6500 +6508 @@
-])
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+