Deleted Added
full compact
1c1
< # generated automatically by aclocal 1.10 -*- Autoconf -*-
---
> # generated automatically by aclocal 1.10.1 -*- Autoconf -*-
4c4
< # 2005, 2006 Free Software Foundation, Inc.
---
> # 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
14,17c14,20
< m4_if(m4_PACKAGE_VERSION, [2.61],,
< [m4_fatal([this file was generated for autoconf 2.61.
< You have another version of autoconf. If you want to use that,
< you should regenerate the build system entirely.], [63])])
---
> m4_ifndef([AC_AUTOCONF_VERSION],
> [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
> m4_if(AC_AUTOCONF_VERSION, [2.62],,
> [m4_warning([this file was generated for autoconf 2.62.
> You have another version of autoconf. It may work, but is not guaranteed to.
> If you have problems, you may need to regenerate the build system entirely.
> To do so, use the procedure documented by the package, typically `autoreconf'.])])
21c24
< # serial 51 AC_PROG_LIBTOOL
---
> # serial 52 AC_PROG_LIBTOOL
109d111
<
210a213,214
> _LT_REQUIRED_DARWIN_CHECKS
>
290c294
< $rm conftest*
---
> $rm -r conftest*
292a297,304
> # _LT_REQUIRED_DARWIN_CHECKS
> # --------------------------
> # Check for some things on darwin
> AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
> case $host_os in
> rhapsody* | darwin*)
> AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
> AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
293a306,368
> AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
> [lt_cv_apple_cc_single_mod=no
> if test -z "${LT_MULTI_MODULE}"; then
> # By default we will add the -single_module flag. You can override
> # by either setting the environment variable LT_MULTI_MODULE
> # non-empty at configure time, or by adding -multi_module to the
> # link flags.
> echo "int foo(void){return 1;}" > conftest.c
> $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
> -dynamiclib ${wl}-single_module conftest.c
> if test -f libconftest.dylib; then
> lt_cv_apple_cc_single_mod=yes
> rm -rf libconftest.dylib*
> fi
> rm conftest.c
> fi])
> AC_CACHE_CHECK([for -exported_symbols_list linker flag],
> [lt_cv_ld_exported_symbols_list],
> [lt_cv_ld_exported_symbols_list=no
> save_LDFLAGS=$LDFLAGS
> echo "_main" > conftest.sym
> LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
> AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
> [lt_cv_ld_exported_symbols_list=yes],
> [lt_cv_ld_exported_symbols_list=no])
> LDFLAGS="$save_LDFLAGS"
> ])
> case $host_os in
> rhapsody* | darwin1.[[0123]])
> _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
> darwin1.*)
> _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
> darwin*)
> # if running on 10.5 or later, the deployment target defaults
> # to the OS version, if on x86, and 10.4, the deployment
> # target defaults to 10.4. Don't you love it?
> case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
> 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
> _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
> 10.[[012]]*)
> _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
> 10.*)
> _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
> esac
> ;;
> esac
> if test "$lt_cv_apple_cc_single_mod" = "yes"; then
> _lt_dar_single_mod='$single_module'
> fi
> if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
> _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
> else
> _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
> fi
> if test "$DSYMUTIL" != ":"; then
> _lt_dsymutil="~$DSYMUTIL \$lib || :"
> else
> _lt_dsymutil=
> fi
> ;;
> esac
> ])
>
617c692,696
< *) LD="${LD-ld} -64" ;;
---
> *)
> if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
> LD="${LD-ld} -64"
> fi
> ;;
710c789
< $rm conftest*
---
> $rm -r conftest*
981c1060
< [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
---
> [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
989c1068
< [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
---
> [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
1306c1385
< aix4* | aix5*)
---
> aix[[4-9]]*)
1826a1906,1912
> AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
> [lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
> sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
> AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
> [lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
> sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
>
2326c2412
< aix4* | aix5*)
---
> aix[[4-9]]*)
2762c2848
< aix4* | aix5*)
---
> aix[[4-9]]*)
2818a2905
> _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
2928c3015
< aix4* | aix5*)
---
> aix[[4-9]]*)
2941c3028
< case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
---
> case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
3087,3105d3173
< case $host_os in
< rhapsody* | darwin1.[[012]])
< _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
< ;;
< *) # Darwin 1.3 on
< if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
< _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
< else
< case ${MACOSX_DEPLOYMENT_TARGET} in
< 10.[[012]])
< _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
< ;;
< 10.*)
< _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
< ;;
< esac
< fi
< ;;
< esac
3112,3114c3180,3181
<
< if test "$GXX" = yes ; then
< lt_int_apple_cc_single_mod=no
---
> _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
> if test "$GXX" = yes ; then
3116,3117c3183,3189
< if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
< lt_int_apple_cc_single_mod=yes
---
> _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}"
> _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
> _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}"
> _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}"
> if test "$lt_cv_apple_cc_single_mod" != "yes"; then
> _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}"
> _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}"
3119,3120d3190
< if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
< _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
3122,3132d3191
< _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'
< fi
< _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
< # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
< if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
< _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}'
< else
< _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}'
< fi
< _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}'
< else
3382c3441
< pgCC*)
---
> pgCC* | pgcpp*)
3817c3876,3877
< AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
---
> AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
> [AC_REQUIRE([LT_AC_PROG_SED])dnl
3941a4002,4006
> _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
> if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
> _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
> fi
>
3998d4062
<
4083c4147
< aix4* | aix5*)
---
> aix[[4-9]]*)
4259a4324
> _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
4322c4387
< # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
---
> # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
4558a4624,4627
> # The directories searched by this compiler when creating a shared
> # library
> compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
>
4908c4977
< rm -f conftest* conftst*
---
> rm -rf conftest* conftst*
4965c5034,5035
< _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
---
> m4_if([$1], [GCJ], [],
> [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
5002c5072
< aix4* | aix5*)
---
> aix[[4-9]]*)
5098c5168
< pgCC*)
---
> pgCC* | pgcpp*)
5249c5319,5320
< _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
---
> m4_if([$1], [GCJ], [],
> [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
5319c5390,5391
< _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
---
> m4_if([$1], [GCJ], [],
> [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
5456c5528
< _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
---
> _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
5480c5552
< _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
---
> _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
5496c5568
< aix4* | aix5*)
---
> aix[[4-9]]*)
5514a5587
> _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
5545c5618
< _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
---
> _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
5550a5624,5625
> # Exclude shared library initialization/finalization symbols.
> dnl Note also adjust exclude_expsyms for C++ above.
5600c5675
< aix3* | aix4* | aix5*)
---
> aix[[3-9]]*)
5819c5894
< aix4* | aix5*)
---
> aix[[4-9]]*)
5839c5914
< case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
---
> case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
5999,6003c6074,6077
< _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
< _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
< # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
< _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}'
< _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}'
---
> _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}"
> _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
> _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}"
> _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}"
6584c6658
< # Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
---
> # Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
6599c6673
< m4_if([$1], [1.10], [],
---
> m4_if([$1], [1.10.1], [],
6615,6616c6689,6692
< [AM_AUTOMAKE_VERSION([1.10])dnl
< _AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
---
> [AM_AUTOMAKE_VERSION([1.10.1])dnl
> m4_ifndef([AC_AUTOCONF_VERSION],
> [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
> _AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
6888c6964
< if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
---
> if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
6936c7012
< # 2005, 2006 Free Software Foundation, Inc.
---
> # 2005, 2006, 2008 Free Software Foundation, Inc.
6942c7018
< # serial 12
---
> # serial 13
7046a7123
> _am_arg=$1
7050c7127
< $1 | $1:* )
---
> $_am_arg | $_am_arg:* )
7056c7133
< echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
---
> echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
7357c7434
< # Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
---
> # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.