gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r9169 - in gnunet: m4 src/util


From: gnunet
Subject: [GNUnet-SVN] r9169 - in gnunet: m4 src/util
Date: Sun, 18 Oct 2009 07:59:16 -0600

Author: grothoff
Date: 2009-10-18 07:59:16 -0600 (Sun, 18 Oct 2009)
New Revision: 9169

Modified:
   gnunet/m4/argz.m4
   gnunet/m4/libtool.m4
   gnunet/m4/ltdl.m4
   gnunet/m4/ltoptions.m4
   gnunet/m4/ltsugar.m4
   gnunet/m4/ltversion.m4
   gnunet/src/util/
Log:
ignore testcase binary

Modified: gnunet/m4/argz.m4
===================================================================
--- gnunet/m4/argz.m4   2009-10-18 13:35:08 UTC (rev 9168)
+++ gnunet/m4/argz.m4   2009-10-18 13:59:16 UTC (rev 9169)
@@ -28,14 +28,14 @@
 AC_CHECK_FUNCS([argz_add argz_append argz_count argz_create_sep argz_insert \
        argz_next argz_stringify], [], [ARGZ_H=argz.h; AC_LIBOBJ([argz])])
 
-dnl if have system argz functions, allow forced use of
+dnl if have system argz functions, allow forced use of 
 dnl libltdl-supplied implementation (and default to do so
 dnl on "known bad" systems). Could use a runtime check, but
 dnl (a) detecting malloc issues is notoriously unreliable
 dnl (b) only known system that declares argz functions,
 dnl     provides them, yet they are broken, is cygwin
 dnl     releases prior to 16-Mar-2007 (1.5.24 and earlier)
-dnl So, it's more straightforward simply to special case
+dnl So, it's more straightforward simply to special case 
 dnl this for known bad systems.
 AS_IF([test -z "$ARGZ_H"],
     [AC_CACHE_CHECK(

Modified: gnunet/m4/libtool.m4
===================================================================
--- gnunet/m4/libtool.m4        2009-10-18 13:35:08 UTC (rev 9168)
+++ gnunet/m4/libtool.m4        2009-10-18 13:59:16 UTC (rev 9169)
@@ -380,12 +380,12 @@
 # lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
 # ---------------------------------------------------
 m4_define([lt_decl_varnames_tagged],
-[m4_assert([$# <= 2])dnl
-_$0(m4_quote(m4_default([$1], [[, ]])),
-    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-m4_define([_lt_decl_varnames_tagged],
-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_quote(m4_if([$2], [],
+                    m4_quote(lt_decl_tag_varnames),
+                 m4_quote(m4_shift($@)))),
+     m4_split(m4_normalize(m4_quote(_LT_TAGS))))])
+m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)])
 
 
 # lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
@@ -945,10 +945,10 @@
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
     darwin1.*)
       _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined 
${wl}suppress' ;;
-    darwin*) # darwin 5.x on
+    darwin*) # darwin 5.x on 
       # 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?
+      # 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' ;;
@@ -990,11 +990,7 @@
   _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   _LT_TAGVAR(link_all_deplibs, $1)=yes
   _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
+  if test "$GCC" = "yes"; then
     output_verbose_link_cmd=echo
     _LT_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_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle 
\$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
@@ -1516,7 +1512,7 @@
     lt_cv_sys_max_cmd_len=-1;
     ;;
 
-  cygwin* | mingw* | cegcc*)
+  cygwin* | mingw*)
     # On Win9x/ME, this test blows up -- it succeeds, but takes
     # about 5 minutes as the teststring grows exponentially.
     # Worse, since 9x/ME are not pre-emptively multitasking,
@@ -1684,6 +1680,10 @@
 #  endif
 #endif
 
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
 void fnord() { int i=42;}
 int main ()
 {
@@ -1699,7 +1699,7 @@
   else
     puts (dlerror ());
 
-  return status;
+    exit (status);
 }]
 _LT_EOF
   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -1738,7 +1738,7 @@
     lt_cv_dlopen_self=yes
     ;;
 
-  mingw* | pw32* | cegcc*)
+  mingw* | pw32*)
     lt_cv_dlopen="LoadLibrary"
     lt_cv_dlopen_libs=
     ;;
@@ -2035,7 +2035,6 @@
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 m4_require([_LT_DECL_EGREP])dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_OBJDUMP])dnl
 m4_require([_LT_DECL_SED])dnl
 AC_MSG_CHECKING([dynamic linker characteristics])
 m4_if([$1],
@@ -2200,14 +2199,14 @@
   # libtool to hard-code these into programs
   ;;
 
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | mingw* | pw32*)
   version_type=windows
   shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
   case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  yes,cygwin* | yes,mingw* | yes,pw32*)
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
@@ -2230,7 +2229,7 @@
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | 
$SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
       ;;
-    mingw* | cegcc*)
+    mingw*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 
's/[[.]]/-/g'`${versuffix}${shared_ext}'
       sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | 
$SED -e "s/^libraries://" -e "s,=/,/,g"`
@@ -2656,7 +2655,7 @@
   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}'
+  library_name_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
@@ -2680,7 +2679,7 @@
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX 
COMPILER_PATH LIBRARY_PATH"
 fi
-
+ 
 if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
   sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 fi
@@ -2957,7 +2956,6 @@
 #  -- PORTME fill in with the dynamic library characteristics
 m4_defun([_LT_CHECK_MAGIC_METHOD],
 [m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
 AC_CACHE_CHECK([how to recognize dependent libraries],
 lt_cv_deplibs_check_method,
 [lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -3008,12 +3006,6 @@
   fi
   ;;
 
-cegcc)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format 
pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
 darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3325,7 +3317,7 @@
 aix*)
   symcode='[[BCDT]]'
   ;;
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | mingw* | pw32*)
   symcode='[[ABCDGISTW]]'
   ;;
 hpux*)
@@ -3571,7 +3563,7 @@
     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
+    mingw* | cygwin* | os2* | pw32*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -3598,11 +3590,10 @@
       fi
       ;;
     hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
       case $host_cpu in
-      hppa*64*)
+      hppa*64*|ia64*)
        ;;
       *)
        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
@@ -3700,19 +3691,12 @@
            _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
            ;;
-         ecpc* )
-           # old Intel C++ for x86_64 which still supported -KPIC.
+         icpc* | ecpc* )
+           # Intel C++
            _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
            _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
            ;;
-         icpc* )
-           # Intel C++, used to be incompatible with GCC.
-           # ICC 10 doesn't accept -KPIC any more.
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-           ;;
          pgCC* | pgcpp*)
            # Portland Group C++ compiler
            _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -3878,7 +3862,7 @@
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -3894,11 +3878,10 @@
       ;;
 
     hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
       case $host_cpu in
-      hppa*64*)
+      hppa*64*|ia64*)
        # +Z the default
        ;;
       *)
@@ -3948,7 +3931,7 @@
       fi
       ;;
 
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       m4_if([$1], [GCJ], [],
@@ -3979,25 +3962,11 @@
 
     linux* | k*bsd*-gnu)
       case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
+      icc* | ecc* | ifort*)
        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
        _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
         ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-       ;;
       pgcc* | pgf77* | pgf90* | pgf95*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
        # which looks to be a dead project)
@@ -4179,7 +4148,7 @@
   pw32*)
     _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
   ;;
-  cygwin* | mingw* | cegcc*)
+  cygwin* | mingw*)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | 
$global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 
DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ 
]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
   *)
@@ -4231,7 +4200,7 @@
   extract_expsyms_cmds=
 
   case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
+  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
     # Microsoft Visual C++.
@@ -4318,7 +4287,7 @@
       fi
       ;;
 
-    cygwin* | mingw* | pw32* | cegcc*)
+    cygwin* | mingw* | pw32*)
       # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
       # as there is no search path for DLLs.
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -4384,9 +4353,6 @@
          tmp_addflag=' -i_dynamic -nofor_main' ;;
        ifc* | ifort*)                  # Intel Fortran compiler
          tmp_addflag=' -nofor_main' ;;
-       lf95*)                          # Lahey Fortran 8.1
-         _LT_TAGVAR(whole_archive_flag_spec, $1)=
-         tmp_sharedflag='--shared' ;;
        xl[[cC]]*)                      # IBM XL C 8.0 on PPC (deal with xlf 
below)
          tmp_sharedflag='-qmkshrobj'
          tmp_addflag= ;;
@@ -4618,7 +4584,6 @@
        fi
       fi
 
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
       # It seems that -bexpall does not export symbols beginning with
       # underscore (_), so it is better to generate a list of symbols to 
export.
       _LT_TAGVAR(always_export_symbols, $1)=yes
@@ -4673,7 +4638,7 @@
       _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
       ;;
 
-    cygwin* | mingw* | pw32* | cegcc*)
+    cygwin* | mingw* | pw32*)
       # When not using gcc, we currently assume that we are using
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -4777,7 +4742,7 @@
          _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o 
$lib $libobjs $deplibs $compiler_flags'
          ;;
        ia64*)
-         _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname 
${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+         _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname 
${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
          ;;
        *)
          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname 
${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -5562,7 +5527,6 @@
           fi
         fi
 
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
         # It seems that -bexpall does not export symbols beginning with
         # underscore (_), so it is better to generate a list of symbols to
        # export.
@@ -5621,7 +5585,7 @@
         esac
         ;;
 
-      cygwin* | mingw* | pw32* | cegcc*)
+      cygwin* | mingw* | pw32*)
         # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
         # as there is no search path for DLLs.
         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -7006,18 +6970,6 @@
 ])
 
 
-# _LT_DECL_OBJDUMP
-# --------------
-# If we don't have a new enough Autoconf to choose the best objdump
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_OBJDUMP],
-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-AC_SUBST([OBJDUMP])
-])
-
-
 # _LT_DECL_SED
 # ------------
 # Check for a fully-functional sed program, that truncates

Modified: gnunet/m4/ltdl.m4
===================================================================
--- gnunet/m4/ltdl.m4   2009-10-18 13:35:08 UTC (rev 9168)
+++ gnunet/m4/ltdl.m4   2009-10-18 13:59:16 UTC (rev 9169)
@@ -7,7 +7,7 @@
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 17 LTDL_INIT
+# serial 15 LTDL_INIT
 
 # LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE])
 # ------------------------------------------
@@ -212,10 +212,26 @@
 # of into LIBOBJS.
 AC_DEFUN([_LT_LIBOBJ], [
   m4_pattern_allow([^_LT_LIBOBJS$])
+  AS_LITERAL_IF([$1], [_LT_LIBSOURCES([$1.c])])dnl
   _LT_LIBOBJS="$_LT_LIBOBJS $1.$ac_objext"
 ])# _LT_LIBOBJS
 
 
+# _LT_LIBSOURCES(MODULE_NAMES)
+# ----------------------------
+# Like AC_LIBSOURCES, except the directory where the libltdl source files
+# are expected is distinct from the user LIBOBJ directory.
+AC_DEFUN([_LT_LIBSOURCES], [
+  m4_foreach([_LTNAME], [$1], [
+    m4_syscmd([test -r "$lt_libobj_prefix]_LTNAME[" ||
+               test -z "$lt_libobj_prefix" ||
+               test ! -d "$lt_libobj_prefix"])dnl
+    m4_if(m4_sysval, [0], [],
+      [AC_FATAL([missing $lt_libobj_prefix/]_LTNAME)])
+  ])
+])# _LT_LIBSOURCES
+
+
 # LTDL_INIT([OPTIONS])
 # --------------------
 # Clients of libltdl can use this macro to allow the installer to
@@ -229,9 +245,9 @@
 
 dnl We need to keep our own list of libobjs separate from our parent project,
 dnl and the easiest way to do that is redefine the AC_LIBOBJs macro while
-dnl we look for our own LIBOBJs.
+dnl we look for our own LIBOBJs. Definitions in ltdl-libobj.m4.
 m4_pushdef([AC_LIBOBJ], m4_defn([_LT_LIBOBJ]))
-m4_pushdef([AC_LIBSOURCES])
+m4_pushdef([AC_LIBSOURCES], m4_defn([_LT_LIBSOURCES]))
 
 dnl If not otherwise defined, default to the 1.5.x compatible subproject mode:
 m4_if(_LTDL_MODE, [],
@@ -248,7 +264,7 @@
   # decide whether there is a useful installed version we can use.
   AC_CHECK_HEADER([ltdl.h],
       [AC_CHECK_DECL([lt_dlinterface_register],
-          [AC_CHECK_LIB([ltdl], [lt_dladvise_preload],
+          [AC_CHECK_LIB([ltdl], [lt_dlinterface_register],
               [with_included_ltdl=no],
               [with_included_ltdl=yes])],
           [with_included_ltdl=yes],
@@ -380,6 +396,12 @@
 m4_require([_LT_CHECK_DLPREOPEN])dnl
 m4_require([_LT_DECL_SED])dnl
 
+# lt_cv_dlopen_self gets defined by LT_SYS_DLOPEN_SELF, called by LT_INIT
+if test "$lt_cv_dlopen_self" = yes; then
+  AC_DEFINE([LTDL_DLOPEN_SELF_WORKS], [1],
+    [Define if dlopen(NULL) is able to resolve symbols from the main program.])
+fi
+
 dnl Don't require this, or it will be expanded earlier than the code
 dnl that sets the variables it relies on:
 _LT_ENABLE_INSTALL
@@ -407,8 +429,6 @@
 AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])])
 AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])])
 
-AC_DEFINE_UNQUOTED([LT_LIBEXT],["$libext"],[The archive extension])
-
 name=ltdl
 LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""`
 AC_SUBST([LTDLOPEN])

Modified: gnunet/m4/ltoptions.m4
===================================================================
--- gnunet/m4/ltoptions.m4      2009-10-18 13:35:08 UTC (rev 9168)
+++ gnunet/m4/ltoptions.m4      2009-10-18 13:59:16 UTC (rev 9169)
@@ -125,7 +125,7 @@
 [enable_win32_dll=yes
 
 case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32*)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)

Modified: gnunet/m4/ltsugar.m4
===================================================================
--- gnunet/m4/ltsugar.m4        2009-10-18 13:35:08 UTC (rev 9168)
+++ gnunet/m4/ltsugar.m4        2009-10-18 13:59:16 UTC (rev 9169)
@@ -1,13 +1,13 @@
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
+#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+#   Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 6 ltsugar.m4
+# serial 5 ltsugar.m4
 
 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
@@ -63,14 +63,14 @@
 # Produce a SEP delimited list of all paired combinations of elements of
 # PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
 # has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
 m4_define([lt_combine],
-[m4_if(m4_eval([$# > 3]), [1],
-       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-[[m4_foreach([_Lt_prefix], [$2],
-            [m4_foreach([_Lt_suffix],
-               ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-       [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+[m4_if([$2], [], [],
+  [m4_if([$4], [], [],
+    [lt_join(m4_quote(m4_default([$1], [[, ]])),
+      lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2],
+                  [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]),
+                              [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl
+])
 
 
 # lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])

Modified: gnunet/m4/ltversion.m4
===================================================================
--- gnunet/m4/ltversion.m4      2009-10-18 13:35:08 UTC (rev 9168)
+++ gnunet/m4/ltversion.m4      2009-10-18 13:59:16 UTC (rev 9169)
@@ -9,15 +9,15 @@
 
 # Generated from ltversion.in.
 
-# serial 3012 ltversion.m4
+# serial 2976 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
-m4_define([LT_PACKAGE_REVISION], [1.3012])
+m4_define([LT_PACKAGE_VERSION], [2.2.4])
+m4_define([LT_PACKAGE_REVISION], [1.2976])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6'
-macro_revision='1.3012'
+[macro_version='2.2.4'
+macro_revision='1.2976'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])


Property changes on: gnunet/src/util
___________________________________________________________________
Modified: svn:ignore
   - resolver_api.gcno
resolver_api.gcda
peer.gcno
peer.gcda
container_slist.gcno
container_slist.gcda
container_heap.gcno
container_heap.gcda
connection.gcno
connection.gcda
bio.gcno
bio.gcda
test_resolver_api.gcno
test_resolver_api.gcda
test_container_slist.gcno
test_container_slist.gcda
test_container_heap.gcno
test_container_heap.gcda
test_connection_transmit_cancel.gcno
test_connection_transmit_cancel.gcda
test_connection_timeout_no_connect.gcno
test_connection_timeout_no_connect.gcda
test_connection_timeout.gcno
test_connection_timeout.gcda
test_connection_receive_cancel.gcno
test_connection_receive_cancel.gcda
test_connection_addressing.gcno
test_connection_addressing.gcda
test_connection.gcno
test_connection.gcda
gnunet-service-resolver.gcno
test_resolver_api
test_container_slist
test_container_heap
gnunet-service-resolver
test_container_vector
test_connection_transmit_cancel
test_connection_timeout_no_connect
test_connection_timeout
test_connection_receive_cancel
test_connection_addressing
test_connection
time.gcno
time.gcda
test_plugin_plug.gcno
test_plugin_plug.gcda
strings.gcno
strings.gcda
signal.gcno
signal.gcda
service.gcno
service.gcda
server_tc.gcno
server_tc.gcda
server.gcno
server.gcda
scheduler.gcno
scheduler.gcda
pseudonym.gcno
pseudonym.gcda
program.gcno
program.gcda
plugin.gcno
plugin.gcda
os_priority.gcno
os_priority.gcda
os_network.gcno
os_network.gcda
os_load.gcno
os_load.gcda
os_installation.gcno
os_installation.gcda
network.gcno
network.gcda
getopt_helpers.gcno
getopt_helpers.gcda
getopt.gcno
getopt.gcda
disk.gcno
disk.gcda
crypto_rsa.gcno
crypto_rsa.gcda
crypto_random.gcno
crypto_random.gcda
crypto_ksk.gcno
crypto_ksk.gcda
crypto_hash.gcno
crypto_hash.gcda
crypto_crc.gcno
crypto_crc.gcda
crypto_aes.gcno
crypto_aes.gcda
container_multihashmap.gcno
container_multihashmap.gcda
container_meta_data.gcno
container_meta_data.gcda
container_bloomfilter.gcno
container_bloomfilter.gcda
configuration.gcno
configuration.gcda
common_logging.gcno
common_logging.gcda
common_gettext.gcno
common_gettext.gcda
common_endian.gcno
common_endian.gcda
common_allocation.gcno
common_allocation.gcda
client.gcno
client.gcda
test_time.gcda
test_strings.gcda
test_service.gcda
test_server_with_client.gcda
test_server_disconnect.gcda
test_server.gcda
test_scheduler_delay.gcda
test_scheduler.gcda
test_pseudonym.gcda
test_program.gcda
test_plugin.gcda
test_os_priority.gcda
test_os_network.gcda
test_os_load.gcda
perf_crypto_hash.gcda
test_time.gcno
test_time
test_strings.gcno
test_strings
test_service.gcno
test_service
test_server_with_client.gcno
test_server_with_client
test_server_disconnect.gcno
test_server_disconnect
test_server.gcno
test_server
test_scheduler_delay.gcno
test_scheduler_delay
test_scheduler.gcno
test_scheduler
test_pseudonym.gcno
test_pseudonym
test_program.gcno
test_program
test_plugin.gcno
test_plugin
test_os_priority.gcno
test_os_priority
test_os_network.gcno
test_os_network
test_os_load.gcno
test_os_load
test_network_transmit_cancel.gcno
test_network_transmit_cancel.gcda
test_network_transmit_cancel
test_network_timeout_no_connect.gcno
test_network_timeout_no_connect.gcda
test_network_timeout_no_connect
test_network_timeout.gcno
test_network_timeout.gcda
test_network_timeout
test_network_receive_cancel.gcno
test_network_receive_cancel.gcda
test_network_receive_cancel
test_network_addressing.gcno
test_network_addressing.gcda
test_network_addressing
test_network.gcno
test_network.gcda
test_network
test_getopt.gcno
test_getopt.gcda
test_getopt
test_disk.gcno
test_disk.gcda
test_disk
test_crypto_rsa.gcno
test_crypto_rsa.gcda
test_crypto_rsa
test_crypto_random.gcno
test_crypto_random.gcda
test_crypto_random
test_crypto_ksk.gcno
test_crypto_ksk.gcda
test_crypto_ksk
test_crypto_hash.gcno
test_crypto_hash.gcda
test_crypto_hash
test_crypto_crc.gcno
test_crypto_crc.gcda
test_crypto_crc
test_crypto_aes_weak.gcno
test_crypto_aes_weak.gcda
test_crypto_aes_weak
test_crypto_aes.gcno
test_crypto_aes.gcda
test_crypto_aes
test_container_multihashmap.gcno
test_container_multihashmap.gcda
test_container_multihashmap
test_container_meta_data.gcno
test_container_meta_data.gcda
test_container_meta_data
test_container_bloomfilter.gcno
test_container_bloomfilter.gcda
test_container_bloomfilter
test_configuration.gcno
test_configuration.gcda
test_configuration
test_common_logging.gcno
test_common_logging.gcda
test_common_logging
test_common_endian.gcno
test_common_endian.gcda
test_common_endian
test_common_allocation.gcno
test_common_allocation.gcda
test_common_allocation
test_client.gcno
test_client.gcda
test_client
perf_crypto_hash.gcno
perf_crypto_hash
Makefile.in
Makefile
.deps

   + test_bio
resolver_api.gcno
resolver_api.gcda
peer.gcno
peer.gcda
container_slist.gcno
container_slist.gcda
container_heap.gcno
container_heap.gcda
connection.gcno
connection.gcda
bio.gcno
bio.gcda
test_resolver_api.gcno
test_resolver_api.gcda
test_container_slist.gcno
test_container_slist.gcda
test_container_heap.gcno
test_container_heap.gcda
test_connection_transmit_cancel.gcno
test_connection_transmit_cancel.gcda
test_connection_timeout_no_connect.gcno
test_connection_timeout_no_connect.gcda
test_connection_timeout.gcno
test_connection_timeout.gcda
test_connection_receive_cancel.gcno
test_connection_receive_cancel.gcda
test_connection_addressing.gcno
test_connection_addressing.gcda
test_connection.gcno
test_connection.gcda
gnunet-service-resolver.gcno
test_resolver_api
test_container_slist
test_container_heap
gnunet-service-resolver
test_container_vector
test_connection_transmit_cancel
test_connection_timeout_no_connect
test_connection_timeout
test_connection_receive_cancel
test_connection_addressing
test_connection
time.gcno
time.gcda
test_plugin_plug.gcno
test_plugin_plug.gcda
strings.gcno
strings.gcda
signal.gcno
signal.gcda
service.gcno
service.gcda
server_tc.gcno
server_tc.gcda
server.gcno
server.gcda
scheduler.gcno
scheduler.gcda
pseudonym.gcno
pseudonym.gcda
program.gcno
program.gcda
plugin.gcno
plugin.gcda
os_priority.gcno
os_priority.gcda
os_network.gcno
os_network.gcda
os_load.gcno
os_load.gcda
os_installation.gcno
os_installation.gcda
network.gcno
network.gcda
getopt_helpers.gcno
getopt_helpers.gcda
getopt.gcno
getopt.gcda
disk.gcno
disk.gcda
crypto_rsa.gcno
crypto_rsa.gcda
crypto_random.gcno
crypto_random.gcda
crypto_ksk.gcno
crypto_ksk.gcda
crypto_hash.gcno
crypto_hash.gcda
crypto_crc.gcno
crypto_crc.gcda
crypto_aes.gcno
crypto_aes.gcda
container_multihashmap.gcno
container_multihashmap.gcda
container_meta_data.gcno
container_meta_data.gcda
container_bloomfilter.gcno
container_bloomfilter.gcda
configuration.gcno
configuration.gcda
common_logging.gcno
common_logging.gcda
common_gettext.gcno
common_gettext.gcda
common_endian.gcno
common_endian.gcda
common_allocation.gcno
common_allocation.gcda
client.gcno
client.gcda
test_time.gcda
test_strings.gcda
test_service.gcda
test_server_with_client.gcda
test_server_disconnect.gcda
test_server.gcda
test_scheduler_delay.gcda
test_scheduler.gcda
test_pseudonym.gcda
test_program.gcda
test_plugin.gcda
test_os_priority.gcda
test_os_network.gcda
test_os_load.gcda
perf_crypto_hash.gcda
test_time.gcno
test_time
test_strings.gcno
test_strings
test_service.gcno
test_service
test_server_with_client.gcno
test_server_with_client
test_server_disconnect.gcno
test_server_disconnect
test_server.gcno
test_server
test_scheduler_delay.gcno
test_scheduler_delay
test_scheduler.gcno
test_scheduler
test_pseudonym.gcno
test_pseudonym
test_program.gcno
test_program
test_plugin.gcno
test_plugin
test_os_priority.gcno
test_os_priority
test_os_network.gcno
test_os_network
test_os_load.gcno
test_os_load
test_network_transmit_cancel.gcno
test_network_transmit_cancel.gcda
test_network_transmit_cancel
test_network_timeout_no_connect.gcno
test_network_timeout_no_connect.gcda
test_network_timeout_no_connect
test_network_timeout.gcno
test_network_timeout.gcda
test_network_timeout
test_network_receive_cancel.gcno
test_network_receive_cancel.gcda
test_network_receive_cancel
test_network_addressing.gcno
test_network_addressing.gcda
test_network_addressing
test_network.gcno
test_network.gcda
test_network
test_getopt.gcno
test_getopt.gcda
test_getopt
test_disk.gcno
test_disk.gcda
test_disk
test_crypto_rsa.gcno
test_crypto_rsa.gcda
test_crypto_rsa
test_crypto_random.gcno
test_crypto_random.gcda
test_crypto_random
test_crypto_ksk.gcno
test_crypto_ksk.gcda
test_crypto_ksk
test_crypto_hash.gcno
test_crypto_hash.gcda
test_crypto_hash
test_crypto_crc.gcno
test_crypto_crc.gcda
test_crypto_crc
test_crypto_aes_weak.gcno
test_crypto_aes_weak.gcda
test_crypto_aes_weak
test_crypto_aes.gcno
test_crypto_aes.gcda
test_crypto_aes
test_container_multihashmap.gcno
test_container_multihashmap.gcda
test_container_multihashmap
test_container_meta_data.gcno
test_container_meta_data.gcda
test_container_meta_data
test_container_bloomfilter.gcno
test_container_bloomfilter.gcda
test_container_bloomfilter
test_configuration.gcno
test_configuration.gcda
test_configuration
test_common_logging.gcno
test_common_logging.gcda
test_common_logging
test_common_endian.gcno
test_common_endian.gcda
test_common_endian
test_common_allocation.gcno
test_common_allocation.gcda
test_common_allocation
test_client.gcno
test_client.gcda
test_client
perf_crypto_hash.gcno
perf_crypto_hash
Makefile.in
Makefile
.deps






reply via email to

[Prev in Thread] Current Thread [Next in Thread]