Commit c16b8211 authored by Paul Martin's avatar Paul Martin Committed by Michael Jeanson

Import Debian changes 1.15-1

popt (1.15-1) unstable; urgency=low

  * New upstream release
  * Update to standards version 3.8.3
    + debian/README.source added
  * debian/rules: Switch from using "dh_clean -k" to "dh_prep".
parents cd7ba0e0 741237a9
1.14 -> 1.15:
- release popt-1.15.
- rse: fix building under --disable-nls
- rse: fix building under non GLIBC platforms where glob_pattern_p fallback has to be used
- rse: fix building under platforms where FNM_EXTMATCH is not available
- jbj: poptReadFile: permit NULL if return values are not desired.
- jbj: poptReadFile: add routine.
- jbj: trim out escaped newline(s) from file content, other fixes.
- jbj: permit popt alias/exec to include content from a file.
- jbj: permit glob(3) patterns in appName field of popt alias/exec config.
- jbj: add test cases for bit operations and toggles.
- jbj: avoid displaying --[no]nofoo with POPT_ARGFLAG_TOGGLE.
- jbj: add poptArgInfo() to get argInfo, implementing POPT_ARGFLAG_TOGGLE.
- jbj: add longOptionStrcmp() to match w POPT_ARGFLAG_TOGGLE.
- jbj: change singleDash arg to a bit enum, use LF_ISSET(ONEDASH) instead.
- jbj: rework the glob wrappers into something more useful. portability todo++.
- jbj: stub in glob(3) wrappers for popt. more useful poptGlob() API next.
- jbj: add poptInit/poptFini/poptReadConfigFiles/poptSaneFile routines.
- jbj: rewrite poptReadConfigFile(), styling for (i.e. my) readbility.
- jbj: reserve a bit for --[no]opt prefix toggling.
- jbj: fix: check/print argv[0] in --help for NULL.
- jbj: permit type/group bitmasks to be changed (if needed somewhen).
- jbj: snip out 8 unused bits for argument groups.
- jbj: fix: eliminate dead code (CID#5).
- jbj: fix: rearrange code to better hint to coverity scan (CID#9).
- jbj: fix: rewrite (and simplify) strdup_locale_from_utf8() (CID#7, CID#8, CID#11, CID#12).
- jbj: test/use HAVE_SRANDOM to avoid portability issues.
- jbj: fix: remove AC_CHECK_VA_COPY check, va_copy is no longer used.
- jbj: add eo.po and id.po (Translation Project).
- jbj: updated da.po (Translation Project).
- jbj: extend coverage to several additional setup routines.
- jbj: add tests for --usage/--help coverage.
- jbj: add lconv/gcov targets to Makefile.am.
- jbj: refactor automagic (*opt->arg) option arg store to poptSaveArg().
- ldv: update INPUT tag in Doxyfile.in, fix doxygen warnings in popthelp.c.
- start popt-1.15 development.
1.13 -> 1.14:
- release popt-1.14.
- jbj: remove findme.c, add poptint.c, to po/POTFILES.in.
- jbj: use stpcpy 2 more places (Wayne Davison<wayned@samba.org>).
- jbj: add @LTLIBICONV@ when needed (Stanislav Brabec<sbrabec@suse.cz>).
......
2007-06-14 gettextize <bug-gnu-gettext@gnu.org>
* Makefile.am (EXTRA_DIST): Add config.rpath, m4/ChangeLog.
* configure.ac (AC_OUTPUT): Add po/Makefile.in.
......@@ -460,12 +460,11 @@ WARN_LOGFILE =
# with spaces.
INPUT = \
./findme.c \
./findme.h \
./popt.c \
./popt.h \
./poptconfig.c \
./popthelp.c \
./poptint.c \
./poptint.h \
./poptparse.c \
./system.h
......
......@@ -71,4 +71,33 @@ doxygen: Doxyfile
mkdir -p doxygen
doxygen
.PHONY: lcov-reset # run lcov from scratch, always
lcov-reset:
make lcov-run
make lcov-report
.PHONY: lcov # run lcov from scratch if the dir is not there
lcov:
make lcov-reset
.PHONY: lcov-run # reset run coverage tests
lcov-run:
@-rm -rf lcov
find . -name "*.gcda" -exec rm {} \;
make check
.PHONY: lcov-report # generate report based on current coverage data
lcov-report:
mkdir lcov
lcov --directory . --capture --output-file lcov/lcov.info
lcov -l lcov/lcov.info | grep -v "`cd $(top_srcdir) && pwd`" | cut -d: -f1 > lcov/remove
lcov -r lcov/lcov.info `cat lcov/remove` > lcov/lcov.cleaned.info
rm lcov/remove
mv lcov/lcov.cleaned.info lcov/lcov.info
genhtml -t "$(PACKAGE_STRING)" -o lcov lcov/lcov.info
#.PHONY: lcov-upload
#lcov-upload: lcov
# rsync -rvz -e ssh --delete lcov/* ???
ACLOCAL_AMFLAGS = -I m4
This diff is collapsed.
This diff is collapsed.
/* config.h.in. Generated from configure.ac by autoheader. */
/* Predefined possible va_copy() implementation (id: ASP) */
#define __VA_COPY_USE_ASP(d, s) do { *(d) = *(s); } while (0)
/* Predefined possible va_copy() implementation (id: ASS) */
#define __VA_COPY_USE_ASS(d, s) do { (d) = (s); } while (0)
/* Predefined possible va_copy() implementation (id: C99) */
#define __VA_COPY_USE_C99(d, s) va_copy((d), (s))
/* Predefined possible va_copy() implementation (id: CPP) */
#define __VA_COPY_USE_CPP(d, s) memcpy((void *)(d), (void *)(s), sizeof(*(s)))
/* Predefined possible va_copy() implementation (id: CPS) */
#define __VA_COPY_USE_CPS(d, s) memcpy((void *)&(d), (void *)&(s), sizeof((s)))
/* Define to 1 if translation of program messages to the user's native
language is requested. */
#undef ENABLE_NLS
/* Predefined possible va_copy() implementation (id: GCB) */
#define __VA_COPY_USE_GCB(d, s) __builtin_va_copy((d), (s))
/* Predefined possible va_copy() implementation (id: GCH) */
#define __VA_COPY_USE_GCH(d, s) __va_copy((d), (s))
/* Predefined possible va_copy() implementation (id: GCM) */
#define __VA_COPY_USE_GCM(d, s) VA_COPY((d), (s))
/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
CoreFoundation framework. */
#undef HAVE_CFLOCALECOPYCURRENT
......@@ -46,6 +22,9 @@
/* Define to 1 if you have the <float.h> header file. */
#undef HAVE_FLOAT_H
/* Define to 1 if you have the <fnmatch.h> header file. */
#undef HAVE_FNMATCH_H
/* Define to 1 if you have the `geteuid' function. */
#undef HAVE_GETEUID
......@@ -82,6 +61,9 @@
/* Define to 1 if you have the `setregid' function. */
#undef HAVE_SETREGID
/* Define to 1 if you have the `srandom' function. */
#undef HAVE_SRANDOM
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
......@@ -112,13 +94,13 @@
/* Define to 1 if you have the `vasprintf' function. */
#undef HAVE_VASPRINTF
/* Define if va_copy() macro exists (and no fallback implementation is
required) */
#undef HAVE_VA_COPY
/* Define to 1 if you have the `__secure_getenv' function. */
#undef HAVE___SECURE_GETENV
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
/* Name of package */
#undef PACKAGE
......@@ -160,12 +142,3 @@
/* Define like PROTOTYPES; this can be used by system headers. */
#undef __PROTOTYPES
/* Optional va_copy() implementation activation */
#ifndef HAVE_VA_COPY
#define va_copy(d, s) __VA_COPY_USE(d, s)
#endif
/* Define to id of used va_copy() implementation */
#undef __VA_COPY_USE
This diff is collapsed.
AC_PREREQ(2.57)
AC_INIT(popt, 1.14, popt-devel@rpm5.org)
AC_INIT(popt, 1.15, popt-devel@rpm5.org)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([popt.h])
AC_CONFIG_HEADERS([config.h])
......@@ -14,38 +14,35 @@ AC_SUBST(LT_AGE, 8)
AM_INIT_AUTOMAKE([foreign])
ALL_LINGUAS="cs da de es fi fr ga gl hu is it ja ko nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
ALL_LINGUAS="cs da de eo es fi fr ga gl hu id is it ja ko nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_LIBTOOL
dnl
dnl if CC is gcc, we can rebuild the dependencies (since the depend rule
dnl requires gcc). If it's not, don't rebuild dependencies -- use what was
dnl shipped with RPM.
dnl
if test X"$GCC" = "Xyes" ; then
CFLAGS="-Wall -W -D_GNU_SOURCE -D_REENTRANT $CFLAGS"
if test X"$GCC" = "Xyes"; then
CFLAGS="$CFLAGS -Wall -W"
TARGET="depend allprogs"
else
TARGET="everything"
#
# let the Makefile know that we're done with `depend', since we don't
# have gcc we're not going to rebuild our dependencies at all.
#
echo > .depend-done
dnl let the Makefile know that we're done with `depend', since we don't
dnl have gcc we're not going to rebuild our dependencies at all.
echo >.depend-done
fi
AC_SUBST(TARGET)
CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT"
AC_GCC_TRADITIONAL
AC_SYS_LARGEFILE
AC_ISC_POSIX
AM_C_PROTOTYPES
AC_CHECK_VA_COPY
AC_CHECK_HEADERS(float.h glob.h langinfo.h libintl.h mcheck.h unistd.h)
AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h)
# For some systems we know that we have ld_version scripts.
# Use it then as default.
......@@ -69,7 +66,7 @@ AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
AC_CHECK_FUNC(setreuid, [], [
AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
])
AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf)
AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom)
AM_GNU_GETTEXT([external])
AM_ICONV_LINK
......
This package uses quilt to manage all modifications to the upstream
source. Changes are stored in the source package as diffs in
debian/patches and applied during the build.
Please see /usr/share/doc/quilt/README.source for more details.
popt (1.15-1) unstable; urgency=low
* New upstream release
* Update to standards version 3.8.3
+ debian/README.source added
* debian/rules: Switch from using "dh_clean -k" to "dh_prep".
-- Paul Martin <pm@debian.org> Tue, 06 Oct 2009 19:13:19 +0100
popt (1.14-4) unstable; urgency=low
* Remove locale data from the udeb, and change the package
......
......@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Paul Martin <pm@debian.org>
Build-Depends: debhelper (>> 7), gettext, quilt
Homepage: http://rpm5.org/
Standards-Version: 3.8.0
Standards-Version: 3.8.3
Package: libpopt0
Architecture: any
......
Index: popt-1.14/popt.c
Index: popt-1.15/popt.c
===================================================================
--- popt-1.14.orig/popt.c 2008-06-09 17:14:20.073282105 +0100
+++ popt-1.14/popt.c 2008-06-09 17:15:20.765279008 +0100
@@ -771,8 +771,13 @@
--- popt-1.15.orig/popt.c 2009-10-06 18:56:06.390006971 +0100
+++ popt-1.15/popt.c 2009-10-06 18:56:24.132007037 +0100
@@ -817,8 +817,13 @@
int poptSaveLong(long * arg, unsigned int argInfo, long aLong)
{
......@@ -16,7 +16,7 @@ Index: popt-1.14/popt.c
return POPT_ERROR_NULLARG;
if (aLong != 0 && LF_ISSET(RANDOM)) {
@@ -807,8 +812,13 @@
@@ -858,8 +863,13 @@
int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong)
{
......
Index: popt-1.14/popt.c
Index: popt-1.15/popt.c
===================================================================
--- popt-1.14.orig/popt.c 2008-06-09 17:43:45.761277262 +0100
+++ popt-1.14/popt.c 2008-06-09 19:13:01.791091987 +0100
@@ -179,6 +179,7 @@
con->os->next = 1; /* skip argv[0] */
--- popt-1.15.orig/popt.c 2009-10-06 18:56:04.086007174 +0100
+++ popt-1.15/popt.c 2009-10-06 18:56:06.390006971 +0100
@@ -184,6 +184,7 @@
con->os->next = 1; /* skip argv[0] */
con->leftovers = calloc( (size_t)(argc + 1), sizeof(*con->leftovers) );
+ con->allocLeftovers = argc + 1;
/*@-dependenttrans -assignexpose@*/ /* FIX: W2DO? */
con->options = options;
/*@=dependenttrans =assignexpose@*/
@@ -903,7 +904,19 @@
@@ -1099,7 +1100,19 @@
return 0;
}
if (con->leftovers != NULL) /* XXX can't happen */
......@@ -31,7 +31,7 @@ Index: popt-1.14/popt.c
continue;
}
@@ -1250,6 +1263,8 @@
@@ -1353,6 +1366,8 @@
poptContext poptFreeContext(poptContext con)
{
......@@ -40,7 +40,7 @@ Index: popt-1.14/popt.c
if (con == NULL) return con;
poptResetContext(con);
con->os->argb = _free(con->os->argb);
@@ -1260,7 +1275,11 @@
@@ -1363,7 +1378,11 @@
con->execs = poptFreeItems(con->execs, con->numExecs);
con->numExecs = 0;
......@@ -52,11 +52,11 @@ Index: popt-1.14/popt.c
con->finalArgv = _free(con->finalArgv);
con->appName = _free(con->appName);
con->otherHelp = _free(con->otherHelp);
Index: popt-1.14/poptint.h
Index: popt-1.15/poptint.h
===================================================================
--- popt-1.14.orig/poptint.h 2008-06-09 17:43:45.877277091 +0100
+++ popt-1.14/poptint.h 2008-06-09 17:52:44.349281140 +0100
@@ -103,6 +103,7 @@
--- popt-1.15.orig/poptint.h 2009-10-06 18:56:04.097007072 +0100
+++ popt-1.15/poptint.h 2009-10-06 18:56:06.391006841 +0100
@@ -112,6 +112,7 @@
/*@owned@*/ /*@null@*/
poptArgv leftovers;
int numLeftovers;
......
Index: popt-1.14/po/ca.po
Index: popt-1.15/po/ca.po
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ popt-1.14/po/ca.po 2008-06-09 20:18:39.577280576 +0100
+++ popt-1.15/po/ca.po 2009-10-06 18:54:14.712007454 +0100
@@ -0,0 +1,116 @@
+# Catalan translation of popt.
+# Copyright © Free Software Foundation, Inc.
......@@ -119,16 +119,16 @@ Index: popt-1.14/po/ca.po
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr "[OPCIÓ...]"
Index: popt-1.14/configure
Index: popt-1.15/configure
===================================================================
--- popt-1.14.orig/configure 2008-06-09 20:19:19.137283049 +0100
+++ popt-1.14/configure 2008-06-09 20:19:30.285277645 +0100
@@ -2599,7 +2599,7 @@
--- popt-1.15.orig/configure 2009-04-12 20:31:14.000000000 +0100
+++ popt-1.15/configure 2009-10-06 18:55:21.764008060 +0100
@@ -2697,7 +2697,7 @@
-ALL_LINGUAS="cs da de es fi fr ga gl hu is it ja ko nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
+ALL_LINGUAS="ca cs da de es fi fr ga gl hu is it ja ko nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
-ALL_LINGUAS="cs da de eo es fi fr ga gl hu id is it ja ko nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
+ALL_LINGUAS="ca cs da de eo es fi fr ga gl hu id is it ja ko nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
......@@ -100,7 +100,7 @@ clean-patched:
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_prep
dh_installdirs
# Main install
......
......@@ -3,12 +3,15 @@ LIBPOPT_0
global:
_fini;
_init;
_poptArgMask;
_poptGroupMask;
poptAddAlias;
poptAddItem;
poptAliasOptions;
poptBadOption;
poptConfigFileToString;
poptDupArgv;
poptFinit;
poptFreeContext;
poptGetArg;
poptGetArgs;
......@@ -18,13 +21,17 @@ LIBPOPT_0
poptGetOptArg;
poptHelpOptions;
poptHelpOptionsI18N;
poptInit;
poptParseArgvString;
poptPeekArg;
poptPrintHelp;
poptPrintUsage;
poptReadFile;
poptReadConfigFile;
poptReadConfigFiles;
poptReadDefaultConfig;
poptResetContext;
poptSaneFile;
poptSaveInt;
poptSaveLong;
poptSaveLongLong;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
# serial 6 ltsugar.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
# lt_join(SEP, ARG1, [ARG2...])
# -----------------------------
# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
# associated separator.
# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
# versions in m4sugar had bugs.
m4_define([lt_join],
[m4_if([$#], [1], [],
[$#], [2], [[$2]],
[m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
m4_define([_lt_join],
[m4_if([$#$2], [2], [],
[m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
# lt_car(LIST)
# lt_cdr(LIST)
# ------------
# Manipulate m4 lists.
# These macros are necessary as long as will still need to support
# Autoconf-2.59 which quotes differently.
m4_define([lt_car], [[$1]])
m4_define([lt_cdr],
[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
[$#], 1, [],
[m4_dquote(m4_shift($@))])])
m4_define([lt_unquote], $1)
# lt_append(MACRO-NAME, STRING, [SEPARATOR])
# ------------------------------------------
# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
# Note that neither SEPARATOR nor STRING are expanded; they are appended
# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
# No SEPARATOR is output if MACRO-NAME was previously undefined (different
# than defined and empty).
#
# This macro is needed until we can rely on Autoconf 2.62, since earlier
# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
m4_define([lt_append],
[m4_define([$1],
m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
# ----------------------------------------------------------
# Produce a SEP delimited list of all paired combinations of elements of
# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
# has the form PREFIXmINFIXSUFFIXn.
# Needed until we can rely on m4_combine added in Autoconf 2.62.
m4_define([lt_combine],
[m4_if(m4_eval([$# > 3]), [1],
[m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
[[m4_foreach([_Lt_prefix], [$2],
[m4_foreach([_Lt_suffix],
]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
# -----------------------------------------------------------------------
# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
m4_define([lt_if_append_uniq],
[m4_ifdef([$1],
[m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
[lt_append([$1], [$2], [$3])$4],
[$5])],
[lt_append([$1], [$2], [$3])$4])])
# lt_dict_add(DICT, KEY, VALUE)
# -----------------------------
m4_define([lt_dict_add],
[m4_define([$1($2)], [$3])])
# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
# --------------------------------------------
m4_define([lt_dict_add_subkey],
[m4_define([$1($2:$3)], [$4])])
# lt_dict_fetch(DICT, KEY, [SUBKEY])
# ----------------------------------
m4_define([lt_dict_fetch],
[m4_ifval([$3],
m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
# -----------------------------------------------------------------
m4_define([lt_if_dict_fetch],
[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
[$5],
[$6])])
# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
# --------------------------------------------------------------
m4_define([lt_dict_filter],
[m4_if([$5], [], [],
[lt_join(m4_quote(m4_default([$4], [[, ]])),
lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
[lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
])
# ltversion.m4 -- version numbers -*- Autoconf -*-
#
# Copyright (C) 2004 Free Software Foundation, Inc.
# Written by Scott James Remnant, 2004
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
# Generated from ltversion.in.
# serial 3012 ltversion.m4
# This file is part of GNU Libtool
m4_define([LT_PACKAGE_VERSION], [2.2.6])
m4_define([LT_PACKAGE_REVISION], [1.3012])
AC_DEFUN([LTVERSION_VERSION],
[macro_version='2.2.6'
macro_revision='1.3012'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
# serial 4 lt~obsolete.m4
# These exist entirely to fool aclocal when bootstrapping libtool.
#
# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
# which have later been changed to m4_define as they aren't part of the
# exported API, or moved to Autoconf or Automake where they belong.
#
# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN
# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
# using a macro with the same name in our local m4/libtool.m4 it'll
# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
# and doesn't know about Autoconf macros at all.)
#
# So we provide this file, which has a silly filename so it's always
# included after everything else. This provides aclocal with the
# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
# because those macros already exist, or will be overwritten later.
# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
#
# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
# Yes, that means every name once taken will need to remain here until
# we give up compatibility with versions before 1.7, at which point
# we need to keep only those names which we still refer to.
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])])
m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])])
m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])])
m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])])
m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])])
m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])])
m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])])
m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])])
m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])])
m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])])
m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])])
m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])])
m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])])
m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])])
m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])])
m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])])
m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])])
m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])])
m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])])
m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
......@@ -12,7 +12,7 @@
GETTEXT_MACRO_VERSION = 0.17
PACKAGE = popt
VERSION = 1.14
VERSION = 1.15
PACKAGE_BUGREPORT = popt-devel@rpm5.org
SHELL = /bin/sh
......@@ -22,42 +22,42 @@ srcdir = .
top_srcdir = ..
prefix = /usr
prefix = /usr/local
exec_prefix = ${prefix}
datarootdir = ${prefix}/share
datadir = ${datarootdir}
localedir = ${datarootdir}/locale
gettextsrcdir = $(datadir)/gettext/po
INSTALL = /usr/bin/install -c
INSTALL = /usr/opkg/bin/ginstall -c
INSTALL_DATA = ${INSTALL} -m 644
# We use $(mkdir_p).
# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
# $(SHELL) /X/src/popt/install-sh does not start with $(SHELL), so we add it.
# In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined
# $(SHELL) /d2/u/rse/prj/rpm/src.popt/install-sh does not start with $(SHELL), so we add it.
# In automake >= 1.10, /usr/opkg/bin/gmkdir -p is derived from ${MKDIR_P}, which is defined
# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
# versions, $(mkinstalldirs) and $(install_sh) are unused.
mkinstalldirs = $(SHELL) $(SHELL) /X/src/popt/install-sh -d
install_sh = $(SHELL) $(SHELL) /X/src/popt/install-sh
MKDIR_P = /bin/mkdir -p
mkdir_p = /bin/mkdir -p
GMSGFMT_ = /usr/bin/msgfmt
GMSGFMT_no = /usr/bin/msgfmt
GMSGFMT_yes = /usr/bin/msgfmt
mkinstalldirs = $(SHELL) $(SHELL) /d2/u/rse/prj/rpm/src.popt/install-sh -d
install_sh = $(SHELL) $(SHELL) /d2/u/rse/prj/rpm/src.popt/install-sh
MKDIR_P = /usr/opkg/bin/gmkdir -p
mkdir_p = /usr/opkg/bin/gmkdir -p
GMSGFMT_ = /usr/opkg/bin/msgfmt
GMSGFMT_no = /usr/opkg/bin/msgfmt
GMSGFMT_yes = /usr/opkg/bin/msgfmt
GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
MSGFMT_ = /usr/bin/msgfmt
MSGFMT_no = /usr/bin/msgfmt
MSGFMT_yes = /usr/bin/msgfmt
MSGFMT_ = /usr/opkg/bin/msgfmt
MSGFMT_no = /usr/opkg/bin/msgfmt
MSGFMT_yes = /usr/opkg/bin/msgfmt
MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
XGETTEXT_ = /usr/bin/xgettext
XGETTEXT_no = /usr/bin/xgettext
XGETTEXT_yes = /usr/bin/xgettext
XGETTEXT_ = /usr/opkg/bin/xgettext
XGETTEXT_no = /usr/opkg/bin/xgettext
XGETTEXT_yes = /usr/opkg/bin/xgettext
XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
MSGMERGE = msgmerge
MSGMERGE_UPDATE = /usr/bin/msgmerge --update
MSGMERGE_UPDATE = /usr/opkg/bin/msgmerge --update
MSGINIT = msginit
MSGCONV = msgconv
MSGFILTER = msgfilter
......@@ -162,7 +162,7 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
--files-from=$(srcdir)/POTFILES.in \