mxe-octave: src/popt-2-gnulib.patch annotate

annotate src/popt-2-gnulib.patch @ 684:6ab8ff5ab4f6

use the autotools for package popt

author	Volker Grabsch <vog@notjusthosting.com>
date	Fri, 05 Feb 2010 03:06:08 +0100
parents
children	29f1ba4559ae

rev	line source
684 6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	1 This file is part of mingw-cross-env.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	2 See doc/index.html or doc/README for further information.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	3
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	4 diff -urN popt-1.15-mod/lib/dummy.c popt-1.15-mod2/lib/dummy.c
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	5 --- popt-1.15-mod/lib/dummy.c 1970-01-01 01:00:00.000000000 +0100
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	6 +++ popt-1.15-mod2/lib/dummy.c 2009-06-16 15:18:05.000000000 +0200
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	7 @@ -0,0 +1,42 @@
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	8 +/* A dummy file, to prevent empty libraries from breaking builds.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	9 + Copyright (C) 2004, 2007 Free Software Foundation, Inc.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	10 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	11 + This program is free software: you can redistribute it and/or modify
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	12 + it under the terms of the GNU General Public License as published by
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	13 + the Free Software Foundation; either version 3 of the License, or
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	14 + (at your option) any later version.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	15 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	16 + This program is distributed in the hope that it will be useful,
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	17 + but WITHOUT ANY WARRANTY; without even the implied warranty of
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	18 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	19 + GNU General Public License for more details.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	20 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	21 + You should have received a copy of the GNU General Public License
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	22 + along with this program. If not, see <http://www.gnu.org/licenses/>. */
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	23 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	24 +/* Some systems, reportedly OpenBSD and Mac OS X, refuse to create
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	25 + libraries without any object files. You might get an error like:
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	26 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	27 + > ar cru .libs/libgl.a
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	28 + > ar: no archive members specified
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	29 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	30 + Compiling this file, and adding its object file to the library, will
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	31 + prevent the library from being empty. */
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	32 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	33 +/* Some systems, such as Solaris with cc 5.0, refuse to work with libraries
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	34 + that don't export any symbol. You might get an error like:
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	35 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	36 + > cc ... libgnu.a
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	37 + > ild: (bad file) garbled symbol table in archive ../gllib/libgnu.a
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	38 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	39 + Compiling this file, and adding its object file to the library, will
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	40 + prevent the library from exporting no symbols. */
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	41 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	42 +#ifdef __sun
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	43 +/* This declaration ensures that the library will export at least 1 symbol. */
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	44 +int gl_dummy_symbol;
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	45 +#else
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	46 +/* This declaration is solely to ensure that after preprocessing
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	47 + this file is never empty. */
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	48 +typedef int dummy;
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	49 +#endif
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	50 diff -urN popt-1.15-mod/lib/Makefile.am popt-1.15-mod2/lib/Makefile.am
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	51 --- popt-1.15-mod/lib/Makefile.am 1970-01-01 01:00:00.000000000 +0100
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	52 +++ popt-1.15-mod2/lib/Makefile.am 2009-06-16 15:18:05.000000000 +0200
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	53 @@ -0,0 +1,53 @@
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	54 +## DO NOT EDIT! GENERATED AUTOMATICALLY!
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	55 +## Process this file with automake to produce Makefile.in.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	56 +# Copyright (C) 2002-2009 Free Software Foundation, Inc.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	57 +#
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	58 +# This file is free software, distributed under the terms of the GNU
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	59 +# General Public License. As a special exception to the GNU General
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	60 +# Public License, this file may be distributed as part of a program
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	61 +# that contains a configuration script generated by Autoconf, under
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	62 +# the same distribution terms as the rest of that program.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	63 +#
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	64 +# Generated by gnulib-tool.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	65 +# 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
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	66 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	67 +AUTOMAKE_OPTIONS = 1.5 gnits
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	68 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	69 +SUBDIRS =
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	70 +noinst_HEADERS =
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	71 +noinst_LIBRARIES =
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	72 +noinst_LTLIBRARIES =
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	73 +EXTRA_DIST =
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	74 +BUILT_SOURCES =
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	75 +SUFFIXES =
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	76 +MOSTLYCLEANFILES = core *.stackdump
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	77 +MOSTLYCLEANDIRS =
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	78 +CLEANFILES =
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	79 +DISTCLEANFILES =
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	80 +MAINTAINERCLEANFILES =
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	81 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	82 +AM_CPPFLAGS =
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	83 +AM_CFLAGS =
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	84 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	85 +noinst_LTLIBRARIES += libgnu.la
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	86 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	87 +libgnu_la_SOURCES =
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	88 +libgnu_la_LIBADD = $(gl_LTLIBOBJS)
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	89 +libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS)
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	90 +EXTRA_libgnu_la_SOURCES =
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	91 +libgnu_la_LDFLAGS = $(AM_LDFLAGS)
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	92 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	93 +## begin gnulib module dummy
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	94 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	95 +libgnu_la_SOURCES += dummy.c
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	96 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	97 +## end gnulib module dummy
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	98 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	99 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	100 +mostlyclean-local: mostlyclean-generic
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	101 + @for dir in '' $(MOSTLYCLEANDIRS); do \
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	102 + if test -n "$$dir" && test -d $$dir; then \
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	103 + echo "rmdir $$dir"; rmdir $$dir; \
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	104 + fi; \
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	105 + done; \
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	106 + :
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	107 diff -urN popt-1.15-mod/m4/00gnulib.m4 popt-1.15-mod2/m4/00gnulib.m4
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	108 --- popt-1.15-mod/m4/00gnulib.m4 1970-01-01 01:00:00.000000000 +0100
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	109 +++ popt-1.15-mod2/m4/00gnulib.m4 2009-06-16 15:18:05.000000000 +0200
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	110 @@ -0,0 +1,30 @@
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	111 +# 00gnulib.m4 serial 2
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	112 +dnl Copyright (C) 2009 Free Software Foundation, Inc.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	113 +dnl This file is free software; the Free Software Foundation
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	114 +dnl gives unlimited permission to copy and/or distribute it,
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	115 +dnl with or without modifications, as long as this notice is preserved.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	116 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	117 +dnl This file must be named something that sorts before all other
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	118 +dnl gnulib-provided .m4 files. It is needed until such time as we can
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	119 +dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	120 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	121 +# AC_DEFUN_ONCE([NAME], VALUE)
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	122 +# ----------------------------
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	123 +# Define NAME to expand to VALUE on the first use (whether by direct
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	124 +# expansion, or by AC_REQUIRE), and to nothing on all subsequent uses.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	125 +# Avoid bugs in AC_REQUIRE in Autoconf 2.63 and earlier. This
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	126 +# definition is slower than the version in Autoconf 2.64, because it
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	127 +# can only use interfaces that existed since 2.59; but it achieves the
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	128 +# same effect. Quoting is necessary to avoid confusing Automake.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	129 +m4_version_prereq([2.63.263], [],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	130 +[m4_define([AC][_DEFUN_ONCE],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	131 + [AC][_DEFUN([$1],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	132 + [AC_REQUIRE([_gl_DEFUN_ONCE([$1])],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	133 + [m4_indir([_gl_DEFUN_ONCE([$1])])])])]dnl
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	134 +[AC][_DEFUN([_gl_DEFUN_ONCE([$1])], [$2])])])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	135 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	136 +# gl_00GNULIB
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	137 +# -----------
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	138 +# Witness macro that this file has been included. Needed to force
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	139 +# Automake to include this file prior to all other gnulib .m4 files.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	140 +AC_DEFUN([gl_00GNULIB])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	141 diff -urN popt-1.15-mod/m4/gnulib-cache.m4 popt-1.15-mod2/m4/gnulib-cache.m4
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	142 --- popt-1.15-mod/m4/gnulib-cache.m4 1970-01-01 01:00:00.000000000 +0100
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	143 +++ popt-1.15-mod2/m4/gnulib-cache.m4 2009-06-16 15:18:05.000000000 +0200
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	144 @@ -0,0 +1,35 @@
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	145 +# Copyright (C) 2002-2009 Free Software Foundation, Inc.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	146 +#
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	147 +# This file is free software, distributed under the terms of the GNU
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	148 +# General Public License. As a special exception to the GNU General
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	149 +# Public License, this file may be distributed as part of a program
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	150 +# that contains a configuration script generated by Autoconf, under
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	151 +# the same distribution terms as the rest of that program.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	152 +#
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	153 +# Generated by gnulib-tool.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	154 +#
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	155 +# This file represents the specification of how gnulib-tool is used.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	156 +# It acts as a cache: It is written and read by gnulib-tool.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	157 +# In projects using CVS, this file is meant to be stored in CVS,
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	158 +# like the configure.ac and various Makefile.am files.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	159 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	160 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	161 +# Specification in the form of a command-line invocation:
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	162 +# gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --libtool --macro-prefix=gl
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	163 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	164 +# Specification in the form of a few gnulib-tool.m4 macro invocations:
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	165 +gl_LOCAL_DIR([])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	166 +gl_MODULES([
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	167 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	168 +])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	169 +gl_AVOID([])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	170 +gl_SOURCE_BASE([lib])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	171 +gl_M4_BASE([m4])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	172 +gl_PO_BASE([])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	173 +gl_DOC_BASE([doc])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	174 +gl_TESTS_BASE([tests])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	175 +gl_LIB([libgnu])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	176 +gl_MAKEFILE_NAME([])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	177 +gl_LIBTOOL
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	178 +gl_MACRO_PREFIX([gl])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	179 +gl_PO_DOMAIN([])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	180 diff -urN popt-1.15-mod/m4/gnulib-common.m4 popt-1.15-mod2/m4/gnulib-common.m4
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	181 --- popt-1.15-mod/m4/gnulib-common.m4 1970-01-01 01:00:00.000000000 +0100
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	182 +++ popt-1.15-mod2/m4/gnulib-common.m4 2009-06-16 15:18:05.000000000 +0200
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	183 @@ -0,0 +1,124 @@
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	184 +# gnulib-common.m4 serial 11
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	185 +dnl Copyright (C) 2007-2009 Free Software Foundation, Inc.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	186 +dnl This file is free software; the Free Software Foundation
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	187 +dnl gives unlimited permission to copy and/or distribute it,
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	188 +dnl with or without modifications, as long as this notice is preserved.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	189 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	190 +# gl_COMMON
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	191 +# is expanded unconditionally through gnulib-tool magic.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	192 +AC_DEFUN([gl_COMMON], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	193 + dnl Use AC_REQUIRE here, so that the code is expanded once only.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	194 + AC_REQUIRE([gl_00GNULIB])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	195 + AC_REQUIRE([gl_COMMON_BODY])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	196 +])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	197 +AC_DEFUN([gl_COMMON_BODY], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	198 + AH_VERBATIM([isoc99_inline],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	199 +[/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	200 + the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	201 + earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	202 + __APPLE__ && __MACH__ test for MacOS X.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	203 + __APPLE_CC__ tests for the Apple compiler and its version.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	204 + __STDC_VERSION__ tests for the C99 mode. */
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	205 +#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	206 +# define __GNUC_STDC_INLINE__ 1
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	207 +#endif])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	208 + AH_VERBATIM([unused_parameter],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	209 +[/* Define as a marker that can be attached to function parameter declarations
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	210 + for parameters that are not used. This helps to reduce warnings, such as
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	211 + from GCC -Wunused-parameter. */
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	212 +#if __GNUC__ >= 3 \|\| (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	213 +# define _UNUSED_PARAMETER_ __attribute__ ((__unused__))
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	214 +#else
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	215 +# define _UNUSED_PARAMETER_
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	216 +#endif
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	217 +])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	218 +])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	219 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	220 +# gl_MODULE_INDICATOR([modulename])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	221 +# defines a C macro indicating the presence of the given module.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	222 +AC_DEFUN([gl_MODULE_INDICATOR],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	223 +[
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	224 + AC_DEFINE([GNULIB_]translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___]), [1],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	225 + [Define to 1 when using the gnulib module ]$1[.])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	226 +])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	227 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	228 +# m4_foreach_w
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	229 +# is a backport of autoconf-2.59c's m4_foreach_w.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	230 +# Remove this macro when we can assume autoconf >= 2.60.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	231 +m4_ifndef([m4_foreach_w],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	232 + [m4_define([m4_foreach_w],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	233 + [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	234 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	235 +# AC_PROG_MKDIR_P
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	236 +# is a backport of autoconf-2.60's AC_PROG_MKDIR_P.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	237 +# Remove this macro when we can assume autoconf >= 2.60.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	238 +m4_ifdef([AC_PROG_MKDIR_P], [], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	239 + AC_DEFUN_ONCE([AC_PROG_MKDIR_P],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	240 + [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	241 + MKDIR_P='$(mkdir_p)'
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	242 + AC_SUBST([MKDIR_P])])])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	243 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	244 +# AC_C_RESTRICT
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	245 +# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61,
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	246 +# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	247 +# works.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	248 +# This definition can be removed once autoconf >= 2.62 can be assumed.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	249 +AC_DEFUN([AC_C_RESTRICT],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	250 +[AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	251 + [ac_cv_c_restrict=no
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	252 + # The order here caters to the fact that C++ does not require restrict.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	253 + for ac_kw in __restrict __restrict__ _Restrict restrict; do
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	254 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	255 + [[typedef int * int_ptr;
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	256 + int foo (int_ptr $ac_kw ip) {
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	257 + return ip[0];
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	258 + }]],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	259 + [[int s[1];
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	260 + int * $ac_kw t = s;
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	261 + t[0] = 0;
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	262 + return foo(t)]])],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	263 + [ac_cv_c_restrict=$ac_kw])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	264 + test "$ac_cv_c_restrict" != no && break
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	265 + done
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	266 + ])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	267 + AH_VERBATIM([restrict],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	268 +[/* Define to the equivalent of the C99 'restrict' keyword, or to
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	269 + nothing if this is not supported. Do not define if restrict is
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	270 + supported directly. */
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	271 +#undef restrict
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	272 +/* Work around a bug in Sun C++: it does not support _Restrict, even
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	273 + though the corresponding Sun C compiler does, which causes
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	274 + "#define restrict _Restrict" in the previous line. Perhaps some future
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	275 + version of Sun C++ will work with _Restrict; if so, it'll probably
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	276 + define __RESTRICT, just as Sun C does. */
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	277 +#if defined __SUNPRO_CC && !defined __RESTRICT
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	278 +# define _Restrict
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	279 +#endif])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	280 + case $ac_cv_c_restrict in
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	281 + restrict) ;;
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	282 + no) AC_DEFINE([restrict], []) ;;
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	283 + *) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	284 + esac
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	285 +])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	286 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	287 +# gl_BIGENDIAN
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	288 +# is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	289 +# Note that AC_REQUIRE([AC_C_BIGENDIAN]) does not work reliably because some
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	290 +# macros invoke AC_C_BIGENDIAN with arguments.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	291 +AC_DEFUN([gl_BIGENDIAN],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	292 +[
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	293 + AC_C_BIGENDIAN
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	294 +])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	295 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	296 +# gl_CACHE_VAL_SILENT(cache-id, command-to-set-it)
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	297 +# is like AC_CACHE_VAL(cache-id, command-to-set-it), except that it does not
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	298 +# output a spurious "(cached)" mark in the midst of other configure output.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	299 +# This macro should be used instead of AC_CACHE_VAL when it is not surrounded
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	300 +# by an AC_MSG_CHECKING/AC_MSG_RESULT pair.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	301 +AC_DEFUN([gl_CACHE_VAL_SILENT],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	302 +[
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	303 + saved_as_echo_n="$as_echo_n"
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	304 + as_echo_n=':'
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	305 + AC_CACHE_VAL([$1], [$2])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	306 + as_echo_n="$saved_as_echo_n"
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	307 +])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	308 diff -urN popt-1.15-mod/m4/gnulib-comp.m4 popt-1.15-mod2/m4/gnulib-comp.m4
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	309 --- popt-1.15-mod/m4/gnulib-comp.m4 1970-01-01 01:00:00.000000000 +0100
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	310 +++ popt-1.15-mod2/m4/gnulib-comp.m4 2009-06-16 15:18:05.000000000 +0200
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	311 @@ -0,0 +1,175 @@
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	312 +# DO NOT EDIT! GENERATED AUTOMATICALLY!
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	313 +# Copyright (C) 2002-2009 Free Software Foundation, Inc.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	314 +#
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	315 +# This file is free software, distributed under the terms of the GNU
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	316 +# General Public License. As a special exception to the GNU General
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	317 +# Public License, this file may be distributed as part of a program
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	318 +# that contains a configuration script generated by Autoconf, under
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	319 +# the same distribution terms as the rest of that program.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	320 +#
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	321 +# Generated by gnulib-tool.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	322 +#
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	323 +# This file represents the compiled summary of the specification in
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	324 +# gnulib-cache.m4. It lists the computed macro invocations that need
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	325 +# to be invoked from configure.ac.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	326 +# In projects using CVS, this file can be treated like other built files.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	327 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	328 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	329 +# This macro should be invoked from ./configure.ac, in the section
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	330 +# "Checks for programs", right after AC_PROG_CC, and certainly before
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	331 +# any checks for libraries, header files, types and library functions.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	332 +AC_DEFUN([gl_EARLY],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	333 +[
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	334 + m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	335 + m4_pattern_allow([^gl_ES$])dnl a valid locale name
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	336 + m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	337 + m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	338 + AC_REQUIRE([AC_PROG_RANLIB])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	339 +])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	340 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	341 +# This macro should be invoked from ./configure.ac, in the section
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	342 +# "Check for header files, types and library functions".
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	343 +AC_DEFUN([gl_INIT],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	344 +[
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	345 + AM_CONDITIONAL([GL_COND_LIBTOOL], [true])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	346 + gl_cond_libtool=true
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	347 + m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ]))
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	348 + m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS]))
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	349 + m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES]))
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	350 + m4_pushdef([gl_LIBSOURCES_LIST], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	351 + m4_pushdef([gl_LIBSOURCES_DIR], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	352 + gl_COMMON
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	353 + gl_source_base='lib'
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	354 + m4_ifval(gl_LIBSOURCES_LIST, [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	355 + m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ \|\|
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	356 + for gl_file in ]gl_LIBSOURCES_LIST[ ; do
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	357 + if test ! -r ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file ; then
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	358 + echo "missing file ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file" >&2
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	359 + exit 1
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	360 + fi
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	361 + done])dnl
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	362 + m4_if(m4_sysval, [0], [],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	363 + [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	364 + ])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	365 + m4_popdef([gl_LIBSOURCES_DIR])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	366 + m4_popdef([gl_LIBSOURCES_LIST])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	367 + m4_popdef([AC_LIBSOURCES])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	368 + m4_popdef([AC_REPLACE_FUNCS])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	369 + m4_popdef([AC_LIBOBJ])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	370 + AC_CONFIG_COMMANDS_PRE([
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	371 + gl_libobjs=
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	372 + gl_ltlibobjs=
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	373 + if test -n "$gl_LIBOBJS"; then
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	374 + # Remove the extension.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	375 + sed_drop_objext='s/\.o$//;s/\.obj$//'
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	376 + for i in `for i in $gl_LIBOBJS; do echo "$i"; done \| sed "$sed_drop_objext" \| sort \| uniq`; do
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	377 + gl_libobjs="$gl_libobjs $i.$ac_objext"
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	378 + gl_ltlibobjs="$gl_ltlibobjs $i.lo"
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	379 + done
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	380 + fi
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	381 + AC_SUBST([gl_LIBOBJS], [$gl_libobjs])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	382 + AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	383 + ])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	384 + gltests_libdeps=
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	385 + gltests_ltlibdeps=
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	386 + m4_pushdef([AC_LIBOBJ], m4_defn([gltests_LIBOBJ]))
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	387 + m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gltests_REPLACE_FUNCS]))
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	388 + m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES]))
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	389 + m4_pushdef([gltests_LIBSOURCES_LIST], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	390 + m4_pushdef([gltests_LIBSOURCES_DIR], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	391 + gl_COMMON
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	392 + gl_source_base='tests'
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	393 + m4_ifval(gltests_LIBSOURCES_LIST, [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	394 + m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ \|\|
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	395 + for gl_file in ]gltests_LIBSOURCES_LIST[ ; do
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	396 + if test ! -r ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file ; then
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	397 + echo "missing file ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file" >&2
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	398 + exit 1
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	399 + fi
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	400 + done])dnl
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	401 + m4_if(m4_sysval, [0], [],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	402 + [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	403 + ])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	404 + m4_popdef([gltests_LIBSOURCES_DIR])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	405 + m4_popdef([gltests_LIBSOURCES_LIST])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	406 + m4_popdef([AC_LIBSOURCES])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	407 + m4_popdef([AC_REPLACE_FUNCS])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	408 + m4_popdef([AC_LIBOBJ])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	409 + AC_CONFIG_COMMANDS_PRE([
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	410 + gltests_libobjs=
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	411 + gltests_ltlibobjs=
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	412 + if test -n "$gltests_LIBOBJS"; then
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	413 + # Remove the extension.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	414 + sed_drop_objext='s/\.o$//;s/\.obj$//'
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	415 + for i in `for i in $gltests_LIBOBJS; do echo "$i"; done \| sed "$sed_drop_objext" \| sort \| uniq`; do
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	416 + gltests_libobjs="$gltests_libobjs $i.$ac_objext"
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	417 + gltests_ltlibobjs="$gltests_ltlibobjs $i.lo"
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	418 + done
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	419 + fi
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	420 + AC_SUBST([gltests_LIBOBJS], [$gltests_libobjs])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	421 + AC_SUBST([gltests_LTLIBOBJS], [$gltests_ltlibobjs])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	422 + ])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	423 +])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	424 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	425 +# Like AC_LIBOBJ, except that the module name goes
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	426 +# into gl_LIBOBJS instead of into LIBOBJS.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	427 +AC_DEFUN([gl_LIBOBJ], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	428 + AS_LITERAL_IF([$1], [gl_LIBSOURCES([$1.c])])dnl
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	429 + gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext"
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	430 +])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	431 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	432 +# Like AC_REPLACE_FUNCS, except that the module name goes
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	433 +# into gl_LIBOBJS instead of into LIBOBJS.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	434 +AC_DEFUN([gl_REPLACE_FUNCS], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	435 + m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	436 + AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	437 +])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	438 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	439 +# Like AC_LIBSOURCES, except the directory where the source file is
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	440 +# expected is derived from the gnulib-tool parameterization,
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	441 +# and alloca is special cased (for the alloca-opt module).
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	442 +# We could also entirely rely on EXTRA_lib..._SOURCES.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	443 +AC_DEFUN([gl_LIBSOURCES], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	444 + m4_foreach([_gl_NAME], [$1], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	445 + m4_if(_gl_NAME, [alloca.c], [], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	446 + m4_define([gl_LIBSOURCES_DIR], [lib])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	447 + m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	448 + ])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	449 + ])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	450 +])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	451 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	452 +# Like AC_LIBOBJ, except that the module name goes
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	453 +# into gltests_LIBOBJS instead of into LIBOBJS.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	454 +AC_DEFUN([gltests_LIBOBJ], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	455 + AS_LITERAL_IF([$1], [gltests_LIBSOURCES([$1.c])])dnl
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	456 + gltests_LIBOBJS="$gltests_LIBOBJS $1.$ac_objext"
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	457 +])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	458 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	459 +# Like AC_REPLACE_FUNCS, except that the module name goes
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	460 +# into gltests_LIBOBJS instead of into LIBOBJS.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	461 +AC_DEFUN([gltests_REPLACE_FUNCS], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	462 + m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	463 + AC_CHECK_FUNCS([$1], , [gltests_LIBOBJ($ac_func)])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	464 +])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	465 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	466 +# Like AC_LIBSOURCES, except the directory where the source file is
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	467 +# expected is derived from the gnulib-tool parameterization,
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	468 +# and alloca is special cased (for the alloca-opt module).
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	469 +# We could also entirely rely on EXTRA_lib..._SOURCES.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	470 +AC_DEFUN([gltests_LIBSOURCES], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	471 + m4_foreach([_gl_NAME], [$1], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	472 + m4_if(_gl_NAME, [alloca.c], [], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	473 + m4_define([gltests_LIBSOURCES_DIR], [tests])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	474 + m4_append([gltests_LIBSOURCES_LIST], _gl_NAME, [ ])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	475 + ])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	476 + ])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	477 +])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	478 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	479 +# This macro records the list of files which have been installed by
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	480 +# gnulib-tool and may be removed by future gnulib-tool invocations.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	481 +AC_DEFUN([gl_FILE_LIST], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	482 + lib/dummy.c
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	483 + m4/00gnulib.m4
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	484 + m4/gnulib-common.m4
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	485 + m4/onceonly.m4
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	486 +])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	487 diff -urN popt-1.15-mod/m4/gnulib-tool.m4 popt-1.15-mod2/m4/gnulib-tool.m4
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	488 --- popt-1.15-mod/m4/gnulib-tool.m4 1970-01-01 01:00:00.000000000 +0100
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	489 +++ popt-1.15-mod2/m4/gnulib-tool.m4 2009-06-16 15:18:05.000000000 +0200
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	490 @@ -0,0 +1,57 @@
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	491 +# gnulib-tool.m4 serial 2
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	492 +dnl Copyright (C) 2004-2005 Free Software Foundation, Inc.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	493 +dnl This file is free software; the Free Software Foundation
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	494 +dnl gives unlimited permission to copy and/or distribute it,
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	495 +dnl with or without modifications, as long as this notice is preserved.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	496 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	497 +dnl The following macros need not be invoked explicitly.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	498 +dnl Invoking them does nothing except to declare default arguments
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	499 +dnl for "gnulib-tool --import".
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	500 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	501 +dnl Usage: gl_LOCAL_DIR([DIR])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	502 +AC_DEFUN([gl_LOCAL_DIR], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	503 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	504 +dnl Usage: gl_MODULES([module1 module2 ...])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	505 +AC_DEFUN([gl_MODULES], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	506 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	507 +dnl Usage: gl_AVOID([module1 module2 ...])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	508 +AC_DEFUN([gl_AVOID], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	509 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	510 +dnl Usage: gl_SOURCE_BASE([DIR])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	511 +AC_DEFUN([gl_SOURCE_BASE], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	512 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	513 +dnl Usage: gl_M4_BASE([DIR])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	514 +AC_DEFUN([gl_M4_BASE], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	515 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	516 +dnl Usage: gl_PO_BASE([DIR])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	517 +AC_DEFUN([gl_PO_BASE], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	518 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	519 +dnl Usage: gl_DOC_BASE([DIR])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	520 +AC_DEFUN([gl_DOC_BASE], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	521 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	522 +dnl Usage: gl_TESTS_BASE([DIR])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	523 +AC_DEFUN([gl_TESTS_BASE], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	524 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	525 +dnl Usage: gl_WITH_TESTS
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	526 +AC_DEFUN([gl_WITH_TESTS], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	527 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	528 +dnl Usage: gl_LIB([LIBNAME])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	529 +AC_DEFUN([gl_LIB], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	530 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	531 +dnl Usage: gl_LGPL or gl_LGPL([VERSION])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	532 +AC_DEFUN([gl_LGPL], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	533 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	534 +dnl Usage: gl_MAKEFILE_NAME([FILENAME])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	535 +AC_DEFUN([gl_MAKEFILE_NAME], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	536 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	537 +dnl Usage: gl_LIBTOOL
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	538 +AC_DEFUN([gl_LIBTOOL], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	539 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	540 +dnl Usage: gl_MACRO_PREFIX([PREFIX])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	541 +AC_DEFUN([gl_MACRO_PREFIX], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	542 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	543 +dnl Usage: gl_PO_DOMAIN([DOMAIN])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	544 +AC_DEFUN([gl_PO_DOMAIN], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	545 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	546 +dnl Usage: gl_VC_FILES([BOOLEAN])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	547 +AC_DEFUN([gl_VC_FILES], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	548 diff -urN popt-1.15-mod/m4/onceonly.m4 popt-1.15-mod2/m4/onceonly.m4
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	549 --- popt-1.15-mod/m4/onceonly.m4 1970-01-01 01:00:00.000000000 +0100
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	550 +++ popt-1.15-mod2/m4/onceonly.m4 2009-06-16 15:18:05.000000000 +0200
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	551 @@ -0,0 +1,90 @@
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	552 +# onceonly.m4 serial 6
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	553 +dnl Copyright (C) 2002-2003, 2005-2006, 2008 Free Software Foundation, Inc.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	554 +dnl This file is free software, distributed under the terms of the GNU
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	555 +dnl General Public License. As a special exception to the GNU General
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	556 +dnl Public License, this file may be distributed as part of a program
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	557 +dnl that contains a configuration script generated by Autoconf, under
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	558 +dnl the same distribution terms as the rest of that program.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	559 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	560 +dnl This file defines some "once only" variants of standard autoconf macros.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	561 +dnl AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	562 +dnl AC_CHECK_FUNCS_ONCE like AC_CHECK_FUNCS
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	563 +dnl AC_CHECK_DECLS_ONCE like AC_CHECK_DECLS
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	564 +dnl AC_REQUIRE([AC_FUNC_STRCOLL]) like AC_FUNC_STRCOLL
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	565 +dnl The advantage is that the check for each of the headers/functions/decls
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	566 +dnl will be put only once into the 'configure' file. It keeps the size of
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	567 +dnl the 'configure' file down, and avoids redundant output when 'configure'
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	568 +dnl is run.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	569 +dnl The drawback is that the checks cannot be conditionalized. If you write
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	570 +dnl if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	571 +dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	572 +dnl empty, and the check will be inserted before the body of the AC_DEFUNed
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	573 +dnl function.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	574 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	575 +dnl The original code implemented AC_CHECK_HEADERS_ONCE and AC_CHECK_FUNCS_ONCE
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	576 +dnl in terms of AC_DEFUN and AC_REQUIRE. This implementation uses diversions to
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	577 +dnl named sections DEFAULTS and INIT_PREPARE in order to check all requested
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	578 +dnl headers at once, thus reducing the size of 'configure'. It is known to work
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	579 +dnl with autoconf 2.57..2.62 at least . The size reduction is ca. 9%.
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	580 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	581 +dnl Autoconf version 2.59 plus gnulib is required; this file is not needed
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	582 +dnl with Autoconf 2.60 or greater. But note that autoconf's implementation of
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	583 +dnl AC_CHECK_DECLS_ONCE expects a comma-separated list of symbols as first
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	584 +dnl argument!
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	585 +AC_PREREQ([2.59])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	586 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	587 +# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	588 +# AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	589 +AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	590 + :
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	591 + m4_foreach_w([gl_HEADER_NAME], [$1], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	592 + AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	593 + [./-], [___])), [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	594 + m4_divert_text([INIT_PREPARE],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	595 + [gl_header_list="$gl_header_list gl_HEADER_NAME"])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	596 + gl_HEADERS_EXPANSION
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	597 + AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_HEADER_NAME])),
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	598 + [Define to 1 if you have the <]m4_defn([gl_HEADER_NAME])[> header file.])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	599 + ])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	600 + AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	601 + [./-], [___])))
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	602 + ])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	603 +])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	604 +m4_define([gl_HEADERS_EXPANSION], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	605 + m4_divert_text([DEFAULTS], [gl_header_list=])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	606 + AC_CHECK_HEADERS([$gl_header_list])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	607 + m4_define([gl_HEADERS_EXPANSION], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	608 +])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	609 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	610 +# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	611 +# AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	612 +AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	613 + :
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	614 + m4_foreach_w([gl_FUNC_NAME], [$1], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	615 + AC_DEFUN([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]), [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	616 + m4_divert_text([INIT_PREPARE],
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	617 + [gl_func_list="$gl_func_list gl_FUNC_NAME"])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	618 + gl_FUNCS_EXPANSION
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	619 + AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_FUNC_NAME])),
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	620 + [Define to 1 if you have the `]m4_defn([gl_FUNC_NAME])[' function.])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	621 + ])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	622 + AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]))
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	623 + ])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	624 +])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	625 +m4_define([gl_FUNCS_EXPANSION], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	626 + m4_divert_text([DEFAULTS], [gl_func_list=])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	627 + AC_CHECK_FUNCS([$gl_func_list])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	628 + m4_define([gl_FUNCS_EXPANSION], [])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	629 +])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	630 +
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	631 +# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	632 +# AC_CHECK_DECLS(DECL1, DECL2, ...).
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	633 +AC_DEFUN([AC_CHECK_DECLS_ONCE], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	634 + :
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	635 + m4_foreach_w([gl_DECL_NAME], [$1], [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	636 + AC_DEFUN([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]), [
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	637 + AC_CHECK_DECLS(m4_defn([gl_DECL_NAME]))
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	638 + ])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	639 + AC_REQUIRE([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]))
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	640 + ])
6ab8ff5ab4f6 use the autotools for package popt Volker Grabsch <vog@notjusthosting.com> parents: diff changeset	641 +])

Mercurial > mxe-octave

annotate src/popt-2-gnulib.patch @ 684:6ab8ff5ab4f6