ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/branches/8.0.x/aclocal.m4
(Generate patch)

Comparing ircd-hybrid-7.2/aclocal.m4 (file contents):
Revision 912 by michael, Wed Nov 7 22:47:44 2007 UTC vs.
Revision 941 by db, Sat May 2 02:02:59 2009 UTC

# Line 1 | Line 1
1 < # generated automatically by aclocal 1.10 -*- Autoconf -*-
1 > # generated automatically by aclocal 1.10.1 -*- Autoconf -*-
2  
3   # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4 < # 2005, 2006  Free Software Foundation, Inc.
4 > # 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
5   # This file is free software; the Free Software Foundation
6   # gives unlimited permission to copy and/or distribute it,
7   # with or without modifications, as long as this notice is preserved.
# Line 11 | Line 11
11   # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
12   # PARTICULAR PURPOSE.
13  
14 < m4_if(m4_PACKAGE_VERSION, [2.61],,
15 < [m4_fatal([this file was generated for autoconf 2.61.
16 < You have another version of autoconf.  If you want to use that,
17 < you should regenerate the build system entirely.], [63])])
14 > m4_ifndef([AC_AUTOCONF_VERSION],
15 >  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
16 > m4_if(AC_AUTOCONF_VERSION, [2.62],,
17 > [m4_warning([this file was generated for autoconf 2.62.
18 > You have another version of autoconf.  It may work, but is not guaranteed to.
19 > If you have problems, you may need to regenerate the build system entirely.
20 > To do so, use the procedure documented by the package, typically `autoreconf'.])])
21  
22   # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
23  
24 < # serial 51 AC_PROG_LIBTOOL
24 > # serial 52 AC_PROG_LIBTOOL
25  
26  
27   # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
# Line 106 | Line 109 | AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
109   AC_REQUIRE([AC_OBJEXT])dnl
110   AC_REQUIRE([AC_EXEEXT])dnl
111   dnl
109
112   AC_LIBTOOL_SYS_MAX_CMD_LEN
113   AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
114   AC_LIBTOOL_OBJDIR
# Line 208 | Line 210 | file_magic*)
210    ;;
211   esac
212  
213 + _LT_REQUIRED_DARWIN_CHECKS
214 +
215   AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
216   AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
217   enable_win32_dll=yes, enable_win32_dll=no)
# Line 287 | Line 291 | ac_outfile=conftest.$ac_objext
291   echo "$lt_simple_link_test_code" >conftest.$ac_ext
292   eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
293   _lt_linker_boilerplate=`cat conftest.err`
294 < $rm conftest*
294 > $rm -r conftest*
295   ])# _LT_LINKER_BOILERPLATE
296  
297 + # _LT_REQUIRED_DARWIN_CHECKS
298 + # --------------------------
299 + # Check for some things on darwin
300 + AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
301 +  case $host_os in
302 +    rhapsody* | darwin*)
303 +    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
304 +    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
305 +
306 +    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
307 +      [lt_cv_apple_cc_single_mod=no
308 +      if test -z "${LT_MULTI_MODULE}"; then
309 +   # By default we will add the -single_module flag. You can override
310 +   # by either setting the environment variable LT_MULTI_MODULE
311 +   # non-empty at configure time, or by adding -multi_module to the
312 +   # link flags.
313 +   echo "int foo(void){return 1;}" > conftest.c
314 +   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
315 +     -dynamiclib ${wl}-single_module conftest.c
316 +   if test -f libconftest.dylib; then
317 +     lt_cv_apple_cc_single_mod=yes
318 +     rm -rf libconftest.dylib*
319 +   fi
320 +   rm conftest.c
321 +      fi])
322 +    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
323 +      [lt_cv_ld_exported_symbols_list],
324 +      [lt_cv_ld_exported_symbols_list=no
325 +      save_LDFLAGS=$LDFLAGS
326 +      echo "_main" > conftest.sym
327 +      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
328 +      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
329 +   [lt_cv_ld_exported_symbols_list=yes],
330 +   [lt_cv_ld_exported_symbols_list=no])
331 +   LDFLAGS="$save_LDFLAGS"
332 +    ])
333 +    case $host_os in
334 +    rhapsody* | darwin1.[[0123]])
335 +      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
336 +    darwin1.*)
337 +     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
338 +    darwin*)
339 +      # if running on 10.5 or later, the deployment target defaults
340 +      # to the OS version, if on x86, and 10.4, the deployment
341 +      # target defaults to 10.4. Don't you love it?
342 +      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
343 +   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
344 +     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
345 +   10.[[012]]*)
346 +     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
347 +   10.*)
348 +     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
349 +      esac
350 +    ;;
351 +  esac
352 +    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
353 +      _lt_dar_single_mod='$single_module'
354 +    fi
355 +    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
356 +      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
357 +    else
358 +      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
359 +    fi
360 +    if test "$DSYMUTIL" != ":"; then
361 +      _lt_dsymutil="~$DSYMUTIL \$lib || :"
362 +    else
363 +      _lt_dsymutil=
364 +    fi
365 +    ;;
366 +  esac
367 + ])
368  
369   # _LT_AC_SYS_LIBPATH_AIX
370   # ----------------------
# Line 614 | Line 689 | sparc*-*solaris*)
689      *64-bit*)
690        case $lt_cv_prog_gnu_ld in
691        yes*) LD="${LD-ld} -m elf64_sparc" ;;
692 <      *)    LD="${LD-ld} -64" ;;
692 >      *)
693 >        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
694 >          LD="${LD-ld} -64"
695 >        fi
696 >        ;;
697        esac
698        ;;
699      esac
# Line 707 | Line 786 | AC_CACHE_CHECK([$1], [$2],
786         $2=yes
787       fi
788     fi
789 <   $rm conftest*
789 >   $rm -r conftest*
790     LDFLAGS="$save_LDFLAGS"
791   ])
792  
# Line 978 | Line 1057 | else
1057      AC_CHECK_FUNC([shl_load],
1058            [lt_cv_dlopen="shl_load"],
1059        [AC_CHECK_LIB([dld], [shl_load],
1060 <            [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
1060 >            [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
1061          [AC_CHECK_FUNC([dlopen],
1062                [lt_cv_dlopen="dlopen"],
1063            [AC_CHECK_LIB([dl], [dlopen],
# Line 986 | Line 1065 | else
1065              [AC_CHECK_LIB([svld], [dlopen],
1066                    [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
1067                [AC_CHECK_LIB([dld], [dld_link],
1068 <                    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
1068 >                    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
1069                ])
1070              ])
1071            ])
# Line 1303 | Line 1382 | aix3*)
1382    soname_spec='${libname}${release}${shared_ext}$major'
1383    ;;
1384  
1385 < aix4* | aix5*)
1385 > aix[[4-9]]*)
1386    version_type=linux
1387    need_lib_prefix=no
1388    need_version=no
# Line 1824 | Line 1903 | esac
1903   AC_MSG_RESULT([$dynamic_linker])
1904   test "$dynamic_linker" = no && can_build_shared=no
1905  
1906 + AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
1907 + [lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
1908 + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
1909 + AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
1910 + [lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
1911 + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
1912 +
1913   variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
1914   if test "$GCC" = yes; then
1915    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
# Line 2323 | Line 2409 | lt_cv_deplibs_check_method='unknown'
2409   # whether `pass_all' will *always* work, you probably want this one.
2410  
2411   case $host_os in
2412 < aix4* | aix5*)
2412 > aix[[4-9]]*)
2413    lt_cv_deplibs_check_method=pass_all
2414    ;;
2415  
# Line 2759 | Line 2845 | aix3*)
2845    fi
2846    ;;
2847  
2848 < aix4* | aix5*)
2848 > aix[[4-9]]*)
2849    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
2850      test "$enable_shared" = yes && enable_static=no
2851    fi
# Line 2816 | Line 2902 | _LT_AC_TAGVAR(postdep_objects, $1)=
2902   _LT_AC_TAGVAR(predeps, $1)=
2903   _LT_AC_TAGVAR(postdeps, $1)=
2904   _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
2905 + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
2906  
2907   # Source file extension for C++ test sources.
2908   ac_ext=cpp
# Line 2925 | Line 3012 | case $host_os in
3012      # FIXME: insert proper C++ library support
3013      _LT_AC_TAGVAR(ld_shlibs, $1)=no
3014      ;;
3015 <  aix4* | aix5*)
3015 >  aix[[4-9]]*)
3016      if test "$host_cpu" = ia64; then
3017        # On IA64, the linker does run time linking by default, so we don't
3018        # have to do anything special.
# Line 2938 | Line 3025 | case $host_os in
3025        # Test if we are trying to use run time linking or normal
3026        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
3027        # need to do runtime linking.
3028 <      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
3028 >      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
3029          for ld_flag in $LDFLAGS; do
3030            case $ld_flag in
3031            *-brtl*)
# Line 3084 | Line 3171 | case $host_os in
3171      fi
3172    ;;
3173        darwin* | rhapsody*)
3087        case $host_os in
3088        rhapsody* | darwin1.[[012]])
3089         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
3090         ;;
3091       *) # Darwin 1.3 on
3092         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
3093           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
3094         else
3095           case ${MACOSX_DEPLOYMENT_TARGET} in
3096             10.[[012]])
3097               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
3098               ;;
3099             10.*)
3100               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
3101               ;;
3102           esac
3103         fi
3104         ;;
3105        esac
3174        _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
3175        _LT_AC_TAGVAR(hardcode_direct, $1)=no
3176        _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
3177        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
3178        _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
3179        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
3180 <
3181 <    if test "$GXX" = yes ; then
3114 <      lt_int_apple_cc_single_mod=no
3180 >      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
3181 >      if test "$GXX" = yes ; then
3182        output_verbose_link_cmd='echo'
3183 <      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
3184 <       lt_int_apple_cc_single_mod=yes
3183 >      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
3184 >      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
3185 >      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
3186 >      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
3187 >      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
3188 >        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
3189 >        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
3190        fi
3119      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
3120       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
3121      else
3122          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
3123        fi
3124        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
3125        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
3126          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
3127            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
3128          else
3129            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
3130          fi
3131            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
3191        else
3192        case $cc_basename in
3193          xlc*)
# Line 3379 | Line 3438 | case $host_os in
3438          _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
3439          _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
3440          ;;
3441 <      pgCC*)
3441 >      pgCC* | pgcpp*)
3442          # Portland Group C++ compiler
3443          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
3444          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
# Line 3814 | Line 3873 | lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
3873   # compiler output when linking a shared library.
3874   # Parse the compiler output and extract the necessary
3875   # objects, libraries and library flags.
3876 < AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
3876 > AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
3877 > [AC_REQUIRE([LT_AC_PROG_SED])dnl
3878   dnl we can't use the lt_simple_compile_test_code here,
3879   dnl because it contains code intended for an executable,
3880   dnl not a library.  It's possible we should let each
# Line 3939 | Line 3999 | fi
3999  
4000   $rm -f confest.$objext
4001  
4002 + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
4003 + if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
4004 +  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
4005 + fi
4006 +
4007   # PORTME: override above test on systems where it is broken
4008   ifelse([$1],[CXX],
4009   [case $host_os in
# Line 3995 | Line 4060 | solaris*)
4060    ;;
4061   esac
4062   ])
3998
4063   case " $_LT_AC_TAGVAR(postdeps, $1) " in
4064   *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
4065   esac
# Line 4080 | Line 4144 | aix3*)
4144      postinstall_cmds='$RANLIB $lib'
4145    fi
4146    ;;
4147 < aix4* | aix5*)
4147 > aix[[4-9]]*)
4148    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
4149      test "$enable_shared" = yes && enable_static=no
4150    fi
# Line 4257 | Line 4321 | if test -f "$ltmain"; then
4321      _LT_AC_TAGVAR(predeps, $1) \
4322      _LT_AC_TAGVAR(postdeps, $1) \
4323      _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
4324 +    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
4325      _LT_AC_TAGVAR(archive_cmds, $1) \
4326      _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
4327      _LT_AC_TAGVAR(postinstall_cmds, $1) \
# Line 4319 | Line 4384 | ifelse([$1], [],
4384   # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
4385   # NOTE: Changes made to this file will be lost: look at ltmain.sh.
4386   #
4387 < # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
4387 > # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
4388   # Free Software Foundation, Inc.
4389   #
4390   # This file is part of GNU Libtool:
# Line 4556 | Line 4621 | predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
4621   # shared library.
4622   postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
4623  
4624 + # The directories searched by this compiler when creating a shared
4625 + # library
4626 + compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
4627 +
4628   # The library search path used internally by the compiler when linking
4629   # a shared library.
4630   compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
# Line 4905 | Line 4974 | EOF
4974      echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
4975      cat conftest.$ac_ext >&5
4976    fi
4977 <  rm -f conftest* conftst*
4977 >  rm -rf conftest* conftst*
4978  
4979    # Do not use the global_symbol_pipe unless it works.
4980    if test "$pipe_works" = yes; then
# Line 4962 | Line 5031 | AC_MSG_CHECKING([for $compiler option to
5031        # built for inclusion in a dll (and should export symbols for example).
5032        # Although the cygwin gcc ignores -fPIC, still need this for old-style
5033        # (--disable-auto-import) libraries
5034 <      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
5034 >      m4_if([$1], [GCJ], [],
5035 >        [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
5036        ;;
5037      darwin* | rhapsody*)
5038        # PIC is the default on this platform
# Line 4999 | Line 5069 | AC_MSG_CHECKING([for $compiler option to
5069      esac
5070    else
5071      case $host_os in
5072 <      aix4* | aix5*)
5072 >      aix[[4-9]]*)
5073          # All AIX code is PIC.
5074          if test "$host_cpu" = ia64; then
5075            # AIX 5 now supports IA64 processor
# Line 5095 | Line 5165 | AC_MSG_CHECKING([for $compiler option to
5165              _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
5166              _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
5167              ;;
5168 <          pgCC*)
5168 >          pgCC* | pgcpp*)
5169              # Portland Group C++ compiler.
5170              _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
5171              _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
# Line 5246 | Line 5316 | AC_MSG_CHECKING([for $compiler option to
5316        # built for inclusion in a dll (and should export symbols for example).
5317        # Although the cygwin gcc ignores -fPIC, still need this for old-style
5318        # (--disable-auto-import) libraries
5319 <      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
5319 >      m4_if([$1], [GCJ], [],
5320 >        [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
5321        ;;
5322  
5323      darwin* | rhapsody*)
# Line 5316 | Line 5387 | AC_MSG_CHECKING([for $compiler option to
5387      mingw* | cygwin* | pw32* | os2*)
5388        # This hack is so that the source file can tell whether it is being
5389        # built for inclusion in a dll (and should export symbols for example).
5390 <      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
5390 >      m4_if([$1], [GCJ], [],
5391 >        [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
5392        ;;
5393  
5394      hpux9* | hpux10* | hpux11*)
# Line 5453 | Line 5525 | AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_co
5525   #
5526   if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
5527    AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
5528 <    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
5528 >    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
5529      [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
5530      [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
5531       "" | " "*) ;;
# Line 5477 | Line 5549 | esac
5549   #
5550   wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
5551   AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
5552 <  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
5552 >  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
5553    $lt_tmp_static_flag,
5554    [],
5555    [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
# Line 5493 | Line 5565 | AC_MSG_CHECKING([whether the $compiler l
5565   ifelse([$1],[CXX],[
5566    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
5567    case $host_os in
5568 <  aix4* | aix5*)
5568 >  aix[[4-9]]*)
5569      # If we're using GNU nm, then we don't want the "-C" option.
5570      # -C means demangle to AIX nm, but means don't demangle with GNU nm
5571      if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
# Line 5512 | Line 5584 | ifelse([$1],[CXX],[
5584      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
5585    ;;
5586    esac
5587 +  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
5588   ],[
5589    runpath_var=
5590    _LT_AC_TAGVAR(allow_undefined_flag, $1)=
# Line 5542 | Line 5615 | ifelse([$1],[CXX],[
5615    # it will be wrapped by ` (' and `)$', so one must not match beginning or
5616    # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
5617    # as well as any symbol that contains `d'.
5618 <  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
5618 >  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
5619    # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
5620    # platforms (ab)use it in PIC code, but their linkers get confused if
5621    # the symbol is explicitly referenced.  Since portable code cannot
5622    # rely on this symbol name, it's probably fine to never include it in
5623    # preloaded symbol tables.
5624 +  # Exclude shared library initialization/finalization symbols.
5625 + dnl Note also adjust exclude_expsyms for C++ above.
5626    extract_expsyms_cmds=
5627    # Just being paranoid about ensuring that cc_basename is set.
5628    _LT_CC_BASENAME([$compiler])
# Line 5597 | Line 5672 | ifelse([$1],[CXX],[
5672  
5673      # See if GNU ld supports shared libraries.
5674      case $host_os in
5675 <    aix3* | aix4* | aix5*)
5675 >    aix[[3-9]]*)
5676        # On AIX/PPC, the GNU linker is very broken
5677        if test "$host_cpu" != ia64; then
5678          _LT_AC_TAGVAR(ld_shlibs, $1)=no
# Line 5816 | Line 5891 | _LT_EOF
5891        fi
5892        ;;
5893  
5894 <    aix4* | aix5*)
5894 >    aix[[4-9]]*)
5895        if test "$host_cpu" = ia64; then
5896          # On IA64, the linker does run time linking by default, so we don't
5897          # have to do anything special.
# Line 5836 | Line 5911 | _LT_EOF
5911          # Test if we are trying to use run time linking or normal
5912          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
5913          # need to do runtime linking.
5914 <        case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
5914 >        case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
5915            for ld_flag in $LDFLAGS; do
5916            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
5917              aix_use_runtimelinking=yes
# Line 5996 | Line 6071 | _LT_EOF
6071        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
6072      if test "$GCC" = yes ; then
6073          output_verbose_link_cmd='echo'
6074 <        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
6075 <      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
6076 <      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
6077 <      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
6003 <      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
6074 >        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
6075 >        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
6076 >        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
6077 >        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
6078      else
6079        case $cc_basename in
6080          xlc*)
# Line 6581 | Line 6655 | AC_SUBST([SED])
6655   AC_MSG_RESULT([$SED])
6656   ])
6657  
6658 < # Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
6658 > # Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
6659   #
6660   # This file is free software; the Free Software Foundation
6661   # gives unlimited permission to copy and/or distribute it,
# Line 6596 | Line 6670 | AC_DEFUN([AM_AUTOMAKE_VERSION],
6670   [am__api_version='1.10'
6671   dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
6672   dnl require some minimum version.  Point them to the right macro.
6673 < m4_if([$1], [1.10], [],
6673 > m4_if([$1], [1.10.1], [],
6674        [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
6675   ])
6676  
# Line 6612 | Line 6686 | m4_define([_AM_AUTOCONF_VERSION], [])
6686   # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
6687   # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
6688   AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
6689 < [AM_AUTOMAKE_VERSION([1.10])dnl
6690 < _AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
6689 > [AM_AUTOMAKE_VERSION([1.10.1])dnl
6690 > m4_ifndef([AC_AUTOCONF_VERSION],
6691 >  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
6692 > _AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
6693  
6694   # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
6695  
# Line 6885 | Line 6961 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
6961    # each Makefile.in and add a new line on top of each file to say so.
6962    # Grep'ing the whole file is not good either: AIX grep has a line
6963    # limit of 2048, but all sed's we know have understand at least 4000.
6964 <  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
6964 >  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
6965      dirpart=`AS_DIRNAME("$mf")`
6966    else
6967      continue
# Line 6933 | Line 7009 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
7009   # Do all the work for Automake.                             -*- Autoconf -*-
7010  
7011   # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
7012 < # 2005, 2006 Free Software Foundation, Inc.
7012 > # 2005, 2006, 2008 Free Software Foundation, Inc.
7013   #
7014   # This file is free software; the Free Software Foundation
7015   # gives unlimited permission to copy and/or distribute it,
7016   # with or without modifications, as long as this notice is preserved.
7017  
7018 < # serial 12
7018 > # serial 13
7019  
7020   # This macro actually does too much.  Some checks are only needed if
7021   # your package does certain things.  But this isn't really a big deal.
# Line 7044 | Line 7120 | AC_PROVIDE_IFELSE([AC_PROG_OBJC],
7120   # our stamp files there.
7121   AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
7122   [# Compute $1's index in $config_headers.
7123 + _am_arg=$1
7124   _am_stamp_count=1
7125   for _am_header in $config_headers :; do
7126    case $_am_header in
7127 <    $1 | $1:* )
7127 >    $_am_arg | $_am_arg:* )
7128        break ;;
7129      * )
7130        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
7131    esac
7132   done
7133 < echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
7133 > echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
7134  
7135   # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
7136   #
# Line 7375 | Line 7452 | AC_SUBST([INSTALL_STRIP_PROGRAM])])
7452  
7453   # _AM_SUBST_NOTMAKE(VARIABLE)
7454   # ---------------------------
7455 < # Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
7455 > # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
7456   # This macro is traced by Automake.
7457   AC_DEFUN([_AM_SUBST_NOTMAKE])
7458  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines