Difference for ./aclocal.m4 from version 1.5 to 1.6


version 1.5 version 1.6
Line 1
 
Line 1
 # generated automatically by aclocal 1.7.1 -*- Autoconf -*-  # aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
   
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002  # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.  # Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation  # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,  # gives unlimited permission to copy and/or distribute it,
Line 99
 
Line 99
 # CC etc. in the Makefile, will ask for an AC_PROG_CC use...  # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
   
   
 AC_PREREQ([2.54])  AC_PREREQ([2.52])
   
 # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow  # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
 # the ones we care about.  # the ones we care about.
Line 125
 
Line 125
   AC_MSG_ERROR([source directory already configured; run "make distclean" there first])    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 fi  fi
   
 # test whether we have cygpath  
 if test -z "$CYGPATH_W"; then  
   if (cygpath --version) >/dev/null 2>/dev/null; then  
     CYGPATH_W='cygpath -w'  
   else  
     CYGPATH_W=echo  
   fi  
 fi  
 AC_SUBST([CYGPATH_W])  
   
 # Define the identity of the package.  # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.  dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],  m4_ifval([$2],
Line 166
 
Line 156
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
   
 _AM_IF_OPTION([no-dependencies],,  _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],  [AC_PROVIDE_IFELSE([AC_PROG_][CC],
                   [_AM_DEPENDENCIES(CC)],                    [_AM_DEPENDENCIES(CC)],
                   [define([AC_PROG_CC],                    [define([AC_PROG_][CC],
                           defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl                            defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],  AC_PROVIDE_IFELSE([AC_PROG_][CXX],
                   [_AM_DEPENDENCIES(CXX)],                    [_AM_DEPENDENCIES(CXX)],
                   [define([AC_PROG_CXX],                    [define([AC_PROG_][CXX],
                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl                            defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 ])  ])
 ])  ])
   
   
 # When config.status generates a header, we must update the stamp-h file.  
 # This file resides in the same directory as the config header  
 # that is generated.  The stamp files are numbered to have different names.  
   
 # Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the  
 # loop where config.status creates the headers, so we can generate  
 # our stamp files there.  
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],  
 [_am_stamp_count=`expr ${_am_stamp_count-0} + 1`  
 echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])  
   
 # Copyright 2002  Free Software Foundation, Inc.  # Copyright 2002  Free Software Foundation, Inc.
   
 # This program is free software; you can redistribute it and/or modify  # This program is free software; you can redistribute it and/or modify
Line 209
 
Line 187
 # ----------------------------  # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been  # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.  # generated from the m4 files accompanying Automake X.Y.
 AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])  AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
   
 # AM_SET_CURRENT_AUTOMAKE_VERSION  # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------  # -------------------------------
 # Call AM_AUTOMAKE_VERSION so it can be traced.  # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.  # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
  [AM_AUTOMAKE_VERSION([1.7.1])])   [AM_AUTOMAKE_VERSION([1.6.3])])
   
 # Helper functions for option handling.                    -*- Autoconf -*-  # Helper functions for option handling.                    -*- Autoconf -*-
   
Line 596
 
Line 574
     if depmode=$depmode \      if depmode=$depmode \
        source=conftest.c object=conftest.o \         source=conftest.c object=conftest.o \
        depfile=conftest.Po tmpdepfile=conftest.TPo \         depfile=conftest.Po tmpdepfile=conftest.TPo \
        $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&         $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
        grep conftest.h conftest.Po > /dev/null 2>&1 &&         grep conftest.h conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       am_cv_$1_dependencies_compiler_type=$depmode        am_cv_$1_dependencies_compiler_type=$depmode
Line 611
 
Line 589
 fi  fi
 ])  ])
 AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])  AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
 AM_CONDITIONAL([am__fastdep$1], [  
   test "x$enable_dependency_tracking" != xno \  
   && test "$am_cv_$1_dependencies_compiler_type" = gcc3])  
 ])  ])
   
   
Line 733
 
Line 708
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])       [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])  ])
   
 # Check to see how 'make' treats includes. -*- Autoconf -*-  # Copyright 2001 Free Software Foundation, Inc.             -*- Autoconf -*-
   
 # Copyright (C) 2001, 2002 Free Software Foundation, Inc.  
   
 # This program is free software; you can redistribute it and/or modify  # 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  # it under the terms of the GNU General Public License as published by
Line 775
 
Line 748
 # In particular we don't look at `^make:' because GNU make might  # In particular we don't look at `^make:' because GNU make might
 # be invoked under some other name (usually "gmake"), in which  # be invoked under some other name (usually "gmake"), in which
 # case it prints its new name instead of `make'.  # case it prints its new name instead of `make'.
 if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then  if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
    am__include=include     am__include=include
    am__quote=     am__quote=
    _am_result=GNU     _am_result=GNU
Line 835
 
Line 808
 fi  fi
 AC_CONFIG_COMMANDS_PRE(  AC_CONFIG_COMMANDS_PRE(
 [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then  [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
   AC_MSG_ERROR([conditional "$1" was never defined.    AC_MSG_ERROR([conditional \"$1\" was never defined.
 Usually this means the macro was only invoked conditionally.])  Usually this means the macro was only invoked conditionally.])
 fi])])  fi])])
   
Line 862
 
Line 835
   
 # serial 6  # serial 6
   
 # AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.  # When config.status generates a header, we must update the stamp-h file.
 AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])  # This file resides in the same directory as the config header
   # that is generated.  We must strip everything past the first ":",
   # and everything past the last "/".
   
   # _AM_DIRNAME(PATH)
   # -----------------
   # Like AS_DIRNAME, only do it during macro expansion
   AC_DEFUN([_AM_DIRNAME],
          [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
          m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
        m4_if(regexp([$1], [^/.*]), -1,
      [.],
      patsubst([$1], [^\(/\).*], [\1])),
        patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
          patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
   ])# _AM_DIRNAME
   
   
   # The stamp files are numbered to have different names.
   # We could number them on a directory basis, but that's additional
   # complications, let's have a unique counter.
   m4_define([_AM_STAMP_Count], [0])
   
   
   # _AM_STAMP(HEADER)
   # -----------------
   # The name of the stamp file for HEADER.
   AC_DEFUN([_AM_STAMP],
   [m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
   AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
                                  [:.*])))/stamp-h[]_AM_STAMP_Count])
   
   
   # _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
   # ------------------------------------------------------------
   # We used to try to get a real timestamp in stamp-h.  But the fear is that
   # that will cause unnecessary cvs conflicts.
   AC_DEFUN([_AM_CONFIG_HEADER],
   [# Add the stamp file to the list of files AC keeps track of,
   # along with our hook.
   AC_CONFIG_HEADERS([$1],
                     [# update the timestamp
   echo 'timestamp for $1' >"_AM_STAMP([$1])"
   $2],
                     [$3])
   ])# _AM_CONFIG_HEADER
   
   
   # AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
   # --------------------------------------------------------------
   AC_DEFUN([AM_CONFIG_HEADER],
   [AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
   ])# AM_CONFIG_HEADER
   
 # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-  # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
   
Line 894
 
Line 919
 AC_REQUIRE([AC_PROG_LD])dnl  AC_REQUIRE([AC_PROG_LD])dnl
 AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl  AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
 AC_REQUIRE([AC_PROG_NM])dnl  AC_REQUIRE([AC_PROG_NM])dnl
 AC_REQUIRE([LT_AC_PROG_SED])dnl  
   
 AC_REQUIRE([AC_PROG_LN_S])dnl  AC_REQUIRE([AC_PROG_LN_S])dnl
 AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl  AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
 AC_REQUIRE([AC_OBJEXT])dnl  AC_REQUIRE([AC_OBJEXT])dnl
Line 1063
 
Line 1086
   lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"    lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"    lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;    ;;
 irix* | nonstopux*)  irix*)
   symcode='[[BCDEGRST]]'    symcode='[[BCDEGRST]]'
   ;;    ;;
 osf*)  
   symcode='[[BCDEGQRST]]'  
   ;;  
 solaris* | sysv5*)  solaris* | sysv5*)
   symcode='[[BDT]]'    symcode='[[BDT]]'
   ;;    ;;
Line 1165
 
Line 1185
    save_CFLAGS="$CFLAGS"     save_CFLAGS="$CFLAGS"
    LIBS="conftstm.$ac_objext"     LIBS="conftstm.$ac_objext"
    CFLAGS="$CFLAGS$no_builtin_flag"     CFLAGS="$CFLAGS$no_builtin_flag"
    if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then     if AC_TRY_EVAL(ac_link) && test -s conftest; then
      pipe_works=yes       pipe_works=yes
    fi     fi
    LIBS="$save_LIBS"     LIBS="$save_LIBS"
Line 1709
 
Line 1729
       # like `-m68040'.        # like `-m68040'.
       lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'        lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
       ;;        ;;
     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)      beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.        # PIC is the default for these OSes.
       ;;        ;;
     darwin* | rhapsody*)      darwin* | rhapsody*)
Line 1752
 
Line 1772
       lt_cv_prog_cc_pic='+Z'        lt_cv_prog_cc_pic='+Z'
       ;;        ;;
   
     irix5* | irix6* | nonstopux*)      irix5* | irix6*)
       lt_cv_prog_cc_wl='-Wl,'        lt_cv_prog_cc_wl='-Wl,'
       lt_cv_prog_cc_static='-non_shared'        lt_cv_prog_cc_static='-non_shared'
       # PIC (with -KPIC) is the default.        # PIC (with -KPIC) is the default.
Line 1796
 
Line 1816
     sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
       lt_cv_prog_cc_pic='-KPIC'        lt_cv_prog_cc_pic='-KPIC'
       lt_cv_prog_cc_static='-Bstatic'        lt_cv_prog_cc_static='-Bstatic'
         if test "x$host_vendor" = xsni; then
    lt_cv_prog_cc_wl='-LD'
         else
       lt_cv_prog_cc_wl='-Wl,'        lt_cv_prog_cc_wl='-Wl,'
         fi
       ;;        ;;
   
     uts4*)      uts4*)
Line 2161
 
Line 2185
     # If the export-symbols file already is a .def file (1st line      # If the export-symbols file already is a .def file (1st line
     # is EXPORTS), use it as is.      # is EXPORTS), use it as is.
     # If DATA tags from a recent dlltool are present, honour them!      # If DATA tags from a recent dlltool are present, honour them!
     archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then      archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
  cp $export_symbols $output_objdir/$soname-def;   cp $export_symbols $output_objdir/$soname-def;
       else        else
  echo EXPORTS > $output_objdir/$soname-def;   echo EXPORTS > $output_objdir/$soname-def;
Line 2170
 
Line 2194
  set dummy \$symbol;   set dummy \$symbol;
  case \[$]# in   case \[$]# in
     2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;      2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
     4) echo "   \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;  
     *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;      *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
  esac;   esac;
  _lt_hint=`expr 1 + \$_lt_hint`;   _lt_hint=`expr 1 + \$_lt_hint`;
Line 2283
 
Line 2306
       # need to do runtime linking.        # need to do runtime linking.
       case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)        case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
  for ld_flag in $LDFLAGS; do   for ld_flag in $LDFLAGS; do
    case $ld_flag in     if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
    *-brtl*)  
      aix_use_runtimelinking=yes       aix_use_runtimelinking=yes
      break       break
    ;;     fi
    esac  
  done   done
       esac        esac
   
Line 2402
 
Line 2423
     esac      esac
     # FIXME: Relying on posixy $() will cause problems for      # FIXME: Relying on posixy $() will cause problems for
     #        cross-compilation, but unfortunately the echo tests do not      #        cross-compilation, but unfortunately the echo tests do not
     #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles      #        yet detect zsh echo's removal of \ escapes.
     #      `"' quotes if we put them in here... so don't!      archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
     archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'  
     # We need to add '_' to the symbols in $export_symbols first      # We need to add '_' to the symbols in $export_symbols first
     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'      #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
     hardcode_direct=yes      hardcode_direct=yes
Line 2456
 
Line 2476
     export_dynamic_flag_spec='${wl}-E'      export_dynamic_flag_spec='${wl}-E'
     ;;      ;;
   
   irix5* | irix6* | nonstopux*)    irix5* | irix6*)
     if test "$GCC" = yes; then      if test "$GCC" = yes; then
       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'  
     else      else
       archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'        archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
       hardcode_libdir_flag_spec='-rpath $libdir'  
     fi      fi
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
     hardcode_libdir_separator=:      hardcode_libdir_separator=:
     link_all_deplibs=yes      link_all_deplibs=yes
     ;;      ;;
Line 2491
 
Line 2510
     hardcode_direct=yes      hardcode_direct=yes
     hardcode_shlibpath_var=no      hardcode_shlibpath_var=no
     if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
       export_dynamic_flag_spec='${wl}-E'        export_dynamic_flag_spec='${wl}-E'
     else      else
Line 2501
 
Line 2520
  hardcode_libdir_flag_spec='-R$libdir'   hardcode_libdir_flag_spec='-R$libdir'
         ;;          ;;
       *)        *)
         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'          archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
         hardcode_libdir_flag_spec='${wl}-rpath,$libdir'          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
         ;;          ;;
       esac        esac
Line 2613
 
Line 2632
     ;;      ;;
   
   sysv4)    sysv4)
     case $host_vendor in      if test "x$host_vendor" = xsno; then
       sni)        archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
         archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'  
         hardcode_direct=yes # is this really true???          hardcode_direct=yes # is this really true???
         ;;      else
       siemens)  
         ## LD is ld it makes a PLAMLIB  
         ## CC just makes a GrossModule.  
         archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'  
         reload_cmds='$CC -r -o $output$reload_objs'  
         hardcode_direct=no  
         ;;  
       motorola)  
         archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'          archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
         hardcode_direct=no #Motorola manual says yes, but my tests say they lie          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
         ;;      fi
     esac  
     runpath_var='LD_RUN_PATH'      runpath_var='LD_RUN_PATH'
     hardcode_shlibpath_var=no      hardcode_shlibpath_var=no
     ;;      ;;
Line 2770
 
Line 2779
   
 aix4* | aix5*)  aix4* | aix5*)
   version_type=linux    version_type=linux
   need_lib_prefix=no  
   need_version=no  
   hardcode_into_libs=yes  
   if test "$host_cpu" = ia64; then    if test "$host_cpu" = ia64; then
     # AIX 5 supports IA64      # AIX 5 supports IA64
     library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'      library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
Line 2811
 
Line 2817
     fi      fi
     shlibpath_var=LIBPATH      shlibpath_var=LIBPATH
   fi    fi
   hardcode_into_libs=yes  
   ;;    ;;
   
 amigaos*)  amigaos*)
Line 2859
 
Line 2864
     ;;      ;;
   yes,mingw*)    yes,mingw*)
     library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'      library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
     sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
     ;;      ;;
   yes,pw32*)    yes,pw32*)
     library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
Line 2942
 
Line 2947
   postinstall_cmds='chmod 555 $lib'    postinstall_cmds='chmod 555 $lib'
   ;;    ;;
   
 irix5* | irix6* | nonstopux*)  irix5* | irix6*)
   case $host_os in    version_type=irix
     nonstopux*) version_type=nonstopux ;;  
     *)          version_type=irix ;;  
   esac  
   need_lib_prefix=no    need_lib_prefix=no
   need_version=no    need_version=no
   soname_spec='${libname}${release}.so$major'    soname_spec='${libname}${release}.so$major'
   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'    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* | nonstopux*)    irix5*)
     libsuff= shlibsuff=      libsuff= shlibsuff=
     ;;      ;;
   *)    *)
Line 3056
 
Line 3058
 osf3* | osf4* | osf5*)  osf3* | osf4* | osf5*)
   version_type=osf    version_type=osf
   need_version=no    need_version=no
   soname_spec='${libname}${release}.so$major'    soname_spec='${libname}${release}.so'
   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
   shlibpath_var=LD_LIBRARY_PATH    shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"    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"    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   hardcode_into_libs=yes  
   ;;    ;;
   
 sco3.2v5*)  sco3.2v5*)
Line 3104
 
Line 3105
   case $host_vendor in    case $host_vendor in
     sni)      sni)
       shlibpath_overrides_runpath=no        shlibpath_overrides_runpath=no
       need_lib_prefix=no  
       export_dynamic_flag_spec='${wl}-Blargedynsym'  
       runpath_var=LD_RUN_PATH  
       ;;  
     siemens)  
       need_lib_prefix=no  
       ;;        ;;
     motorola)      motorola)
       need_lib_prefix=no        need_lib_prefix=no
Line 3264
 
Line 3259
   # Now quote all the things that may contain metacharacters while being    # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the    # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.    # variables and quote the copies for generation of the libtool script.
   for var in echo old_CC old_CFLAGS SED \    for var in echo old_CC old_CFLAGS \
     AR AR_FLAGS CC LD LN_S NM SHELL \      AR AR_FLAGS CC LD LN_S NM SHELL \
     reload_flag reload_cmds wl \      reload_flag reload_cmds wl \
     pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \      pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
Line 3326
 
Line 3321
 # configuration script generated by Autoconf, you may include it under  # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.  # the same distribution terms that you use for the rest of that program.
   
 # A sed that does not truncate output.  
 SED=$lt_SED  
   
 # Sed that helps us avoid accidentally triggering echo(1) options like -n.  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
 Xsed="${SED} -e s/^X//"  Xsed="sed -e s/^X//"
   
 # The HP-UX ksh and POSIX shell print the target directory to stdout  # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.  # if CDPATH is set.
Line 4091
 
Line 4083
 # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies  # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
 #  -- PORTME fill in with the dynamic library characteristics  #  -- PORTME fill in with the dynamic library characteristics
 AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],  AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
 [AC_CACHE_CHECK([how to recognise dependent libraries],  [AC_CACHE_CHECK([how to recognise dependant libraries],
 lt_cv_deplibs_check_method,  lt_cv_deplibs_check_method,
 [lt_cv_file_magic_cmd='$MAGIC_CMD'  [lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=  lt_cv_file_magic_test_file=
Line 4166
 
Line 4158
   lt_cv_file_magic_test_file=/usr/lib/libc.sl    lt_cv_file_magic_test_file=/usr/lib/libc.sl
   ;;    ;;
   
 irix5* | irix6* | nonstopux*)  irix5* | irix6*)
   case $host_os in    case $host_os in
   irix5* | nonstopux*)    irix5*)
     # this will be overridden with pass_all, but let us keep it just in case      # 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"      lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
     ;;      ;;
Line 4190
 
Line 4182
 # This must be Linux ELF.  # This must be Linux ELF.
 linux-gnu*)  linux-gnu*)
   case $host_cpu in    case $host_cpu in
   alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*)    alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* )
     lt_cv_deplibs_check_method=pass_all ;;      lt_cv_deplibs_check_method=pass_all ;;
   *)    *)
     # glibc up to 2.1.1 does not perform some relocations on ARM      # glibc up to 2.1.1 does not perform some relocations on ARM
Line 4261
 
Line 4253
     lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"      lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
     lt_cv_file_magic_test_file=/lib/libc.so      lt_cv_file_magic_test_file=/lib/libc.so
     ;;      ;;
   siemens)  
     lt_cv_deplibs_check_method=pass_all  
     ;;  
   esac    esac
   ;;    ;;
 esac  esac
Line 4329
 
Line 4318
 ])  ])
   
 # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for  # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
 # the libltdl convenience library and LTDLINCL to the include flags for  # the libltdl convenience library and INCLTDL to the include flags for
 # the libltdl header and adds --enable-ltdl-convenience to the  # the libltdl header and adds --enable-ltdl-convenience to the
 # configure arguments.  Note that LIBLTDL and LTDLINCL are not  # configure arguments.  Note that LIBLTDL and INCLTDL are not
 # AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not  # AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
 # provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed  # provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
 # with '${top_builddir}/' and LTDLINCL will be prefixed with  # with '${top_builddir}/' and INCLTDL will be prefixed with
 # '${top_srcdir}/' (note the single quotes!).  If your package is not  # '${top_srcdir}/' (note the single quotes!).  If your package is not
 # flat and you're not using automake, define top_builddir and  # flat and you're not using automake, define top_builddir and
 # top_srcdir appropriately in the Makefiles.  # top_srcdir appropriately in the Makefiles.
Line 4346
 
Line 4335
       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;        ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   esac    esac
   LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
   LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
   # For backwards non-gettext consistent compatibility...  
   INCLTDL="$LTDLINCL"  
 ])  ])
   
 # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for  # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
 # the libltdl installable library and LTDLINCL to the include flags for  # the libltdl installable library and INCLTDL to the include flags for
 # the libltdl header and adds --enable-ltdl-install to the configure  # the libltdl header and adds --enable-ltdl-install to the configure
 # arguments.  Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is  # arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
 # AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed  # AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
 # libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will  # libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
 # be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed  # be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
 # with '${top_srcdir}/' (note the single quotes!).  If your package is  # with '${top_srcdir}/' (note the single quotes!).  If your package is
 # not flat and you're not using automake, define top_builddir and  # not flat and you're not using automake, define top_builddir and
 # top_srcdir appropriately in the Makefiles.  # top_srcdir appropriately in the Makefiles.
Line 4375
 
Line 4362
   if test x"$enable_ltdl_install" = x"yes"; then    if test x"$enable_ltdl_install" = x"yes"; then
     ac_configure_args="$ac_configure_args --enable-ltdl-install"      ac_configure_args="$ac_configure_args --enable-ltdl-install"
     LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la      LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
     LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])      INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
   else    else
     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"      ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
     LIBLTDL="-lltdl"      LIBLTDL="-lltdl"
     LTDLINCL=      INCLTDL=
   fi    fi
   # For backwards non-gettext consistent compatibility...  
   INCLTDL="$LTDLINCL"  
 ])  ])
   
 # old names  # old names
Line 4397
 
Line 4382
 # This is just to silence aclocal about the macro not being used  # This is just to silence aclocal about the macro not being used
 ifelse([AC_DISABLE_FAST_INSTALL])  ifelse([AC_DISABLE_FAST_INSTALL])
   
 # NOTE: This macro has been submitted for inclusion into   #  
 #  GNU Autoconf as AC_PROG_SED.  When it is available in   #  
 #  a released version of Autoconf we should remove this    #  
 #  macro and use it instead.                               #  
 # LT_AC_PROG_SED  
 # --------------  
 # Check for a fully-functional sed program, that truncates  
 # as few characters as possible.  Prefer GNU sed if found.  
 AC_DEFUN([LT_AC_PROG_SED],  
 [AC_MSG_CHECKING([for a sed that does not truncate output])  
 AC_CACHE_VAL(lt_cv_path_SED,  
 [# Loop through the user's path and test for sed and gsed.  
 # Then use that list of sed's as ones to test for truncation.  
 as_executable_p="test -f"  
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR  
 for as_dir in $PATH  
 do  
   IFS=$as_save_IFS  
   test -z "$as_dir" && as_dir=.  
   for ac_prog in sed gsed; do  
     for ac_exec_ext in '' $ac_executable_extensions; do  
       if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then  
         _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"  
       fi  
     done  
   done  
 done  
   
   # Create a temporary directory, and hook for its removal unless debugging.  
 $debug ||  
 {  
   trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0  
   trap '{ (exit 1); exit 1; }' 1 2 13 15  
 }  
   
 # Create a (secure) tmp directory for tmp files.  
 : ${TMPDIR=/tmp}  
 {  
   tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&  
   test -n "$tmp" && test -d "$tmp"  
 }  ||  
 {  
   tmp=$TMPDIR/sed$$-$RANDOM  
   (umask 077 && mkdir $tmp)  
 } ||  
 {  
    echo "$me: cannot create a temporary directory in $TMPDIR" >&2  
    { (exit 1); exit 1; }  
 }  
   _max=0  
   _count=0  
   # Add /usr/xpg4/bin/sed as it is typically found on Solaris  
   # along with /bin/sed that truncates output.  
   for _sed in $_sed_list /usr/xpg4/bin/sed; do  
     test ! -f ${_sed} && break  
     cat /dev/null > "$tmp/sed.in"  
     _count=0  
     echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"  
     # Check for GNU sed and select it if it is found.  
     if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then  
       lt_cv_path_SED=${_sed}  
       break  
     fi  
     while true; do  
       cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"  
       mv "$tmp/sed.tmp" "$tmp/sed.in"  
       cp "$tmp/sed.in" "$tmp/sed.nl"  
       echo >>"$tmp/sed.nl"  
       ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break  
       cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break  
       # 40000 chars as input seems more than enough  
       test $_count -gt 10 && break  
       _count=`expr $_count + 1`  
       if test $_count -gt $_max; then  
         _max=$_count  
         lt_cv_path_SED=$_sed  
       fi  
     done  
   done  
   rm -rf "$tmp"  
 ])  
 if test "X$SED" != "X"; then  
   lt_cv_path_SED=$SED  
 else  
   SED=$lt_cv_path_SED  
 fi  
 AC_MSG_RESULT([$SED])  
 ])  
   
   
 # Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.  # Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
   


Legend:
line(s) removed in v.1.5 
line(s) changed
 line(s) added in v.1.6

File made using version 1.98 of cvs2html by leaf at 2011-07-21 16:53