From 20457a5996ad09387147210c80a8ec02c21b5ec4 Mon Sep 17 00:00:00 2001 From: Volker Grabsch Date: Fri, 5 Feb 2010 03:06:08 +0100 Subject: use the autotools for package popt --- src/popt-1-win32.patch | 4 +- src/popt-2-autogen.patch | 2427 ---------------------------------------------- src/popt-2-gnulib.patch | 641 ++++++++++++ src/popt.mk | 4 + 4 files changed, 647 insertions(+), 2429 deletions(-) delete mode 100644 src/popt-2-autogen.patch create mode 100644 src/popt-2-gnulib.patch diff --git a/src/popt-1-win32.patch b/src/popt-1-win32.patch index 1b5ef26..e1e2356 100644 --- a/src/popt-1-win32.patch +++ b/src/popt-1-win32.patch @@ -8,7 +8,7 @@ diff -urN popt-1.15/autogen.sh popt-1.15-mod/autogen.sh THEDIR="`pwd`" -+../gnulib/gnulib-tool --update ++gnulib-tool --update + libtoolize=`which glibtoolize 2>/dev/null` case $libtoolize in @@ -38,7 +38,7 @@ diff -urN popt-1.15/configure.ac popt-1.15-mod/configure.ac +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) ++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. diff --git a/src/popt-2-autogen.patch b/src/popt-2-autogen.patch deleted file mode 100644 index dac7733..0000000 --- a/src/popt-2-autogen.patch +++ /dev/null @@ -1,2427 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html or doc/README for further information. - -diff -urN popt-1.15-mod/aclocal.m4 popt-1.15-mod2/aclocal.m4 ---- popt-1.15-mod/aclocal.m4 2009-04-12 21:31:12.000000000 +0200 -+++ popt-1.15-mod2/aclocal.m4 2009-06-16 15:18:13.000000000 +0200 -@@ -1,7 +1,7 @@ --# generated automatically by aclocal 1.10 -*- Autoconf -*- -+# generated automatically by aclocal 1.10.2 -*- Autoconf -*- - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005, 2006 Free Software Foundation, Inc. -+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # 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. -@@ -11,12 +11,67 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --m4_if(m4_PACKAGE_VERSION, [2.63],, --[m4_fatal([this file was generated for autoconf 2.63. --You have another version of autoconf. If you want to use that, --you should regenerate the build system entirely.], [63])]) -+m4_ifndef([AC_AUTOCONF_VERSION], -+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, -+[m4_warning([this file was generated for autoconf 2.63. -+You have another version of autoconf. It may work, but is not guaranteed to. -+If you have problems, you may need to regenerate the build system entirely. -+To do so, use the procedure documented by the package, typically `autoreconf'.])]) - --# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. -+# intlmacosx.m4 serial 1 (gettext-0.17) -+dnl Copyright (C) 2004-2007 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 -+dnl This file can can be used in projects which are not available under -+dnl the GNU General Public License or the GNU Library General Public -+dnl License but which still want to provide support for the GNU gettext -+dnl functionality. -+dnl Please note that the actual code of the GNU gettext library is covered -+dnl by the GNU Library General Public License, and the rest of the GNU -+dnl gettext package package is covered by the GNU General Public License. -+dnl They are *not* in the public domain. -+ -+dnl Checks for special options needed on MacOS X. -+dnl Defines INTL_MACOSX_LIBS. -+AC_DEFUN([gt_INTL_MACOSX], -+[ -+ dnl Check for API introduced in MacOS X 10.2. -+ AC_CACHE_CHECK([for CFPreferencesCopyAppValue], -+ gt_cv_func_CFPreferencesCopyAppValue, -+ [gt_save_LIBS="$LIBS" -+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" -+ AC_TRY_LINK([#include ], -+ [CFPreferencesCopyAppValue(NULL, NULL)], -+ [gt_cv_func_CFPreferencesCopyAppValue=yes], -+ [gt_cv_func_CFPreferencesCopyAppValue=no]) -+ LIBS="$gt_save_LIBS"]) -+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then -+ AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, -+ [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) -+ fi -+ dnl Check for API introduced in MacOS X 10.3. -+ AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, -+ [gt_save_LIBS="$LIBS" -+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" -+ AC_TRY_LINK([#include ], [CFLocaleCopyCurrent();], -+ [gt_cv_func_CFLocaleCopyCurrent=yes], -+ [gt_cv_func_CFLocaleCopyCurrent=no]) -+ LIBS="$gt_save_LIBS"]) -+ if test $gt_cv_func_CFLocaleCopyCurrent = yes; then -+ AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, -+ [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) -+ fi -+ INTL_MACOSX_LIBS= -+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then -+ INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" -+ fi -+ AC_SUBST([INTL_MACOSX_LIBS]) -+]) -+ -+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -31,7 +86,7 @@ - [am__api_version='1.10' - dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to - dnl require some minimum version. Point them to the right macro. --m4_if([$1], [1.10], [], -+m4_if([$1], [1.10.2], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl - ]) - -@@ -45,10 +100,12 @@ - # AM_SET_CURRENT_AUTOMAKE_VERSION - # ------------------------------- - # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. --# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. - AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], --[AM_AUTOMAKE_VERSION([1.10])dnl --_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) -+[AM_AUTOMAKE_VERSION([1.10.2])dnl -+m4_ifndef([AC_AUTOCONF_VERSION], -+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - - # AM_AUX_DIR_EXPAND -*- Autoconf -*- - -@@ -298,19 +355,28 @@ - - # Generate code to set up dependency tracking. -*- Autoconf -*- - --# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 - # Free Software Foundation, Inc. - # - # 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 3 -+#serial 4 - - # _AM_OUTPUT_DEPENDENCY_COMMANDS - # ------------------------------ - AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], --[for mf in $CONFIG_FILES; do -+[# Autoconf 2.62 quotes --file arguments for eval, but not when files -+# are listed without --file. Let's play safe and only enable the eval -+# if we detect the quoting. -+case $CONFIG_FILES in -+*\'*) eval set x "$CONFIG_FILES" ;; -+*) set x $CONFIG_FILES ;; -+esac -+shift -+for mf -+do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. -@@ -320,7 +386,7 @@ - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. -- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then -+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue -@@ -368,13 +434,13 @@ - # Do all the work for Automake. -*- Autoconf -*- - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005, 2006 Free Software Foundation, Inc. -+# 2005, 2006, 2008 Free Software Foundation, Inc. - # - # 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 12 -+# serial 13 - - # This macro actually does too much. Some checks are only needed if - # your package does certain things. But this isn't really a big deal. -@@ -479,16 +545,17 @@ - # our stamp files there. - AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], - [# Compute $1's index in $config_headers. -+_am_arg=$1 - _am_stamp_count=1 - for _am_header in $config_headers :; do - case $_am_header in -- $1 | $1:* ) -+ $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac - done --echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) -+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - - # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. - # -@@ -504,58 +571,6 @@ - install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} - AC_SUBST(install_sh)]) - --# intlmacosx.m4 serial 1 (gettext-0.17) --dnl Copyright (C) 2004-2007 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 --dnl This file can can be used in projects which are not available under --dnl the GNU General Public License or the GNU Library General Public --dnl License but which still want to provide support for the GNU gettext --dnl functionality. --dnl Please note that the actual code of the GNU gettext library is covered --dnl by the GNU Library General Public License, and the rest of the GNU --dnl gettext package package is covered by the GNU General Public License. --dnl They are *not* in the public domain. -- --dnl Checks for special options needed on MacOS X. --dnl Defines INTL_MACOSX_LIBS. --AC_DEFUN([gt_INTL_MACOSX], --[ -- dnl Check for API introduced in MacOS X 10.2. -- AC_CACHE_CHECK([for CFPreferencesCopyAppValue], -- gt_cv_func_CFPreferencesCopyAppValue, -- [gt_save_LIBS="$LIBS" -- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" -- AC_TRY_LINK([#include ], -- [CFPreferencesCopyAppValue(NULL, NULL)], -- [gt_cv_func_CFPreferencesCopyAppValue=yes], -- [gt_cv_func_CFPreferencesCopyAppValue=no]) -- LIBS="$gt_save_LIBS"]) -- if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then -- AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, -- [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) -- fi -- dnl Check for API introduced in MacOS X 10.3. -- AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, -- [gt_save_LIBS="$LIBS" -- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" -- AC_TRY_LINK([#include ], [CFLocaleCopyCurrent();], -- [gt_cv_func_CFLocaleCopyCurrent=yes], -- [gt_cv_func_CFLocaleCopyCurrent=no]) -- LIBS="$gt_save_LIBS"]) -- if test $gt_cv_func_CFLocaleCopyCurrent = yes; then -- AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, -- [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) -- fi -- INTL_MACOSX_LIBS= -- if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then -- INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" -- fi -- AC_SUBST([INTL_MACOSX_LIBS]) --]) -- - # Copyright (C) 2003, 2005 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation -@@ -693,13 +708,13 @@ - - # Helper functions for option handling. -*- Autoconf -*- - --# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. - # - # 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 3 -+# serial 4 - - # _AM_MANGLE_OPTION(NAME) - # ----------------------- -@@ -716,7 +731,7 @@ - # ---------------------------------- - # OPTIONS is a space-separated list of Automake options. - AC_DEFUN([_AM_SET_OPTIONS], --[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - - # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) - # ------------------------------------------- -@@ -838,7 +853,7 @@ - - # _AM_SUBST_NOTMAKE(VARIABLE) - # --------------------------- --# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. -+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. - # This macro is traced by Automake. - AC_DEFUN([_AM_SUBST_NOTMAKE]) - -@@ -938,7 +953,10 @@ - AC_SUBST([am__untar]) - ]) # _AM_PROG_TAR - -+m4_include([m4/00gnulib.m4]) - m4_include([m4/gettext.m4]) -+m4_include([m4/gnulib-common.m4]) -+m4_include([m4/gnulib-comp.m4]) - m4_include([m4/iconv.m4]) - m4_include([m4/lib-ld.m4]) - m4_include([m4/lib-link.m4]) -diff -urN popt-1.15-mod/config.h.in popt-1.15-mod2/config.h.in ---- popt-1.15-mod/config.h.in 2009-04-12 21:31:25.000000000 +0200 -+++ popt-1.15-mod2/config.h.in 2009-06-16 15:18:15.000000000 +0200 -@@ -58,6 +58,9 @@ - /* Define to 1 if you have the `mtrace' function. */ - #undef HAVE_MTRACE - -+/* Define to 1 if you have the `random' function. */ -+#undef HAVE_RANDOM -+ - /* Define to 1 if you have the `setregid' function. */ - #undef HAVE_SETREGID - -@@ -82,6 +85,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_STRING_H - -+/* Define to 1 if you have the header file. */ -+#undef HAVE_SYS_IOCTL_H -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_SYS_STAT_H - -@@ -142,3 +148,23 @@ - - /* Define like PROTOTYPES; this can be used by system headers. */ - #undef __PROTOTYPES -+ -+/* 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 -+ -+/* 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 -+ -diff -urN popt-1.15-mod/configure popt-1.15-mod2/configure ---- popt-1.15-mod/configure 2009-04-12 21:31:14.000000000 +0200 -+++ popt-1.15-mod2/configure 2009-06-16 15:18:17.000000000 +0200 -@@ -1,6 +1,6 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.63 (OpenPKG-CURRENT) for popt 1.15. -+# Generated by GNU Autoconf 2.63 for popt 1.15. - # - # Report bugs to . - # -@@ -787,7 +787,11 @@ - #endif" - - gt_needs= --ac_subst_vars='LTLIBOBJS -+ac_subst_vars='gltests_LTLIBOBJS -+gltests_LIBOBJS -+gl_LTLIBOBJS -+gl_LIBOBJS -+LTLIBOBJS - LIBOBJS - POPT_SOURCE_PATH - POSUB -@@ -809,6 +813,8 @@ - USE_NLS - HAVE_LD_VERSION_SCRIPT_FALSE - HAVE_LD_VERSION_SCRIPT_TRUE -+GL_COND_LIBTOOL_FALSE -+GL_COND_LIBTOOL_TRUE - ANSI2KNR - U - TARGET -@@ -819,7 +825,6 @@ - NMEDIT - DSYMUTIL - lt_ECHO --RANLIB - AR - OBJDUMP - LN_S -@@ -832,6 +837,7 @@ - GREP - SED - LIBTOOL -+RANLIB - am__fastdepCC_FALSE - am__fastdepCC_TRUE - CCDEPMODE -@@ -1683,7 +1689,7 @@ - if $ac_init_version; then - cat <<\_ACEOF - popt configure 1.15 --generated by GNU Autoconf 2.63 (OpenPKG-CURRENT) -+generated by GNU Autoconf 2.63 - - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -@@ -1697,7 +1703,7 @@ - running configure, to aid debugging if configure makes a mistake. - - It was created by popt $as_me 1.15, which was --generated by GNU Autoconf 2.63 (OpenPKG-CURRENT). Invocation command line was -+generated by GNU Autoconf 2.63. Invocation command line was - - $ $0 $@ - -@@ -3802,6 +3808,101 @@ - fi - - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -+set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_RANLIB+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$RANLIB"; then -+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -+else -+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_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+RANLIB=$ac_cv_prog_RANLIB -+if test -n "$RANLIB"; then -+ { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 -+$as_echo "$RANLIB" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_RANLIB"; then -+ ac_ct_RANLIB=$RANLIB -+ # Extract the first word of "ranlib", so it can be a program name with args. -+set dummy ranlib; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_RANLIB"; then -+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -+else -+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_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_RANLIB="ranlib" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -+if test -n "$ac_ct_RANLIB"; then -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -+$as_echo "$ac_ct_RANLIB" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_RANLIB" = x; then -+ RANLIB=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ RANLIB=$ac_ct_RANLIB -+ fi -+else -+ RANLIB="$ac_cv_prog_RANLIB" -+fi -+ -+ -+ -+ - # Find a good install program. We prefer a C program (faster), - # so one script is as good as another. But avoid the broken or - # incompatible versions: -@@ -4514,13 +4615,13 @@ - else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:4517: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:4618: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 -- (eval echo "\"\$as_me:4520: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:4621: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 -- (eval echo "\"\$as_me:4523: output\"" >&5) -+ (eval echo "\"\$as_me:4624: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" -@@ -5726,7 +5827,7 @@ - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 5729 "configure"' > conftest.$ac_ext -+ echo '#line 5830 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -7583,11 +7684,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7586: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7687: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:7590: \$? = $ac_status" >&5 -+ echo "$as_me:7691: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -7922,11 +8023,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7925: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8026: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:7929: \$? = $ac_status" >&5 -+ echo "$as_me:8030: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -8027,11 +8128,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8030: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8131: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:8034: \$? = $ac_status" >&5 -+ echo "$as_me:8135: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -8082,11 +8183,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8085: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8186: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:8089: \$? = $ac_status" >&5 -+ echo "$as_me:8190: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -10882,7 +10983,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10885 "configure" -+#line 10986 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10978,7 +11079,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10981 "configure" -+#line 11082 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11899,7 +12000,63 @@ - - - --for ac_header in float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h -+ -+ if true; then -+ GL_COND_LIBTOOL_TRUE= -+ GL_COND_LIBTOOL_FALSE='#' -+else -+ GL_COND_LIBTOOL_TRUE='#' -+ GL_COND_LIBTOOL_FALSE= -+fi -+ -+ gl_cond_libtool=true -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ gl_source_base='lib' -+ -+ -+ -+ -+ -+ -+ -+ gltests_libdeps= -+ gltests_ltlibdeps= -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ gl_source_base='tests' -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+for ac_header in float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h sys/ioctl.h - do - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -@@ -12248,7 +12405,8 @@ - - - --for ac_func in getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom -+ -+for ac_func in getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom random - do - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -14821,7 +14979,7 @@ - - - --ac_config_files="$ac_config_files Doxyfile Makefile po/Makefile.in" -+ac_config_files="$ac_config_files Doxyfile Makefile po/Makefile.in lib/Makefile" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -14934,6 +15092,45 @@ - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi -+if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then -+ { { $as_echo "$as_me:$LINENO: error: conditional \"GL_COND_LIBTOOL\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"GL_COND_LIBTOOL\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+ 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 -+ gl_LIBOBJS=$gl_libobjs -+ -+ gl_LTLIBOBJS=$gl_ltlibobjs -+ -+ -+ -+ 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 -+ gltests_LIBOBJS=$gltests_libobjs -+ -+ gltests_LTLIBOBJS=$gltests_ltlibobjs -+ -+ - if test -z "${HAVE_LD_VERSION_SCRIPT_TRUE}" && test -z "${HAVE_LD_VERSION_SCRIPT_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LD_VERSION_SCRIPT\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 -@@ -15264,7 +15461,7 @@ - # values after options handling. - ac_log=" - This file was extended by popt $as_me 1.15, which was --generated by GNU Autoconf 2.63 (OpenPKG-CURRENT). Invocation command line was -+generated by GNU Autoconf 2.63. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -15327,7 +15524,7 @@ - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_cs_version="\\ - popt config.status 1.15 --configured by $0, generated by GNU Autoconf 2.63 (OpenPKG-CURRENT), -+configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - - Copyright (C) 2008 Free Software Foundation, Inc. -@@ -15718,6 +15915,7 @@ - "Doxyfile") CONFIG_FILES="$CONFIG_FILES Doxyfile" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; -+ "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; - - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 - $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -@@ -16330,21 +16528,22 @@ - { (exit 1); exit 1; }; } - fi - # Compute "$ac_file"'s index in $config_headers. -+_am_arg="$ac_file" - _am_stamp_count=1 - for _am_header in $config_headers :; do - case $_am_header in -- "$ac_file" | "$ac_file":* ) -+ $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac - done --echo "timestamp for "$ac_file"" >`$as_dirname -- "$ac_file" || --$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_file" : 'X\(//\)[^/]' \| \ -- X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X"$ac_file" | -+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || -+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$_am_arg" : 'X\(//\)[^/]' \| \ -+ X"$_am_arg" : 'X\(//\)$' \| \ -+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$_am_arg" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -16371,7 +16570,16 @@ - - - case $ac_file$ac_mode in -- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do -+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files -+# are listed without --file. Let's play safe and only enable the eval -+# if we detect the quoting. -+case $CONFIG_FILES in -+*\'*) eval set x "$CONFIG_FILES" ;; -+*) set x $CONFIG_FILES ;; -+esac -+shift -+for mf -+do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. -@@ -16381,7 +16589,7 @@ - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. -- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then -+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || - $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ -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 . */ -+ -+/* 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/lib/Makefile.in popt-1.15-mod2/lib/Makefile.in ---- popt-1.15-mod/lib/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ popt-1.15-mod2/lib/Makefile.in 2009-06-16 15:18:16.000000000 +0200 -@@ -0,0 +1,645 @@ -+# Makefile.in generated by automake 1.10.2 from Makefile.am. -+# @configure_input@ -+ -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+# This Makefile.in 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. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+# PARTICULAR PURPOSE. -+ -+@SET_MAKE@ -+ -+# 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 -+ -+ -+ -+VPATH = @srcdir@ -+pkgdatadir = $(datadir)/@PACKAGE@ -+pkglibdir = $(libdir)/@PACKAGE@ -+pkgincludedir = $(includedir)/@PACKAGE@ -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c -+INSTALL_HEADER = $(INSTALL_DATA) -+transform = $(program_transform_name) -+NORMAL_INSTALL = : -+PRE_INSTALL = : -+POST_INSTALL = : -+NORMAL_UNINSTALL = : -+PRE_UNINSTALL = : -+POST_UNINSTALL = : -+build_triplet = @build@ -+host_triplet = @host@ -+target_triplet = @target@ -+subdir = lib -+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ -+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gnulib-common.m4 \ -+ $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ -+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ -+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ -+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ -+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ -+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.ac -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(install_sh) -d -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LIBRARIES = $(noinst_LIBRARIES) -+LTLIBRARIES = $(noinst_LTLIBRARIES) -+am__DEPENDENCIES_1 = -+am_libgnu_la_OBJECTS = dummy.lo -+libgnu_la_OBJECTS = $(am_libgnu_la_OBJECTS) -+libgnu_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libgnu_la_LDFLAGS) $(LDFLAGS) -o $@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(libgnu_la_SOURCES) $(EXTRA_libgnu_la_SOURCES) -+DIST_SOURCES = $(libgnu_la_SOURCES) $(EXTRA_libgnu_la_SOURCES) -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive -+HEADERS = $(noinst_HEADERS) -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive -+ETAGS = etags -+CTAGS = ctags -+DIST_SUBDIRS = $(SUBDIRS) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ACLOCAL = @ACLOCAL@ -+AMTAR = @AMTAR@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ -+AWK = @AWK@ -+CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ -+DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ -+DUMPBIN = @DUMPBIN@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+FGREP = @FGREP@ -+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -+GMSGFMT = @GMSGFMT@ -+GMSGFMT_015 = @GMSGFMT_015@ -+GREP = @GREP@ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+INTLLIBS = @INTLLIBS@ -+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ -+LD = @LD@ -+LDFLAGS = @LDFLAGS@ -+LIBICONV = @LIBICONV@ -+LIBINTL = @LIBINTL@ -+LIBOBJS = @LIBOBJS@ -+LIBS = @LIBS@ -+LIBTOOL = @LIBTOOL@ -+LIPO = @LIPO@ -+LN_S = @LN_S@ -+LTLIBICONV = @LTLIBICONV@ -+LTLIBINTL = @LTLIBINTL@ -+LTLIBOBJS = @LTLIBOBJS@ -+LT_AGE = @LT_AGE@ -+LT_CURRENT = @LT_CURRENT@ -+LT_REVISION = @LT_REVISION@ -+MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ -+MSGFMT = @MSGFMT@ -+MSGFMT_015 = @MSGFMT_015@ -+MSGMERGE = @MSGMERGE@ -+NM = @NM@ -+NMEDIT = @NMEDIT@ -+OBJDUMP = @OBJDUMP@ -+OBJEXT = @OBJEXT@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ -+PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ -+POPT_SOURCE_PATH = @POPT_SOURCE_PATH@ -+POSUB = @POSUB@ -+RANLIB = @RANLIB@ -+SED = @SED@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ -+STRIP = @STRIP@ -+TARGET = @TARGET@ -+U = @U@ -+USE_NLS = @USE_NLS@ -+VERSION = @VERSION@ -+XGETTEXT = @XGETTEXT@ -+XGETTEXT_015 = @XGETTEXT_015@ -+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -+am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ -+am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+builddir = @builddir@ -+datadir = @datadir@ -+datarootdir = @datarootdir@ -+docdir = @docdir@ -+dvidir = @dvidir@ -+exec_prefix = @exec_prefix@ -+gl_LIBOBJS = @gl_LIBOBJS@ -+gl_LTLIBOBJS = @gl_LTLIBOBJS@ -+gltests_LIBOBJS = @gltests_LIBOBJS@ -+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+htmldir = @htmldir@ -+includedir = @includedir@ -+infodir = @infodir@ -+install_sh = @install_sh@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localedir = @localedir@ -+localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ -+mandir = @mandir@ -+mkdir_p = @mkdir_p@ -+oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+psdir = @psdir@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ -+sysconfdir = @sysconfdir@ -+target = @target@ -+target_alias = @target_alias@ -+target_cpu = @target_cpu@ -+target_os = @target_os@ -+target_vendor = @target_vendor@ -+top_build_prefix = @top_build_prefix@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ -+AUTOMAKE_OPTIONS = 1.5 gnits -+SUBDIRS = -+noinst_HEADERS = -+noinst_LIBRARIES = -+noinst_LTLIBRARIES = libgnu.la -+EXTRA_DIST = -+BUILT_SOURCES = -+SUFFIXES = -+MOSTLYCLEANFILES = core *.stackdump -+MOSTLYCLEANDIRS = -+CLEANFILES = -+DISTCLEANFILES = -+MAINTAINERCLEANFILES = -+AM_CPPFLAGS = -+AM_CFLAGS = -+libgnu_la_SOURCES = dummy.c -+libgnu_la_LIBADD = $(gl_LTLIBOBJS) -+libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS) -+EXTRA_libgnu_la_SOURCES = -+libgnu_la_LDFLAGS = $(AM_LDFLAGS) -+all: $(BUILT_SOURCES) -+ $(MAKE) $(AM_MAKEFLAGS) all-recursive -+ -+.SUFFIXES: -+.SUFFIXES: .c .lo .o .obj -+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ -+ && { if test -f $@; then exit 0; else break; fi; }; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits lib/Makefile'; \ -+ cd $(top_srcdir) && \ -+ $(AUTOMAKE) --gnits lib/Makefile -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+clean-noinstLIBRARIES: -+ -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -+ -+clean-noinstLTLIBRARIES: -+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) -+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ -+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -+ test "$$dir" != "$$p" || dir=.; \ -+ echo "rm -f \"$${dir}/so_locations\""; \ -+ rm -f "$${dir}/so_locations"; \ -+ done -+libgnu.la: $(libgnu_la_OBJECTS) $(libgnu_la_DEPENDENCIES) -+ $(libgnu_la_LINK) $(libgnu_la_OBJECTS) $(libgnu_la_LIBADD) $(LIBS) -+ -+mostlyclean-compile: -+ -rm -f *.$(OBJEXT) -+ -+distclean-compile: -+ -rm -f *.tab.c -+ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@ -+ -+.c.o: -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< -+ -+.c.obj: -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -+ -+.c.lo: -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -+ -+mostlyclean-libtool: -+ -rm -f *.lo -+ -+clean-libtool: -+ -rm -rf .libs _libs -+ -+# This directory's subdirectories are mostly independent; you can cd -+# into them and run `make' without going through this Makefile. -+# To change the values of `make' variables: instead of editing Makefiles, -+# (1) if the variable is set in `config.status', edit `config.status' -+# (which will cause the Makefiles to be regenerated when you run `make'); -+# (2) otherwise, pass the desired values on the `make' command line. -+$(RECURSIVE_TARGETS): -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ -+ dot_seen=no; \ -+ target=`echo $@ | sed s/-recursive//`; \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ echo "Making $$target in $$subdir"; \ -+ if test "$$subdir" = "."; then \ -+ dot_seen=yes; \ -+ local_target="$$target-am"; \ -+ else \ -+ local_target="$$target"; \ -+ fi; \ -+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -+ || eval $$failcom; \ -+ done; \ -+ if test "$$dot_seen" = "no"; then \ -+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ -+ fi; test -z "$$fail" -+ -+$(RECURSIVE_CLEAN_TARGETS): -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ -+ dot_seen=no; \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ rev=''; for subdir in $$list; do \ -+ if test "$$subdir" = "."; then :; else \ -+ rev="$$subdir $$rev"; \ -+ fi; \ -+ done; \ -+ rev="$$rev ."; \ -+ target=`echo $@ | sed s/-recursive//`; \ -+ for subdir in $$rev; do \ -+ echo "Making $$target in $$subdir"; \ -+ if test "$$subdir" = "."; then \ -+ local_target="$$target-am"; \ -+ else \ -+ local_target="$$target"; \ -+ fi; \ -+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -+ || eval $$failcom; \ -+ done && test -z "$$fail" -+tags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -+ done -+ctags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -+ done -+ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ mkid -fID $$unique -+tags: TAGS -+ -+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ include_option=--etags-include; \ -+ empty_fix=.; \ -+ else \ -+ include_option=--include; \ -+ empty_fix=; \ -+ fi; \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ -+ test ! -f $$subdir/TAGS || \ -+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ -+ fi; \ -+ done; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi -+ctags: CTAGS -+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique -+ -+GTAGS: -+ here=`$(am__cd) $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $(GTAGS_ARGS) $$here -+ -+distclean-tags: -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+ -+distdir: $(DISTFILES) -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ -+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -+ if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -+ fi; \ -+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -+ else \ -+ test -f $(distdir)/$$file \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ -+ fi; \ -+ done -+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ -+ distdir=`$(am__cd) $(distdir) && pwd`; \ -+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ -+ (cd $$subdir && \ -+ $(MAKE) $(AM_MAKEFLAGS) \ -+ top_distdir="$$top_distdir" \ -+ distdir="$$distdir/$$subdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ -+ distdir) \ -+ || exit 1; \ -+ fi; \ -+ done -+check-am: all-am -+check: $(BUILT_SOURCES) -+ $(MAKE) $(AM_MAKEFLAGS) check-recursive -+all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) -+installdirs: installdirs-recursive -+installdirs-am: -+install: $(BUILT_SOURCES) -+ $(MAKE) $(AM_MAKEFLAGS) install-recursive -+install-exec: install-exec-recursive -+install-data: install-data-recursive -+uninstall: uninstall-recursive -+ -+install-am: all-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ -+installcheck: installcheck-recursive -+install-strip: -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+mostlyclean-generic: -+ -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) -+ -+clean-generic: -+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) -+ -+distclean-generic: -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) -+ -+maintainer-clean-generic: -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -+clean: clean-recursive -+ -+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ -+ clean-noinstLTLIBRARIES mostlyclean-am -+ -+distclean: distclean-recursive -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-tags -+ -+dvi: dvi-recursive -+ -+dvi-am: -+ -+html: html-recursive -+ -+info: info-recursive -+ -+info-am: -+ -+install-data-am: -+ -+install-dvi: install-dvi-recursive -+ -+install-exec-am: -+ -+install-html: install-html-recursive -+ -+install-info: install-info-recursive -+ -+install-man: -+ -+install-pdf: install-pdf-recursive -+ -+install-ps: install-ps-recursive -+ -+installcheck-am: -+ -+maintainer-clean: maintainer-clean-recursive -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-recursive -+ -+mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool mostlyclean-local -+ -+pdf: pdf-recursive -+ -+pdf-am: -+ -+ps: ps-recursive -+ -+ps-am: -+ -+uninstall-am: -+ -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -+ install-strip -+ -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am clean clean-generic clean-libtool \ -+ clean-noinstLIBRARIES clean-noinstLTLIBRARIES ctags \ -+ ctags-recursive distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ -+ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am -+ -+ -+mostlyclean-local: mostlyclean-generic -+ @for dir in '' $(MOSTLYCLEANDIRS); do \ -+ if test -n "$$dir" && test -d $$dir; then \ -+ echo "rmdir $$dir"; rmdir $$dir; \ -+ fi; \ -+ done; \ -+ : -+# Tell versions [3.59,3.63) of GNU make to not export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: -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])) -+ ]) -+]) -diff -urN popt-1.15-mod/Makefile.in popt-1.15-mod2/Makefile.in ---- popt-1.15-mod/Makefile.in 2009-04-12 21:31:13.000000000 +0200 -+++ popt-1.15-mod2/Makefile.in 2009-06-16 15:18:16.000000000 +0200 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10 from Makefile.am. -+# Makefile.in generated by automake 1.10.2 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in 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. -@@ -48,14 +48,16 @@ - config.guess config.rpath config.sub depcomp install-sh \ - ltmain.sh missing - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ -- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ -- $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ -- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ -- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ -- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ -- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac -+am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ -+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gnulib-common.m4 \ -+ $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/iconv.m4 \ -+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ -+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ -+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ -+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ -+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.ac - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -@@ -248,6 +250,10 @@ - docdir = @docdir@ - dvidir = @dvidir@ - exec_prefix = @exec_prefix@ -+gl_LIBOBJS = @gl_LIBOBJS@ -+gl_LTLIBOBJS = @gl_LTLIBOBJS@ -+gltests_LIBOBJS = @gltests_LIBOBJS@ -+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ -@@ -287,9 +293,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) - noinst_HEADERS = poptint.h system.h - test1_SOURCES = test1.c -@@ -310,8 +317,7 @@ - usrlibdir = $(libdir) - usrlib_LTLIBRARIES = libpopt.la - libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c --libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@ \ -- $(am__append_1) -+libpopt_la_LDFLAGS = @LTLIBINTL@ @LTLIBICONV@ $(am__append_1) - man_MANS = popt.3 - - #.PHONY: lcov-upload -@@ -381,8 +387,8 @@ - @list='$(usrlib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(usrlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(usrlibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(usrlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(usrlibdir)/$$f"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(usrlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(usrlibdir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(usrlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(usrlibdir)/$$f"; \ - else :; fi; \ - done - -@@ -390,8 +396,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(usrlib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(usrlibdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(usrlibdir)/$$p"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(usrlibdir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(usrlibdir)/$$p"; \ - done - - clean-usrlibLTLIBRARIES: -@@ -464,7 +470,7 @@ - -rm -rf .libs _libs - - distclean-libtool: -- -rm -f libtool -+ -rm -f libtool config.lt - install-man3: $(man3_MANS) $(man_MANS) - @$(NORMAL_INSTALL) - test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)" -@@ -476,8 +482,8 @@ - esac; \ - done; \ - for i in $$list; do \ -- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ -- else file=$$i; fi; \ -+ if test -f $$i; then file=$$i; \ -+ else file=$(srcdir)/$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 3*) ;; \ -@@ -603,8 +609,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -629,8 +635,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -640,13 +646,12 @@ - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -660,7 +665,7 @@ - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - check-TESTS: $(TESTS) -- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ -+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - if test -n "$$list"; then \ -@@ -671,7 +676,7 @@ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ -- *$$ws$$tst$$ws*) \ -+ *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - echo "XPASS: $$tst"; \ -@@ -683,7 +688,7 @@ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ -- *$$ws$$tst$$ws*) \ -+ *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - echo "XFAIL: $$tst"; \ - ;; \ -@@ -697,23 +702,36 @@ - echo "SKIP: $$tst"; \ - fi; \ - done; \ -+ if test "$$all" -eq 1; then \ -+ tests="test"; \ -+ All=""; \ -+ else \ -+ tests="tests"; \ -+ All="All "; \ -+ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ -- banner="All $$all tests passed"; \ -+ banner="$$All$$all $$tests passed"; \ - else \ -- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ -+ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ -+ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ -- banner="$$failed of $$all tests failed"; \ -+ banner="$$failed of $$all $$tests failed"; \ - else \ -- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ -+ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ -+ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ - fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ -- skipped="($$skip tests were not run)"; \ -+ if test "$$skip" -eq 1; then \ -+ skipped="($$skip test was not run)"; \ -+ else \ -+ skipped="($$skip tests were not run)"; \ -+ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ -@@ -790,6 +808,10 @@ - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -+dist-lzma: distdir -+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma -+ $(am__remove_distdir) -+ - dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) -@@ -816,6 +838,8 @@ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ -+ *.tar.lzma*) \ -+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ -@@ -981,17 +1005,17 @@ - all all-am am--refresh check check-TESTS check-am clean \ - clean-generic clean-libtool clean-noinstPROGRAMS \ - clean-usrlibLTLIBRARIES ctags ctags-recursive dist dist-all \ -- dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip distcheck \ -- distclean distclean-compile distclean-generic distclean-hdr \ -- distclean-libtool distclean-tags distcleancheck distdir \ -- distuninstallcheck dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-includeHEADERS install-info \ -- install-info-am install-man install-man3 install-pdf \ -- install-pdf-am install-ps install-ps-am install-strip \ -- install-usrlibLTLIBRARIES installcheck installcheck-am \ -- installdirs installdirs-am maintainer-clean \ -+ dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-zip \ -+ distcheck distclean distclean-compile distclean-generic \ -+ distclean-hdr distclean-libtool distclean-tags distcleancheck \ -+ distdir distuninstallcheck dvi dvi-am html html-am info \ -+ info-am install install-am install-data install-data-am \ -+ install-dvi install-dvi-am install-exec install-exec-am \ -+ install-html install-html-am install-includeHEADERS \ -+ install-info install-info-am install-man install-man3 \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip install-usrlibLTLIBRARIES installcheck \ -+ installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ -diff -urN popt-1.15-mod/po/Makevars.template popt-1.15-mod2/po/Makevars.template ---- popt-1.15-mod/po/Makevars.template 1970-01-01 01:00:00.000000000 +0100 -+++ popt-1.15-mod2/po/Makevars.template 2009-06-16 15:18:06.000000000 +0200 -@@ -0,0 +1,41 @@ -+# Makefile variables for PO directory in any package using GNU gettext. -+ -+# Usually the message domain is the same as the package name. -+DOMAIN = $(PACKAGE) -+ -+# These two variables depend on the location of this directory. -+subdir = po -+top_builddir = .. -+ -+# These options get passed to xgettext. -+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ -+ -+# This is the copyright holder that gets inserted into the header of the -+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding -+# package. (Note that the msgstr strings, extracted from the package's -+# sources, belong to the copyright holder of the package.) Translators are -+# expected to transfer the copyright for their translations to this person -+# or entity, or to disclaim their copyright. The empty string stands for -+# the public domain; in this case the translators are expected to disclaim -+# their copyright. -+COPYRIGHT_HOLDER = Free Software Foundation, Inc. -+ -+# This is the email address or URL to which the translators shall report -+# bugs in the untranslated strings: -+# - Strings which are not entire sentences, see the maintainer guidelines -+# in the GNU gettext documentation, section 'Preparing Strings'. -+# - Strings which use unclear terms or require additional context to be -+# understood. -+# - Strings which make invalid assumptions about notation of date, time or -+# money. -+# - Pluralisation problems. -+# - Incorrect English spelling. -+# - Incorrect formatting. -+# It can be your email address, or a mailing list address where translators -+# can write to without being subscribed, or the URL of a web page through -+# which the translators can contact you. -+MSGID_BUGS_ADDRESS = -+ -+# This is the list of locale categories, beyond LC_MESSAGES, for which the -+# message catalogs shall be used. It is usually empty. -+EXTRA_LOCALE_CATEGORIES = diff --git a/src/popt-2-gnulib.patch b/src/popt-2-gnulib.patch new file mode 100644 index 0000000..1b4e15b --- /dev/null +++ b/src/popt-2-gnulib.patch @@ -0,0 +1,641 @@ +This file is part of mingw-cross-env. +See doc/index.html or doc/README 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 . */ ++ ++/* 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])) ++ ]) ++]) diff --git a/src/popt.mk b/src/popt.mk index 6fa766b..72772a1 100644 --- a/src/popt.mk +++ b/src/popt.mk @@ -20,6 +20,10 @@ define $(PKG)_UPDATE 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 \ -- cgit v0.12