Mercurial > mxe-octave

changeset 955:d24321cf0076

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade package popt Much easier now that we don't need gnulib here.
author Mark Brand <mabrand@mabrand.nl>
date Wed, 12 May 2010 01:15:55 +0200
parents 41730f4d56ea
children 9a8f1b49a25f
files src/popt-1-win32.patch src/popt-2-gnulib.patch src/popt.mk
diffstat 3 files changed, 12 insertions(+), 738 deletions(-) [+]
line wrap: on
line diff
--- a/src/popt-1-win32.patch	Wed May 12 19:25:44 2010 +0200
+++ b/src/popt-1-win32.patch	Wed May 12 01:15:55 2010 +0200
@@ -1,91 +1,10 @@
 This file is part of mingw-cross-env.
 See doc/index.html for further information.
 
-diff -urN popt-1.15/autogen.sh popt-1.15-mod/autogen.sh
---- popt-1.15/autogen.sh	2008-02-14 08:33:39.000000000 +0100
-+++ popt-1.15-mod/autogen.sh	2009-06-16 14:48:40.000000000 +0200
-@@ -5,6 +5,8 @@
- 
- THEDIR="`pwd`"
- 
-+gnulib-tool --update
-+
- libtoolize=`which glibtoolize 2>/dev/null`
- case $libtoolize in
- /*) ;;
-diff -urN popt-1.15/configure.ac popt-1.15-mod/configure.ac
---- popt-1.15/configure.ac	2009-04-12 21:31:09.000000000 +0200
-+++ popt-1.15-mod/configure.ac	2009-06-16 14:48:40.000000000 +0200
-@@ -1,4 +1,4 @@
--AC_PREREQ(2.57)
-+AC_PREREQ([2.59])
- AC_INIT(popt, 1.15, popt-devel@rpm5.org)
- AC_CANONICAL_TARGET
- AC_CONFIG_SRCDIR([popt.h])
-@@ -17,6 +17,7 @@
- ALL_LINGUAS="cs da de eo es fi fr ga gl hu id is it ja ko nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
- 
- AC_PROG_CC
-+gl_EARLY
- AC_PROG_INSTALL
- AC_PROG_LIBTOOL
- 
-@@ -42,7 +43,10 @@
- AC_ISC_POSIX
- AM_C_PROTOTYPES
- 
--AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h)
-+dnl Gnulib tests.
-+gl_INIT
-+
-+AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h sys/ioctl.h)
- 
- # For some systems we know that we have ld_version scripts.
- # Use it then as default.
-@@ -66,7 +70,7 @@
- AC_CHECK_FUNC(setreuid, [], [
-     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
- ])
--AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom)
-+AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom random)
- 
- AM_GNU_GETTEXT([external])
- AM_ICONV_LINK
-@@ -80,4 +84,4 @@
- 	[Full path to popt top_srcdir.])
- AC_SUBST(POPT_SOURCE_PATH)
- 
--AC_OUTPUT([Doxyfile Makefile po/Makefile.in])
-+AC_OUTPUT([Doxyfile Makefile  po/Makefile.in lib/Makefile])
-diff -urN popt-1.15/Makefile.am popt-1.15-mod/Makefile.am
---- popt-1.15/Makefile.am	2009-04-12 21:31:09.000000000 +0200
-+++ popt-1.15-mod/Makefile.am	2009-06-16 14:49:34.000000000 +0200
-@@ -8,9 +8,10 @@
- 	footer_no_timestamp.html libpopt.vers \
- 	testit.sh test-poptrc test3-data/0* \
- 	po/*.in po/*.po po/popt.pot \
--	popt.ps
-+	popt.ps \
-+	m4/gnulib-cache.m4
- 
--SUBDIRS = po
-+SUBDIRS = lib po
- 
- INCLUDES = -I. -I$(top_srcdir)
- 
-@@ -40,7 +41,7 @@
- usrlib_LTLIBRARIES = libpopt.la
- 
- libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
--libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
-+libpopt_la_LDFLAGS = @LTLIBINTL@ @LTLIBICONV@
- 
- if HAVE_LD_VERSION_SCRIPT
- libpopt_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpopt.vers
-diff -urN popt-1.15/popt.c popt-1.15-mod/popt.c
---- popt-1.15/popt.c	2009-04-12 20:14:38.000000000 +0200
-+++ popt-1.15-mod/popt.c	2009-06-16 14:48:40.000000000 +0200
-@@ -766,6 +766,21 @@
+diff -urN a/popt.c b/popt.c
+--- a/popt.c	2010-01-19 01:39:10.000000000 +0100
++++ b/popt.c	2010-05-12 00:15:14.959504505 +0200
+@@ -972,6 +972,21 @@
  /*@=unqualifiedtrans =nullstate@*/
  }
  
@@ -107,9 +26,9 @@
  /*@unchecked@*/
  static unsigned int seed = 0;
  
-diff -urN popt-1.15/poptconfig.c popt-1.15-mod/poptconfig.c
---- popt-1.15/poptconfig.c	2009-04-12 20:14:38.000000000 +0200
-+++ popt-1.15-mod/poptconfig.c	2009-06-16 14:48:40.000000000 +0200
+diff -urN a/poptconfig.c b/poptconfig.c
+--- a/poptconfig.c	2009-05-20 15:18:07.000000000 +0200
++++ b/poptconfig.c	2010-05-12 00:15:14.959504505 +0200
 @@ -141,18 +141,23 @@
  int poptSaneFile(const char * fn)
  {
@@ -135,9 +54,9 @@
      return 1;
  }
  
-diff -urN popt-1.15/popthelp.c popt-1.15-mod/popthelp.c
---- popt-1.15/popthelp.c	2009-04-12 20:14:38.000000000 +0200
-+++ popt-1.15-mod/popthelp.c	2009-06-16 14:48:40.000000000 +0200
+diff -urN a/popthelp.c b/popthelp.c
+--- a/popthelp.c	2009-08-28 02:06:33.000000000 +0200
++++ b/popthelp.c	2010-05-12 00:15:14.964949157 +0200
 @@ -12,8 +12,10 @@
  
  #define        POPT_USE_TIOCGWINSZ
--- a/src/popt-2-gnulib.patch	Wed May 12 19:25:44 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,641 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-diff -urN popt-1.15-mod/lib/dummy.c popt-1.15-mod2/lib/dummy.c
---- popt-1.15-mod/lib/dummy.c	1970-01-01 01:00:00.000000000 +0100
-+++ popt-1.15-mod2/lib/dummy.c	2009-06-16 15:18:05.000000000 +0200
-@@ -0,0 +1,42 @@
-+/* A dummy file, to prevent empty libraries from breaking builds.
-+   Copyright (C) 2004, 2007 Free Software Foundation, Inc.
-+
-+   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
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+/* Some systems, reportedly OpenBSD and Mac OS X, refuse to create
-+   libraries without any object files.  You might get an error like:
-+
-+   > ar cru .libs/libgl.a
-+   > ar: no archive members specified
-+
-+   Compiling this file, and adding its object file to the library, will
-+   prevent the library from being empty.  */
-+
-+/* Some systems, such as Solaris with cc 5.0, refuse to work with libraries
-+   that don't export any symbol.  You might get an error like:
-+
-+   > cc ... libgnu.a
-+   > ild: (bad file) garbled symbol table in archive ../gllib/libgnu.a
-+
-+   Compiling this file, and adding its object file to the library, will
-+   prevent the library from exporting no symbols.  */
-+
-+#ifdef __sun
-+/* This declaration ensures that the library will export at least 1 symbol.  */
-+int gl_dummy_symbol;
-+#else
-+/* This declaration is solely to ensure that after preprocessing
-+   this file is never empty.  */
-+typedef int dummy;
-+#endif
-diff -urN popt-1.15-mod/lib/Makefile.am popt-1.15-mod2/lib/Makefile.am
---- popt-1.15-mod/lib/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ popt-1.15-mod2/lib/Makefile.am	2009-06-16 15:18:05.000000000 +0200
-@@ -0,0 +1,53 @@
-+## DO NOT EDIT! GENERATED AUTOMATICALLY!
-+## Process this file with automake to produce Makefile.in.
-+# Copyright (C) 2002-2009 Free Software Foundation, Inc.
-+#
-+# This file is free software, distributed under the terms of the GNU
-+# General Public License.  As a special exception to the GNU General
-+# Public License, this file may be distributed as part of a program
-+# that contains a configuration script generated by Autoconf, under
-+# the same distribution terms as the rest of that program.
-+#
-+# Generated by gnulib-tool.
-+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --libtool --macro-prefix=gl 
-+
-+AUTOMAKE_OPTIONS = 1.5 gnits
-+
-+SUBDIRS =
-+noinst_HEADERS =
-+noinst_LIBRARIES =
-+noinst_LTLIBRARIES =
-+EXTRA_DIST =
-+BUILT_SOURCES =
-+SUFFIXES =
-+MOSTLYCLEANFILES = core *.stackdump
-+MOSTLYCLEANDIRS =
-+CLEANFILES =
-+DISTCLEANFILES =
-+MAINTAINERCLEANFILES =
-+
-+AM_CPPFLAGS =
-+AM_CFLAGS =
-+
-+noinst_LTLIBRARIES += libgnu.la
-+
-+libgnu_la_SOURCES =
-+libgnu_la_LIBADD = $(gl_LTLIBOBJS)
-+libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS)
-+EXTRA_libgnu_la_SOURCES =
-+libgnu_la_LDFLAGS = $(AM_LDFLAGS)
-+
-+## begin gnulib module dummy
-+
-+libgnu_la_SOURCES += dummy.c
-+
-+## end   gnulib module dummy
-+
-+
-+mostlyclean-local: mostlyclean-generic
-+	@for dir in '' $(MOSTLYCLEANDIRS); do \
-+	  if test -n "$$dir" && test -d $$dir; then \
-+	    echo "rmdir $$dir"; rmdir $$dir; \
-+	  fi; \
-+	done; \
-+	:
-diff -urN popt-1.15-mod/m4/00gnulib.m4 popt-1.15-mod2/m4/00gnulib.m4
---- popt-1.15-mod/m4/00gnulib.m4	1970-01-01 01:00:00.000000000 +0100
-+++ popt-1.15-mod2/m4/00gnulib.m4	2009-06-16 15:18:05.000000000 +0200
-@@ -0,0 +1,30 @@
-+# 00gnulib.m4 serial 2
-+dnl Copyright (C) 2009 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl This file must be named something that sorts before all other
-+dnl gnulib-provided .m4 files.  It is needed until such time as we can
-+dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics.
-+
-+# AC_DEFUN_ONCE([NAME], VALUE)
-+# ----------------------------
-+# Define NAME to expand to VALUE on the first use (whether by direct
-+# expansion, or by AC_REQUIRE), and to nothing on all subsequent uses.
-+# Avoid bugs in AC_REQUIRE in Autoconf 2.63 and earlier.  This
-+# definition is slower than the version in Autoconf 2.64, because it
-+# can only use interfaces that existed since 2.59; but it achieves the
-+# same effect.  Quoting is necessary to avoid confusing Automake.
-+m4_version_prereq([2.63.263], [],
-+[m4_define([AC][_DEFUN_ONCE],
-+  [AC][_DEFUN([$1],
-+    [AC_REQUIRE([_gl_DEFUN_ONCE([$1])],
-+      [m4_indir([_gl_DEFUN_ONCE([$1])])])])]dnl
-+[AC][_DEFUN([_gl_DEFUN_ONCE([$1])], [$2])])])
-+
-+# gl_00GNULIB
-+# -----------
-+# Witness macro that this file has been included.  Needed to force
-+# Automake to include this file prior to all other gnulib .m4 files.
-+AC_DEFUN([gl_00GNULIB])
-diff -urN popt-1.15-mod/m4/gnulib-cache.m4 popt-1.15-mod2/m4/gnulib-cache.m4
---- popt-1.15-mod/m4/gnulib-cache.m4	1970-01-01 01:00:00.000000000 +0100
-+++ popt-1.15-mod2/m4/gnulib-cache.m4	2009-06-16 15:18:05.000000000 +0200
-@@ -0,0 +1,35 @@
-+# Copyright (C) 2002-2009 Free Software Foundation, Inc.
-+#
-+# This file is free software, distributed under the terms of the GNU
-+# General Public License.  As a special exception to the GNU General
-+# Public License, this file may be distributed as part of a program
-+# that contains a configuration script generated by Autoconf, under
-+# the same distribution terms as the rest of that program.
-+#
-+# Generated by gnulib-tool.
-+#
-+# This file represents the specification of how gnulib-tool is used.
-+# It acts as a cache: It is written and read by gnulib-tool.
-+# In projects using CVS, this file is meant to be stored in CVS,
-+# like the configure.ac and various Makefile.am files.
-+
-+
-+# Specification in the form of a command-line invocation:
-+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --libtool --macro-prefix=gl 
-+
-+# Specification in the form of a few gnulib-tool.m4 macro invocations:
-+gl_LOCAL_DIR([])
-+gl_MODULES([
-+  
-+])
-+gl_AVOID([])
-+gl_SOURCE_BASE([lib])
-+gl_M4_BASE([m4])
-+gl_PO_BASE([])
-+gl_DOC_BASE([doc])
-+gl_TESTS_BASE([tests])
-+gl_LIB([libgnu])
-+gl_MAKEFILE_NAME([])
-+gl_LIBTOOL
-+gl_MACRO_PREFIX([gl])
-+gl_PO_DOMAIN([])
-diff -urN popt-1.15-mod/m4/gnulib-common.m4 popt-1.15-mod2/m4/gnulib-common.m4
---- popt-1.15-mod/m4/gnulib-common.m4	1970-01-01 01:00:00.000000000 +0100
-+++ popt-1.15-mod2/m4/gnulib-common.m4	2009-06-16 15:18:05.000000000 +0200
-@@ -0,0 +1,124 @@
-+# gnulib-common.m4 serial 11
-+dnl Copyright (C) 2007-2009 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+# gl_COMMON
-+# is expanded unconditionally through gnulib-tool magic.
-+AC_DEFUN([gl_COMMON], [
-+  dnl Use AC_REQUIRE here, so that the code is expanded once only.
-+  AC_REQUIRE([gl_00GNULIB])
-+  AC_REQUIRE([gl_COMMON_BODY])
-+])
-+AC_DEFUN([gl_COMMON_BODY], [
-+  AH_VERBATIM([isoc99_inline],
-+[/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
-+   the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
-+   earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
-+   __APPLE__ && __MACH__ test for MacOS X.
-+   __APPLE_CC__ tests for the Apple compiler and its version.
-+   __STDC_VERSION__ tests for the C99 mode.  */
-+#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
-+# define __GNUC_STDC_INLINE__ 1
-+#endif])
-+  AH_VERBATIM([unused_parameter],
-+[/* Define as a marker that can be attached to function parameter declarations
-+   for parameters that are not used.  This helps to reduce warnings, such as
-+   from GCC -Wunused-parameter.  */
-+#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-+# define _UNUSED_PARAMETER_ __attribute__ ((__unused__))
-+#else
-+# define _UNUSED_PARAMETER_
-+#endif
-+])
-+])
-+
-+# gl_MODULE_INDICATOR([modulename])
-+# defines a C macro indicating the presence of the given module.
-+AC_DEFUN([gl_MODULE_INDICATOR],
-+[
-+  AC_DEFINE([GNULIB_]translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___]), [1],
-+    [Define to 1 when using the gnulib module ]$1[.])
-+])
-+
-+# m4_foreach_w
-+# is a backport of autoconf-2.59c's m4_foreach_w.
-+# Remove this macro when we can assume autoconf >= 2.60.
-+m4_ifndef([m4_foreach_w],
-+  [m4_define([m4_foreach_w],
-+    [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])])
-+
-+# AC_PROG_MKDIR_P
-+# is a backport of autoconf-2.60's AC_PROG_MKDIR_P.
-+# Remove this macro when we can assume autoconf >= 2.60.
-+m4_ifdef([AC_PROG_MKDIR_P], [], [
-+  AC_DEFUN_ONCE([AC_PROG_MKDIR_P],
-+    [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
-+     MKDIR_P='$(mkdir_p)'
-+     AC_SUBST([MKDIR_P])])])
-+
-+# AC_C_RESTRICT
-+# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61,
-+# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++
-+# works.
-+# This definition can be removed once autoconf >= 2.62 can be assumed.
-+AC_DEFUN([AC_C_RESTRICT],
-+[AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict],
-+  [ac_cv_c_restrict=no
-+   # The order here caters to the fact that C++ does not require restrict.
-+   for ac_kw in __restrict __restrict__ _Restrict restrict; do
-+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-+      [[typedef int * int_ptr;
-+	int foo (int_ptr $ac_kw ip) {
-+	return ip[0];
-+       }]],
-+      [[int s[1];
-+	int * $ac_kw t = s;
-+	t[0] = 0;
-+	return foo(t)]])],
-+      [ac_cv_c_restrict=$ac_kw])
-+     test "$ac_cv_c_restrict" != no && break
-+   done
-+  ])
-+ AH_VERBATIM([restrict],
-+[/* Define to the equivalent of the C99 'restrict' keyword, or to
-+   nothing if this is not supported.  Do not define if restrict is
-+   supported directly.  */
-+#undef restrict
-+/* Work around a bug in Sun C++: it does not support _Restrict, even
-+   though the corresponding Sun C compiler does, which causes
-+   "#define restrict _Restrict" in the previous line.  Perhaps some future
-+   version of Sun C++ will work with _Restrict; if so, it'll probably
-+   define __RESTRICT, just as Sun C does.  */
-+#if defined __SUNPRO_CC && !defined __RESTRICT
-+# define _Restrict
-+#endif])
-+ case $ac_cv_c_restrict in
-+   restrict) ;;
-+   no) AC_DEFINE([restrict], []) ;;
-+   *)  AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
-+ esac
-+])
-+
-+# gl_BIGENDIAN
-+# is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.
-+# Note that AC_REQUIRE([AC_C_BIGENDIAN]) does not work reliably because some
-+# macros invoke AC_C_BIGENDIAN with arguments.
-+AC_DEFUN([gl_BIGENDIAN],
-+[
-+  AC_C_BIGENDIAN
-+])
-+
-+# gl_CACHE_VAL_SILENT(cache-id, command-to-set-it)
-+# is like AC_CACHE_VAL(cache-id, command-to-set-it), except that it does not
-+# output a spurious "(cached)" mark in the midst of other configure output.
-+# This macro should be used instead of AC_CACHE_VAL when it is not surrounded
-+# by an AC_MSG_CHECKING/AC_MSG_RESULT pair.
-+AC_DEFUN([gl_CACHE_VAL_SILENT],
-+[
-+  saved_as_echo_n="$as_echo_n"
-+  as_echo_n=':'
-+  AC_CACHE_VAL([$1], [$2])
-+  as_echo_n="$saved_as_echo_n"
-+])
-diff -urN popt-1.15-mod/m4/gnulib-comp.m4 popt-1.15-mod2/m4/gnulib-comp.m4
---- popt-1.15-mod/m4/gnulib-comp.m4	1970-01-01 01:00:00.000000000 +0100
-+++ popt-1.15-mod2/m4/gnulib-comp.m4	2009-06-16 15:18:05.000000000 +0200
-@@ -0,0 +1,175 @@
-+# DO NOT EDIT! GENERATED AUTOMATICALLY!
-+# Copyright (C) 2002-2009 Free Software Foundation, Inc.
-+#
-+# This file is free software, distributed under the terms of the GNU
-+# General Public License.  As a special exception to the GNU General
-+# Public License, this file may be distributed as part of a program
-+# that contains a configuration script generated by Autoconf, under
-+# the same distribution terms as the rest of that program.
-+#
-+# Generated by gnulib-tool.
-+#
-+# This file represents the compiled summary of the specification in
-+# gnulib-cache.m4. It lists the computed macro invocations that need
-+# to be invoked from configure.ac.
-+# In projects using CVS, this file can be treated like other built files.
-+
-+
-+# This macro should be invoked from ./configure.ac, in the section
-+# "Checks for programs", right after AC_PROG_CC, and certainly before
-+# any checks for libraries, header files, types and library functions.
-+AC_DEFUN([gl_EARLY],
-+[
-+  m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace
-+  m4_pattern_allow([^gl_ES$])dnl a valid locale name
-+  m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
-+  m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
-+  AC_REQUIRE([AC_PROG_RANLIB])
-+])
-+
-+# This macro should be invoked from ./configure.ac, in the section
-+# "Check for header files, types and library functions".
-+AC_DEFUN([gl_INIT],
-+[
-+  AM_CONDITIONAL([GL_COND_LIBTOOL], [true])
-+  gl_cond_libtool=true
-+  m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ]))
-+  m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS]))
-+  m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES]))
-+  m4_pushdef([gl_LIBSOURCES_LIST], [])
-+  m4_pushdef([gl_LIBSOURCES_DIR], [])
-+  gl_COMMON
-+  gl_source_base='lib'
-+  m4_ifval(gl_LIBSOURCES_LIST, [
-+    m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ ||
-+      for gl_file in ]gl_LIBSOURCES_LIST[ ; do
-+        if test ! -r ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file ; then
-+          echo "missing file ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file" >&2
-+          exit 1
-+        fi
-+      done])dnl
-+      m4_if(m4_sysval, [0], [],
-+        [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])])
-+  ])
-+  m4_popdef([gl_LIBSOURCES_DIR])
-+  m4_popdef([gl_LIBSOURCES_LIST])
-+  m4_popdef([AC_LIBSOURCES])
-+  m4_popdef([AC_REPLACE_FUNCS])
-+  m4_popdef([AC_LIBOBJ])
-+  AC_CONFIG_COMMANDS_PRE([
-+    gl_libobjs=
-+    gl_ltlibobjs=
-+    if test -n "$gl_LIBOBJS"; then
-+      # Remove the extension.
-+      sed_drop_objext='s/\.o$//;s/\.obj$//'
-+      for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed "$sed_drop_objext" | sort | uniq`; do
-+        gl_libobjs="$gl_libobjs $i.$ac_objext"
-+        gl_ltlibobjs="$gl_ltlibobjs $i.lo"
-+      done
-+    fi
-+    AC_SUBST([gl_LIBOBJS], [$gl_libobjs])
-+    AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs])
-+  ])
-+  gltests_libdeps=
-+  gltests_ltlibdeps=
-+  m4_pushdef([AC_LIBOBJ], m4_defn([gltests_LIBOBJ]))
-+  m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gltests_REPLACE_FUNCS]))
-+  m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES]))
-+  m4_pushdef([gltests_LIBSOURCES_LIST], [])
-+  m4_pushdef([gltests_LIBSOURCES_DIR], [])
-+  gl_COMMON
-+  gl_source_base='tests'
-+  m4_ifval(gltests_LIBSOURCES_LIST, [
-+    m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ ||
-+      for gl_file in ]gltests_LIBSOURCES_LIST[ ; do
-+        if test ! -r ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file ; then
-+          echo "missing file ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file" >&2
-+          exit 1
-+        fi
-+      done])dnl
-+      m4_if(m4_sysval, [0], [],
-+        [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])])
-+  ])
-+  m4_popdef([gltests_LIBSOURCES_DIR])
-+  m4_popdef([gltests_LIBSOURCES_LIST])
-+  m4_popdef([AC_LIBSOURCES])
-+  m4_popdef([AC_REPLACE_FUNCS])
-+  m4_popdef([AC_LIBOBJ])
-+  AC_CONFIG_COMMANDS_PRE([
-+    gltests_libobjs=
-+    gltests_ltlibobjs=
-+    if test -n "$gltests_LIBOBJS"; then
-+      # Remove the extension.
-+      sed_drop_objext='s/\.o$//;s/\.obj$//'
-+      for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed "$sed_drop_objext" | sort | uniq`; do
-+        gltests_libobjs="$gltests_libobjs $i.$ac_objext"
-+        gltests_ltlibobjs="$gltests_ltlibobjs $i.lo"
-+      done
-+    fi
-+    AC_SUBST([gltests_LIBOBJS], [$gltests_libobjs])
-+    AC_SUBST([gltests_LTLIBOBJS], [$gltests_ltlibobjs])
-+  ])
-+])
-+
-+# Like AC_LIBOBJ, except that the module name goes
-+# into gl_LIBOBJS instead of into LIBOBJS.
-+AC_DEFUN([gl_LIBOBJ], [
-+  AS_LITERAL_IF([$1], [gl_LIBSOURCES([$1.c])])dnl
-+  gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext"
-+])
-+
-+# Like AC_REPLACE_FUNCS, except that the module name goes
-+# into gl_LIBOBJS instead of into LIBOBJS.
-+AC_DEFUN([gl_REPLACE_FUNCS], [
-+  m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl
-+  AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)])
-+])
-+
-+# Like AC_LIBSOURCES, except the directory where the source file is
-+# expected is derived from the gnulib-tool parameterization,
-+# and alloca is special cased (for the alloca-opt module).
-+# We could also entirely rely on EXTRA_lib..._SOURCES.
-+AC_DEFUN([gl_LIBSOURCES], [
-+  m4_foreach([_gl_NAME], [$1], [
-+    m4_if(_gl_NAME, [alloca.c], [], [
-+      m4_define([gl_LIBSOURCES_DIR], [lib])
-+      m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ])
-+    ])
-+  ])
-+])
-+
-+# Like AC_LIBOBJ, except that the module name goes
-+# into gltests_LIBOBJS instead of into LIBOBJS.
-+AC_DEFUN([gltests_LIBOBJ], [
-+  AS_LITERAL_IF([$1], [gltests_LIBSOURCES([$1.c])])dnl
-+  gltests_LIBOBJS="$gltests_LIBOBJS $1.$ac_objext"
-+])
-+
-+# Like AC_REPLACE_FUNCS, except that the module name goes
-+# into gltests_LIBOBJS instead of into LIBOBJS.
-+AC_DEFUN([gltests_REPLACE_FUNCS], [
-+  m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl
-+  AC_CHECK_FUNCS([$1], , [gltests_LIBOBJ($ac_func)])
-+])
-+
-+# Like AC_LIBSOURCES, except the directory where the source file is
-+# expected is derived from the gnulib-tool parameterization,
-+# and alloca is special cased (for the alloca-opt module).
-+# We could also entirely rely on EXTRA_lib..._SOURCES.
-+AC_DEFUN([gltests_LIBSOURCES], [
-+  m4_foreach([_gl_NAME], [$1], [
-+    m4_if(_gl_NAME, [alloca.c], [], [
-+      m4_define([gltests_LIBSOURCES_DIR], [tests])
-+      m4_append([gltests_LIBSOURCES_LIST], _gl_NAME, [ ])
-+    ])
-+  ])
-+])
-+
-+# This macro records the list of files which have been installed by
-+# gnulib-tool and may be removed by future gnulib-tool invocations.
-+AC_DEFUN([gl_FILE_LIST], [
-+  lib/dummy.c
-+  m4/00gnulib.m4
-+  m4/gnulib-common.m4
-+  m4/onceonly.m4
-+])
-diff -urN popt-1.15-mod/m4/gnulib-tool.m4 popt-1.15-mod2/m4/gnulib-tool.m4
---- popt-1.15-mod/m4/gnulib-tool.m4	1970-01-01 01:00:00.000000000 +0100
-+++ popt-1.15-mod2/m4/gnulib-tool.m4	2009-06-16 15:18:05.000000000 +0200
-@@ -0,0 +1,57 @@
-+# gnulib-tool.m4 serial 2
-+dnl Copyright (C) 2004-2005 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl The following macros need not be invoked explicitly.
-+dnl Invoking them does nothing except to declare default arguments
-+dnl for "gnulib-tool --import".
-+
-+dnl Usage: gl_LOCAL_DIR([DIR])
-+AC_DEFUN([gl_LOCAL_DIR], [])
-+
-+dnl Usage: gl_MODULES([module1 module2 ...])
-+AC_DEFUN([gl_MODULES], [])
-+
-+dnl Usage: gl_AVOID([module1 module2 ...])
-+AC_DEFUN([gl_AVOID], [])
-+
-+dnl Usage: gl_SOURCE_BASE([DIR])
-+AC_DEFUN([gl_SOURCE_BASE], [])
-+
-+dnl Usage: gl_M4_BASE([DIR])
-+AC_DEFUN([gl_M4_BASE], [])
-+
-+dnl Usage: gl_PO_BASE([DIR])
-+AC_DEFUN([gl_PO_BASE], [])
-+
-+dnl Usage: gl_DOC_BASE([DIR])
-+AC_DEFUN([gl_DOC_BASE], [])
-+
-+dnl Usage: gl_TESTS_BASE([DIR])
-+AC_DEFUN([gl_TESTS_BASE], [])
-+
-+dnl Usage: gl_WITH_TESTS
-+AC_DEFUN([gl_WITH_TESTS], [])
-+
-+dnl Usage: gl_LIB([LIBNAME])
-+AC_DEFUN([gl_LIB], [])
-+
-+dnl Usage: gl_LGPL or gl_LGPL([VERSION])
-+AC_DEFUN([gl_LGPL], [])
-+
-+dnl Usage: gl_MAKEFILE_NAME([FILENAME])
-+AC_DEFUN([gl_MAKEFILE_NAME], [])
-+
-+dnl Usage: gl_LIBTOOL
-+AC_DEFUN([gl_LIBTOOL], [])
-+
-+dnl Usage: gl_MACRO_PREFIX([PREFIX])
-+AC_DEFUN([gl_MACRO_PREFIX], [])
-+
-+dnl Usage: gl_PO_DOMAIN([DOMAIN])
-+AC_DEFUN([gl_PO_DOMAIN], [])
-+
-+dnl Usage: gl_VC_FILES([BOOLEAN])
-+AC_DEFUN([gl_VC_FILES], [])
-diff -urN popt-1.15-mod/m4/onceonly.m4 popt-1.15-mod2/m4/onceonly.m4
---- popt-1.15-mod/m4/onceonly.m4	1970-01-01 01:00:00.000000000 +0100
-+++ popt-1.15-mod2/m4/onceonly.m4	2009-06-16 15:18:05.000000000 +0200
-@@ -0,0 +1,90 @@
-+# onceonly.m4 serial 6
-+dnl Copyright (C) 2002-2003, 2005-2006, 2008 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl This file defines some "once only" variants of standard autoconf macros.
-+dnl   AC_CHECK_HEADERS_ONCE          like  AC_CHECK_HEADERS
-+dnl   AC_CHECK_FUNCS_ONCE            like  AC_CHECK_FUNCS
-+dnl   AC_CHECK_DECLS_ONCE            like  AC_CHECK_DECLS
-+dnl   AC_REQUIRE([AC_FUNC_STRCOLL])  like  AC_FUNC_STRCOLL
-+dnl The advantage is that the check for each of the headers/functions/decls
-+dnl will be put only once into the 'configure' file. It keeps the size of
-+dnl the 'configure' file down, and avoids redundant output when 'configure'
-+dnl is run.
-+dnl The drawback is that the checks cannot be conditionalized. If you write
-+dnl   if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi
-+dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
-+dnl empty, and the check will be inserted before the body of the AC_DEFUNed
-+dnl function.
-+
-+dnl The original code implemented AC_CHECK_HEADERS_ONCE and AC_CHECK_FUNCS_ONCE
-+dnl in terms of AC_DEFUN and AC_REQUIRE. This implementation uses diversions to
-+dnl named sections DEFAULTS and INIT_PREPARE in order to check all requested
-+dnl headers at once, thus reducing the size of 'configure'. It is known to work
-+dnl with autoconf 2.57..2.62 at least . The size reduction is ca. 9%.
-+
-+dnl Autoconf version 2.59 plus gnulib is required; this file is not needed
-+dnl with Autoconf 2.60 or greater. But note that autoconf's implementation of
-+dnl AC_CHECK_DECLS_ONCE expects a comma-separated list of symbols as first
-+dnl argument!
-+AC_PREREQ([2.59])
-+
-+# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
-+# AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
-+AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
-+  :
-+  m4_foreach_w([gl_HEADER_NAME], [$1], [
-+    AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
-+                                                 [./-], [___])), [
-+      m4_divert_text([INIT_PREPARE],
-+        [gl_header_list="$gl_header_list gl_HEADER_NAME"])
-+      gl_HEADERS_EXPANSION
-+      AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_HEADER_NAME])),
-+        [Define to 1 if you have the <]m4_defn([gl_HEADER_NAME])[> header file.])
-+    ])
-+    AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
-+                                                   [./-], [___])))
-+  ])
-+])
-+m4_define([gl_HEADERS_EXPANSION], [
-+  m4_divert_text([DEFAULTS], [gl_header_list=])
-+  AC_CHECK_HEADERS([$gl_header_list])
-+  m4_define([gl_HEADERS_EXPANSION], [])
-+])
-+
-+# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
-+# AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
-+AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
-+  :
-+  m4_foreach_w([gl_FUNC_NAME], [$1], [
-+    AC_DEFUN([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]), [
-+      m4_divert_text([INIT_PREPARE],
-+        [gl_func_list="$gl_func_list gl_FUNC_NAME"])
-+      gl_FUNCS_EXPANSION
-+      AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_FUNC_NAME])),
-+        [Define to 1 if you have the `]m4_defn([gl_FUNC_NAME])[' function.])
-+    ])
-+    AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]))
-+  ])
-+])
-+m4_define([gl_FUNCS_EXPANSION], [
-+  m4_divert_text([DEFAULTS], [gl_func_list=])
-+  AC_CHECK_FUNCS([$gl_func_list])
-+  m4_define([gl_FUNCS_EXPANSION], [])
-+])
-+
-+# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
-+# AC_CHECK_DECLS(DECL1, DECL2, ...).
-+AC_DEFUN([AC_CHECK_DECLS_ONCE], [
-+  :
-+  m4_foreach_w([gl_DECL_NAME], [$1], [
-+    AC_DEFUN([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]), [
-+      AC_CHECK_DECLS(m4_defn([gl_DECL_NAME]))
-+    ])
-+    AC_REQUIRE([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]))
-+  ])
-+])
--- a/src/popt.mk	Wed May 12 19:25:44 2010 +0200
+++ b/src/popt.mk	Wed May 12 01:15:55 2010 +0200
@@ -4,8 +4,8 @@
 # popt
 PKG             := popt
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.15
-$(PKG)_CHECKSUM := d9bc3067a4e7e62ac0bd9818e8cd649ee0dd12dc
+$(PKG)_VERSION  := 1.16
+$(PKG)_CHECKSUM := cfe94a15a2404db85858a81ff8de27c8ff3e235e
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://freshmeat.net/projects/popt/
@@ -20,10 +20,6 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && aclocal -I m4
-    cd '$(1)' && autoheader
-    cd '$(1)' && automake --add-missing
-    cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \