[packages/ncpfs] - patches cleanup, fixed po install
qboosh
qboosh at pld-linux.org
Fri Jul 11 19:43:37 CEST 2014
commit 8f1471e2f0e9e032e3cc7fdfdf5d3075bf13a7f8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Jul 11 19:48:24 2014 +0200
- patches cleanup, fixed po install
ncpfs-gcc4.patch | 61 ----
ncpfs-gettext.patch | 758 ----------------------------------------------
ncpfs-hg-commit-409.patch | 2 +-
ncpfs-syslog.patch | 11 -
ncpfs.spec | 86 ++++--
5 files changed, 57 insertions(+), 861 deletions(-)
---
diff --git a/ncpfs.spec b/ncpfs.spec
index 66f78a7..8f16047 100644
--- a/ncpfs.spec
+++ b/ncpfs.spec
@@ -2,7 +2,6 @@
# - update and finish pl.po (lang patch)
# - fix/write from scrach -devel Summary and %%description
# - review php-auth_nds Summary and %%description
-# - lang files seem not installed
#
# Conditional build:
%bcond_without php # don't build PHP module
@@ -24,7 +23,7 @@ Name: ncpfs
Version: 2.2.6
Release: %{rel}%{!?with_ipx:noipx}
Epoch: 1
-License: GPL
+License: GPL v2+
Group: Networking/Utilities
Source0: ftp://platan.vc.cvut.cz/pub/linux/ncpfs/%{name}-%{version}.tar.gz
# Source0-md5: a9ab9f135d504440202069393dd9eb36
@@ -32,11 +31,8 @@ Patch0: %{name}-lang.patch
Patch1: %{name}-nwsfind.patch
Patch2: %{name}-ac.patch
Patch3: %{name}-sbindir.patch
-Patch4: %{name}-gcc4.patch
-Patch5: %{name}-syslog.patch
Patch6: %{name}-offsetof.patch
Patch7: %{name}-ac-php.patch
-Patch8: %{name}-gettext.patch
Patch9: %{name}-php.patch
# Fedora patches
@@ -106,7 +102,7 @@ Patch1003: %{name}.pam_ncp_auth.syslog.patch
Patch1005: %{name}.offsetof.patch
Patch1006: %{name}-shlibext.patch
%{?with_php:BuildRequires: %{php_name}-devel}
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: gettext-devel
BuildRequires: libtool
@@ -143,12 +139,16 @@ au protocole NCP. Ce protocole est utilisé par les clients Novell
NetWare pour communiquer avec les serveurs NetWare.
%description -l ja.UTF-8
-ncpfs は Novell NetWare(TM) NCP として理解されるファイルシステムです。 機能的には、NCP は、NFS が
-TCP/IP の世界で用いられるように、NetWare で 用いられます。Linux システムが NetWare
-ファイルシステムをマウントするには、 特別なマウントプログラムが必要です。ncpfs パッケージはそのようなマウント
-プログラムと、ncpfs ファイルシステムの設定と利用のためのツールを含みます。
-
-Novell NetWare のファイルかサービスを使うために ncpfs ファイルシステムを 用いる必要があるなら、ncpfs
+ncpfs は Novell NetWare(TM) NCP として理解されるファイルシステムです。
+機能的には、NCP は、NFS が TCP/IP の世界で用いられるように、NetWare で
+用いられます。Linux システムが NetWare
+ファイルシステムをマウントするには、
+特別なマウントプログラムが必要です。ncpfs
+パッケージはそのようなマウント プログラムと、ncpfs
+ファイルシステムの設定と利用のためのツールを含みます。
+
+Novell NetWare のファイルかサービスを使うために ncpfs
+ファイルシステムを 用いる必要があるなら、ncpfs
パッケージをインストールしましょう。
%description -l pl.UTF-8
@@ -318,11 +318,8 @@ використанням бібліотеки ncpfs.
%patch0 -p1
%patch1 -p1
%patch3 -p1
-#%patch4 -p1
-#%patch5 -p1
%patch6 -p1
%patch7 -p1
-#%patch8 -p1
%patch9 -p1
%patch403 -p1
@@ -331,7 +328,7 @@ використанням бібліотеки ncpfs.
%patch406 -p1
%patch407 -p1
%patch408 -p1
-#%patch409 -p1
+%patch409 -p1
%patch410 -p1
%patch411 -p1
%patch412 -p1
@@ -393,7 +390,8 @@ використанням бібліотеки ncpfs.
%patch23 -p1
%patch1006 -p0
-sed '/AM_ICONV/a\ :' -i configure.ac
+sed -e '/AM_GNU_GETTEXT/iAM_PROG_MKDIR_P\n' -i configure.ac
+sed -e '/AM_ICONV/a\ :' -i configure.ac
%build
%if %{with php}
@@ -458,13 +456,13 @@ EOF
install -p contrib/php/modules/php_auth_nds.so $RPM_BUILD_ROOT%{php_extensiondir}
%endif
-rm -f $RPM_BUILD_ROOT%{_mandir}/man8/mount.ncp.8*
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/mount.ncp.8*
echo '.so ncpmount.8' > $RPM_BUILD_ROOT%{_mandir}/man8/mount.ncp.8
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pqrm.1*
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/pqrm.1*
echo '.so nwpqjob.1' > $RPM_BUILD_ROOT%{_mandir}/man1/pqrm.1
-#find_lang %{name}
+%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -472,16 +470,44 @@ rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%files
+%files -f %{name}.lang
%defattr(644,root,root,755)
%doc BUGS Changes FAQ README* ncpfs-*
-%attr(755,root,root) %{_bindir}/[!i]*
-%attr(755,root,root) %{_sbindir}/[!i]*
-%attr(755,root,root) %{_libdir}/libncp.so.*
-
-%{_mandir}/man8/[!i]*
-%{_mandir}/man1/*
-%{_mandir}/man5/*
+%attr(755,root,root) %{_bindir}/ncopy
+%attr(755,root,root) %{_bindir}/ncplogin
+%attr(755,root,root) %{_bindir}/ncplogout
+%attr(755,root,root) %{_bindir}/ncpmap
+%attr(755,root,root) %{_bindir}/ncpmount
+%attr(755,root,root) %{_bindir}/ncpumount
+%attr(755,root,root) %{_bindir}/nprint
+%attr(755,root,root) %{_bindir}/nsend
+%attr(755,root,root) %{_bindir}/nw*
+%attr(755,root,root) %{_bindir}/pqlist
+%attr(755,root,root) %{_bindir}/pqrm
+%attr(755,root,root) %{_bindir}/pqstat
+%attr(755,root,root) %{_bindir}/pserver
+%attr(755,root,root) %{_bindir}/slist
+%attr(755,root,root) %{_sbindir}/mount.ncp
+%attr(755,root,root) %{_sbindir}/mount.ncpfs
+%attr(755,root,root) %{_sbindir}/nwmsg
+%attr(755,root,root) %{_libdir}/libncp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libncp.so.2.3
+%{_mandir}/man1/ncopy.1*
+%{_mandir}/man1/nprint.1*
+%{_mandir}/man1/nsend.1*
+%{_mandir}/man1/nw*.1*
+%{_mandir}/man1/pqlist.1*
+%{_mandir}/man1/pqrm.1*
+%{_mandir}/man1/pqstat.1*
+%{_mandir}/man1/pserver.1*
+%{_mandir}/man1/slist.1*
+%{_mandir}/man5/nwclient.5*
+%{_mandir}/man8/mount.ncp.8*
+%{_mandir}/man8/ncplogin.8*
+%{_mandir}/man8/ncpmap.8*
+%{_mandir}/man8/ncpmount.8*
+%{_mandir}/man8/ncpumount.8*
+%{_mandir}/man8/nw*.8*
%files devel
%defattr(644,root,root,755)
@@ -503,6 +529,6 @@ rm -rf $RPM_BUILD_ROOT
%if %{with ipx}
%files -n ipxutils
%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/ipx*
-%{_mandir}/man8/ipx*
+%attr(755,root,root) %{_sbindir}/ipx_*
+%{_mandir}/man8/ipx_*.8*
%endif
diff --git a/ncpfs-gcc4.patch b/ncpfs-gcc4.patch
deleted file mode 100644
index 6772803..0000000
--- a/ncpfs-gcc4.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Nur ncpfs-2.2.6.orig/lib/ncplib.c ncpfs-2.2.6.chng/lib/ncplib.c
---- ncpfs-2.2.6.orig/lib/ncplib.c 2005-01-27 18:35:59.000000000 +0100
-+++ ncpfs-2.2.6.chng/lib/ncplib.c 2007-03-29 10:02:52.000000000 +0200
-@@ -2408,6 +2408,8 @@
- uid, 0, err);
- }
-
-+static int get_argument(int arg_no, const char **target);
-+
- struct ncp_conn *
- ncp_initialize_2(int *argc, char **argv, int login_necessary,
- int login_type, long *err, int required)
-@@ -2421,7 +2423,7 @@
- int i = 1;
- NWCCODE nwerr;
-
-- static int get_argument(int arg_no, const char **target) {
-+ int get_argument(int arg_no, const char **target) {
- int count = 1;
-
- if (target != NULL) {
-diff -Nur ncpfs-2.2.6.orig/util/nwpjmv.c ncpfs-2.2.6.chng/util/nwpjmv.c
---- ncpfs-2.2.6.orig/util/nwpjmv.c 2005-01-27 18:35:59.000000000 +0100
-+++ ncpfs-2.2.6.chng/util/nwpjmv.c 2007-03-29 10:08:50.000000000 +0200
-@@ -123,6 +123,7 @@
- return 0;
- }
-
-+static void add_string(const char *str);
-
- static void
- build_command(struct nw_queue *q, struct queue_job *j,
-@@ -131,7 +132,7 @@
- char *s = q->command;
- char *target_end = target + target_size;
-
-- static void add_string(const char *str)
-+ void add_string(const char *str)
- {
- int len = strlen(str);
- if (target + len + 1 > target_end)
-diff -Nur ncpfs-2.2.6.orig/util/pserver.c ncpfs-2.2.6.chng/util/pserver.c
---- ncpfs-2.2.6.orig/util/pserver.c 2005-01-27 18:35:59.000000000 +0100
-+++ ncpfs-2.2.6.chng/util/pserver.c 2007-03-29 10:06:24.000000000 +0200
-@@ -145,6 +145,7 @@
- return 0;
- }
-
-+static void add_string(const char *str);
-
- static void
- build_command(struct nw_queue *q, struct queue_job *j,
-@@ -153,7 +154,7 @@
- char *s = q->command;
- char *target_end = target + target_size;
-
-- static void add_string(const char *str)
-+ void add_string(const char *str)
- {
- int len = strlen(str);
- if (target + len + 1 > target_end)
diff --git a/ncpfs-gettext.patch b/ncpfs-gettext.patch
deleted file mode 100644
index f726fc0..0000000
--- a/ncpfs-gettext.patch
+++ /dev/null
@@ -1,758 +0,0 @@
-diff -Nur ncpfs-2.2.6.orig/acinclude.m4 ncpfs-2.2.6.chng/acinclude.m4
---- ncpfs-2.2.6.orig/acinclude.m4 2005-01-27 18:35:59.000000000 +0100
-+++ ncpfs-2.2.6.chng/acinclude.m4 2007-06-13 03:14:28.000000000 +0200
-@@ -531,7 +531,7 @@
- AM_ICONV
- AM_LANGINFO_CODESET
- if test $ac_cv_header_locale_h = yes; then
-- AM_LC_MESSAGES
-+ gt_LC_MESSAGES
- fi
-
- dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-diff -Nur ncpfs-2.2.6.orig/aclocal.m4 ncpfs-2.2.6.chng/aclocal.m4
---- ncpfs-2.2.6.orig/aclocal.m4 2005-01-27 18:35:59.000000000 +0100
-+++ ncpfs-2.2.6.chng/aclocal.m4 2007-06-13 03:14:39.000000000 +0200
-@@ -543,7 +543,7 @@
- AM_ICONV
- AM_LANGINFO_CODESET
- if test $ac_cv_header_locale_h = yes; then
-- AM_LC_MESSAGES
-+ gt_LC_MESSAGES
- fi
-
- dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-@@ -1972,7 +1972,7 @@
-
- # Check whether LC_MESSAGES is available in <locale.h>.
-
--AC_DEFUN([AM_LC_MESSAGES],
-+AC_DEFUN([gt_LC_MESSAGES],
- [
- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-diff -Nur ncpfs-2.2.6.orig/contrib/pam/Makefile.in ncpfs-2.2.6.chng/contrib/pam/Makefile.in
---- ncpfs-2.2.6.orig/contrib/pam/Makefile.in 2005-01-27 18:35:59.000000000 +0100
-+++ ncpfs-2.2.6.chng/contrib/pam/Makefile.in 2007-06-13 11:21:36.000000000 +0200
-@@ -7,7 +7,7 @@
-
- include $(top_builddir)/Make.rules
-
--LIBS = @INTLLIBS@ @LIBS@
-+LIBS = @LIBINTL@ @LIBS@
- LIB_PAM_SECURITY = @LIB_PAM_SECURITY@
-
- NCP_LIB = libncp.so
-diff -Nur ncpfs-2.2.6.orig/contrib/tcl-utils/Makefile.in ncpfs-2.2.6.chng/contrib/tcl-utils/Makefile.in
---- ncpfs-2.2.6.orig/contrib/tcl-utils/Makefile.in 2005-01-27 18:35:59.000000000 +0100
-+++ ncpfs-2.2.6.chng/contrib/tcl-utils/Makefile.in 2007-06-13 11:21:17.000000000 +0200
-@@ -13,7 +13,7 @@
- NDS_SUPPORT = @NDS_SUPPORT@
- MOUNT2 = @MOUNT2@
-
--LIBS = @INTLLIBS@ @LIBS@
-+LIBS = @LIBINTL@ @LIBS@
-
- O_OTHER =
- O_USERUTILS = ncpreadprop.o ncpwhoami.o ncplist.o ncplisttrees.o ncpvrest.o \
-diff -Nur ncpfs-2.2.6.orig/contrib/testing/Makefile.in ncpfs-2.2.6.chng/contrib/testing/Makefile.in
---- ncpfs-2.2.6.orig/contrib/testing/Makefile.in 2005-01-27 18:35:59.000000000 +0100
-+++ ncpfs-2.2.6.chng/contrib/testing/Makefile.in 2007-06-13 11:20:47.000000000 +0200
-@@ -43,7 +43,7 @@
- $(CC) $(CCFLAGS) $(CFLAGS) $(CFLAGS_$@) -o $@ -c $<
-
- $(UTILS1):: %: %.o $(O_TMP1)
-- $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(addsuffix .o,$@) $(OBJS_$@) -L$(top_builddir)/lib -lncp $(LDFLAGS_$@) @INTLLIBS@ @LIBS@
-+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(addsuffix .o,$@) $(OBJS_$@) -L$(top_builddir)/lib -lncp $(LDFLAGS_$@) @LIBINTL@ @LIBS@
-
- clean:
- -rm -f iconvx wcsmbs-tst1 time $(UTILS1) $(O_UTILS1) $(O_TMP1)
-diff -Nur ncpfs-2.2.6.orig/contrib/testing/pp/Makefile.in ncpfs-2.2.6.chng/contrib/testing/pp/Makefile.in
---- ncpfs-2.2.6.orig/contrib/testing/pp/Makefile.in 2005-01-27 18:35:59.000000000 +0100
-+++ ncpfs-2.2.6.chng/contrib/testing/pp/Makefile.in 2007-06-13 11:20:37.000000000 +0200
-@@ -6,7 +6,7 @@
-
- vpath %.c ${this_srcdir}
-
--LIBS = @INTLLIBS@ @LIBS@
-+LIBS = @LIBINTL@ @LIBS@
-
- O_UTILS1 = getsynt.o nwwhoami.o treelist.o \
- open_conn_by_name.o scantree.o \
-diff -Nur ncpfs-2.2.6.orig/Makefile.in ncpfs-2.2.6.chng/Makefile.in
---- ncpfs-2.2.6.orig/Makefile.in 2005-01-27 18:35:59.000000000 +0100
-+++ ncpfs-2.2.6.chng/Makefile.in 2007-06-13 11:22:36.000000000 +0200
-@@ -11,11 +11,11 @@
- .PHONY : tags TAGS clean_me dist tgz
-
- BASE_SUBDIRS := lib sutil util man @ADDON_SUBDIRS@
--EXECSUBDIRS = intl @POSUB@ $(BASE_SUBDIRS)
-+EXECSUBDIRS = intl po $(BASE_SUBDIRS)
- SUBDIRS := $(EXECSUBDIRS)
- INSTALL_SUBDIRS := $(SUBDIRS)
- INSTALL_DEV_SUBDIRS := lib sutil util man @ADDON_DEV_SUBDIRS@
--CLEAN_SUBDIRS := lib sutil util man intl @POSUB@ ipxdump ipx-1.0 ipx-1.0/Samples contrib/testing \
-+CLEAN_SUBDIRS := lib sutil util man intl po ipxdump ipx-1.0 ipx-1.0/Samples contrib/testing \
- contrib/testing/pp contrib/tests contrib/libtrace contrib/nss64 \
- contrib/tcl-utils contrib/php contrib/pam
-
-diff -Nur ncpfs-2.2.6.orig/sutil/Makefile.in ncpfs-2.2.6.chng/sutil/Makefile.in
---- ncpfs-2.2.6.orig/sutil/Makefile.in 2007-06-13 11:19:32.000000000 +0200
-+++ ncpfs-2.2.6.chng/sutil/Makefile.in 2005-01-27 18:35:59.000000000 +0100
-@@ -13,7 +13,7 @@
- USE_KERNEL = @USE_KERNEL@
- NDS_SUPPORT = @NDS_SUPPORT@
-
--LIBS = @INTLLIBS@ @LIBS@
-+LIBS = @LIBINTL@ @LIBS@
-
- # environ in ncpmount
- CCFLAGS += -D_GNU_SOURCE
-diff -Nur ncpfs-2.2.6.orig/util/Makefile.in ncpfs-2.2.6.chng/util/Makefile.in
---- ncpfs-2.2.6.orig/util/Makefile.in 2007-06-13 11:19:16.000000000 +0200
-+++ ncpfs-2.2.6.chng/util/Makefile.in 2005-01-27 18:35:59.000000000 +0100
-@@ -14,7 +14,7 @@
- NDS_SUPPORT = @NDS_SUPPORT@
- MOUNT2 = @MOUNT2@
-
--LIBS = @INTLLIBS@ @LIBS@
-+LIBS = @LIBINTL@ @LIBS@
-
- O_OTHER = dsqueue.o
- O_USERUTILS = slist.o pqlist.o nwfsinfo.o pserver.o nprint.o nsend.o \
-diff -Nur ncpfs-2.2.6.orig/contrib/tests/Makefile.in ncpfs-2.2.6.chng/contrib/tests/Makefile.in
---- ncpfs-2.2.6.orig/contrib/tests/Makefile.in 2005-01-27 18:35:59.000000000 +0100
-+++ ncpfs-2.2.6.chng/contrib/tests/Makefile.in 2007-06-13 11:29:55.000000000 +0200
-@@ -17,7 +17,7 @@
- $(CC) $(CCFLAGS) $(CFLAGS) $(CFLAGS_$@) -I$(top_builddir)/include -I$(top_builddir)/intl -o $@ -c $<
-
- $(UTILS1):: %: %.o $(O_TMP1)
-- $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(addsuffix .o,$@) $(OBJS_$@) -L$(top_builddir)/lib -lncp $(LDFLAGS_$@) @INTLLIBS@ @LIBS@
-+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(addsuffix .o,$@) $(OBJS_$@) -L$(top_builddir)/lib -lncp $(LDFLAGS_$@) @LIBINTL@ @LIBS@
-
- clean:
- -rm -f $(UTILS1) $(O_UTILS1) $(O_TMP1)
-diff -Nur ncpfs-2.2.6.orig/ipx-1.0/Makefile.in ncpfs-2.2.6.chng/ipx-1.0/Makefile.in
---- ncpfs-2.2.6.orig/ipx-1.0/Makefile.in 2007-06-13 11:28:08.000000000 +0200
-+++ ncpfs-2.2.6.chng/ipx-1.0/Makefile.in 2007-06-13 11:29:02.000000000 +0200
-@@ -8,7 +8,7 @@
- vpath %.c ${this_srcdir}
- vpath %.8 ${this_srcdir}
-
--LIBS = @INTLLIBS@ @LIBS@
-+LIBS = @LIBINTL@ @LIBS@
-
- O_UTILS = ipx_configure.o ipx_cmd.o
- O_UTIIPX = ipx_interface.o ipx_internal_net.o ipx_route.o
-diff -Nur ncpfs-2.2.6.orig/acinclude.m4 ncpfs-2.2.6.chng/acinclude.m4
---- ncpfs-2.2.6.orig/acinclude.m4 2007-06-13 11:28:08.000000000 +0200
-+++ ncpfs-2.2.6.chng/acinclude.m4 2007-06-13 11:37:43.000000000 +0200
-@@ -1,10 +1,8 @@
--# gettext.m4 serial 17 (gettext-0.11.5)
--dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
--dnl This file is free software, distributed under the terms of the GNU
--dnl General Public License. As a special exception to the GNU General
--dnl Public License, this file may be distributed as part of a program
--dnl that contains a configuration script generated by Autoconf, under
--dnl the same distribution terms as the rest of that program.
-+# gettext.m4 serial 59 (gettext-0.16.1)
-+dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
- dnl
- dnl This file can can be used in projects which are not available under
- dnl the GNU General Public License or the GNU Library General Public
-@@ -17,7 +15,7 @@
-
- dnl Authors:
- dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
--dnl Bruno Haible <haible at clisp.cons.org>, 2000-2002.
-+dnl Bruno Haible <haible at clisp.cons.org>, 2000-2006.
-
- dnl Macro to add for using GNU gettext.
-
-@@ -65,8 +63,13 @@
- ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
- [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
- ])])])])
-- define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
-- define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
-+ define([gt_included_intl],
-+ ifelse([$1], [external],
-+ ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
-+ [yes]))
-+ define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
-+ gt_NEEDS_INIT
-+ AM_GNU_GETTEXT_NEED([$2])
-
- AC_REQUIRE([AM_PO_SUBDIRS])dnl
- ifelse(gt_included_intl, yes, [
-@@ -80,7 +83,7 @@
- dnl Sometimes libintl requires libiconv, so first search for libiconv.
- dnl Ideally we would do this search only after the
- dnl if test "$USE_NLS" = "yes"; then
-- dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-+ dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
- dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
- dnl the configure script would need to contain the same shell code
- dnl again, outside any 'if'. There are two solutions:
-@@ -92,13 +95,11 @@
- AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
- ])
-
-- AC_MSG_CHECKING([whether NLS is requested])
-- dnl Default is enabled NLS
-- AC_ARG_ENABLE(nls,
-- [ --disable-nls do not use Native Language Support],
-- USE_NLS=$enableval, USE_NLS=yes)
-- AC_MSG_RESULT($USE_NLS)
-- AC_SUBST(USE_NLS)
-+ dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
-+ gt_INTL_MACOSX
-+
-+ dnl Set USE_NLS.
-+ AC_REQUIRE([AM_NLS])
-
- ifelse(gt_included_intl, yes, [
- BUILD_INCLUDED_LIBINTL=no
-@@ -108,6 +109,15 @@
- LTLIBINTL=
- POSUB=
-
-+ dnl Add a version number to the cache macros.
-+ case " $gt_needs " in
-+ *" need-formatstring-macros "*) gt_api_version=3 ;;
-+ *" need-ngettext "*) gt_api_version=2 ;;
-+ *) gt_api_version=1 ;;
-+ esac
-+ gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
-+ gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
-+
- dnl If we use NLS figure out what method
- if test "$USE_NLS" = "yes"; then
- gt_use_preinstalled_gnugettext=no
-@@ -126,28 +136,35 @@
- dnl to use. If GNU gettext is available we use this. Else we have
- dnl to fall back to GNU NLS library.
-
-- dnl Add a version number to the cache macros.
-- define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
-- define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
-- define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
--
-- AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-- [AC_TRY_LINK([#include <libintl.h>
--]ifelse([$2], [need-formatstring-macros],
--[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-+ if test $gt_api_version -ge 3; then
-+ gt_revision_test_code='
-+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
- #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
- #endif
- changequote(,)dnl
- typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
- changequote([,])dnl
--], [])[extern int _nl_msg_cat_cntr;
-+'
-+ else
-+ gt_revision_test_code=
-+ fi
-+ if test $gt_api_version -ge 2; then
-+ gt_expression_test_code=' + * ngettext ("", "", 0)'
-+ else
-+ gt_expression_test_code=
-+ fi
-+
-+ AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
-+ [AC_TRY_LINK([#include <libintl.h>
-+$gt_revision_test_code
-+extern int _nl_msg_cat_cntr;
- extern int *_nl_domain_bindings;],
- [bindtextdomain ("", "");
--return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
-- gt_cv_func_gnugettext_libc=yes,
-- gt_cv_func_gnugettext_libc=no)])
-+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
-+ [eval "$gt_func_gnugettext_libc=yes"],
-+ [eval "$gt_func_gnugettext_libc=no"])])
-
-- if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
- dnl Sometimes libintl requires libiconv, so first search for libiconv.
- ifelse(gt_included_intl, yes, , [
- AM_ICONV_LINK
-@@ -158,52 +175,40 @@
- dnl even if libiconv doesn't exist.
- AC_LIB_LINKFLAGS_BODY([intl])
- AC_CACHE_CHECK([for GNU gettext in libintl],
-- gt_cv_func_gnugettext_libintl,
-+ [$gt_func_gnugettext_libintl],
- [gt_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $INCINTL"
- gt_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBINTL"
- dnl Now see whether libintl exists and does not depend on libiconv.
- AC_TRY_LINK([#include <libintl.h>
--]ifelse([$2], [need-formatstring-macros],
--[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
--#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
--#endif
--changequote(,)dnl
--typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
--changequote([,])dnl
--], [])[extern int _nl_msg_cat_cntr;
-+$gt_revision_test_code
-+extern int _nl_msg_cat_cntr;
- extern
- #ifdef __cplusplus
- "C"
- #endif
--const char *_nl_expand_alias ();],
-+const char *_nl_expand_alias (const char *);],
- [bindtextdomain ("", "");
--return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-- gt_cv_func_gnugettext_libintl=yes,
-- gt_cv_func_gnugettext_libintl=no)
-+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
-+ [eval "$gt_func_gnugettext_libintl=yes"],
-+ [eval "$gt_func_gnugettext_libintl=no"])
- dnl Now see whether libintl exists and depends on libiconv.
-- if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
-+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
- LIBS="$LIBS $LIBICONV"
- AC_TRY_LINK([#include <libintl.h>
--]ifelse([$2], [need-formatstring-macros],
--[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
--#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
--#endif
--changequote(,)dnl
--typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
--changequote([,])dnl
--], [])[extern int _nl_msg_cat_cntr;
-+$gt_revision_test_code
-+extern int _nl_msg_cat_cntr;
- extern
- #ifdef __cplusplus
- "C"
- #endif
--const char *_nl_expand_alias ();],
-+const char *_nl_expand_alias (const char *);],
- [bindtextdomain ("", "");
--return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
- [LIBINTL="$LIBINTL $LIBICONV"
- LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-- gt_cv_func_gnugettext_libintl=yes
-+ eval "$gt_func_gnugettext_libintl=yes"
- ])
- fi
- CPPFLAGS="$gt_save_CPPFLAGS"
-@@ -214,9 +219,10 @@
- dnl use it. But if this macro is used in GNU gettext, and GNU
- dnl gettext is already preinstalled in libintl, we update this
- dnl libintl. (Cf. the install rule in intl/Makefile.in.)
-- if test "$gt_cv_func_gnugettext_libc" = "yes" \
-- || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-- && test "$PACKAGE" != gettext; }; then
-+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
-+ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
-+ && test "$PACKAGE" != gettext-runtime \
-+ && test "$PACKAGE" != gettext-tools; }; then
- gt_use_preinstalled_gnugettext=yes
- else
- dnl Reset the values set by searching for libintl.
-@@ -235,14 +241,14 @@
-
- if test "$nls_cv_use_gnu_gettext" = "yes"; then
- dnl Mark actions used to generate GNU NLS library.
-- INTLOBJS="\$(GETTOBJS)"
- BUILD_INCLUDED_LIBINTL=yes
- USE_INCLUDED_LIBINTL=yes
-- LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
-- LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
-+ LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
-+ LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
- LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
- fi
-
-+ CATOBJEXT=
- if test "$gt_use_preinstalled_gnugettext" = "yes" \
- || test "$nls_cv_use_gnu_gettext" = "yes"; then
- dnl Mark actions to use GNU gettext tools.
-@@ -250,6 +256,15 @@
- fi
- ])
-
-+ if test -n "$INTL_MACOSX_LIBS"; then
-+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
-+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
-+ dnl Some extra flags are needed during linking.
-+ LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
-+ LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
-+ fi
-+ fi
-+
- if test "$gt_use_preinstalled_gnugettext" = "yes" \
- || test "$nls_cv_use_gnu_gettext" = "yes"; then
- AC_DEFINE(ENABLE_NLS, 1,
-@@ -260,10 +275,26 @@
- fi
- fi
-
-+ AC_MSG_CHECKING([whether to use NLS])
-+ AC_MSG_RESULT([$USE_NLS])
-+ if test "$USE_NLS" = "yes"; then
-+ AC_MSG_CHECKING([where the gettext function comes from])
-+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-+ gt_source="external libintl"
-+ else
-+ gt_source="libc"
-+ fi
-+ else
-+ gt_source="included intl directory"
-+ fi
-+ AC_MSG_RESULT([$gt_source])
-+ fi
-+
- if test "$USE_NLS" = "yes"; then
-
- if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-- if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
- AC_MSG_CHECKING([how to link with libintl])
- AC_MSG_RESULT([$LIBINTL])
- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-@@ -283,7 +314,7 @@
- ifelse(gt_included_intl, yes, [
- dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
- dnl to 'yes' because some of the testsuite requires it.
-- if test "$PACKAGE" = gettext; then
-+ if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
- BUILD_INCLUDED_LIBINTL=yes
- fi
-
-@@ -291,7 +322,6 @@
- AC_SUBST(BUILD_INCLUDED_LIBINTL)
- AC_SUBST(USE_INCLUDED_LIBINTL)
- AC_SUBST(CATOBJEXT)
-- AC_SUBST(INTLOBJS)
-
- dnl For backward compatibility. Some configure.ins may be using this.
- nls_cv_header_intl=
-@@ -309,6 +339,13 @@
- GENCAT=gencat
- AC_SUBST(GENCAT)
-
-+ dnl For backward compatibility. Some Makefiles may be using this.
-+ INTLOBJS=
-+ if test "$USE_INCLUDED_LIBINTL" = yes; then
-+ INTLOBJS="\$(GETTOBJS)"
-+ fi
-+ AC_SUBST(INTLOBJS)
-+
- dnl Enable libtool support if the surrounding package wishes it.
- INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
- AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
-@@ -325,261 +362,56 @@
- ])
-
-
--dnl Checks for all prerequisites of the po subdirectory,
--dnl except for USE_NLS.
--AC_DEFUN([AM_PO_SUBDIRS],
-+dnl Checks for special options needed on MacOS X.
-+dnl Defines INTL_MACOSX_LIBS.
-+AC_DEFUN([gt_INTL_MACOSX],
- [
-- AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-- AC_REQUIRE([AC_PROG_INSTALL])dnl
-- AC_REQUIRE([AM_MKINSTALLDIRS])dnl
--
-- dnl Perform the following tests also if --disable-nls has been given,
-- dnl because they are needed for "make dist" to work.
--
-- dnl Search for GNU msgfmt in the PATH.
-- dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-- dnl The second test excludes FreeBSD msgfmt.
-- AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-- [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-- (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-- :)
-- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
--
-- dnl Search for GNU xgettext 0.11 or newer in the PATH.
-- dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-- dnl The second test excludes FreeBSD xgettext.
-- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-- [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-- (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-- :)
-- dnl Remove leftover from FreeBSD xgettext call.
-- rm -f messages.po
--
-- dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-- AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-- [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
--
-- dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-- dnl Test whether we really found GNU msgfmt.
-- if test "$GMSGFMT" != ":"; then
-- dnl If it is no GNU msgfmt we define it as : so that the
-- dnl Makefiles still can work.
-- if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-- (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-- : ;
-- else
-- GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-- AC_MSG_RESULT(
-- [found $GMSGFMT program is not GNU msgfmt; ignore it])
-- GMSGFMT=":"
-- fi
-+ dnl Check for API introduced in MacOS X 10.2.
-+ AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
-+ gt_cv_func_CFPreferencesCopyAppValue,
-+ [gt_save_LIBS="$LIBS"
-+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-+ AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
-+ [CFPreferencesCopyAppValue(NULL, NULL)],
-+ [gt_cv_func_CFPreferencesCopyAppValue=yes],
-+ [gt_cv_func_CFPreferencesCopyAppValue=no])
-+ LIBS="$gt_save_LIBS"])
-+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-+ AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
-+ [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
- fi
--
-- dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-- dnl Test whether we really found GNU xgettext.
-- if test "$XGETTEXT" != ":"; then
-- dnl If it is no GNU xgettext we define it as : so that the
-- dnl Makefiles still can work.
-- if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-- (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-- : ;
-- else
-- AC_MSG_RESULT(
-- [found xgettext program is not GNU xgettext; ignore it])
-- XGETTEXT=":"
-- fi
-- dnl Remove leftover from FreeBSD xgettext call.
-- rm -f messages.po
-+ dnl Check for API introduced in MacOS X 10.3.
-+ AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
-+ [gt_save_LIBS="$LIBS"
-+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-+ AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
-+ [gt_cv_func_CFLocaleCopyCurrent=yes],
-+ [gt_cv_func_CFLocaleCopyCurrent=no])
-+ LIBS="$gt_save_LIBS"])
-+ if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-+ AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
-+ [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
- fi
--
-- AC_CONFIG_COMMANDS([[gettext]],[[
-- for ac_file in $CONFIG_FILES; do
-- # Support "outfile[:infile[:infile...]]"
-- case "$ac_file" in
-- *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-- esac
-- # PO directories have a Makefile.in generated from Makefile.in.in.
-- case "$ac_file" in */Makefile.in)
-- # Adjust a relative srcdir.
-- ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-- ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-- ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-- # In autoconf-2.13 it is called $ac_given_srcdir.
-- # In autoconf-2.50 it is called $srcdir.
-- test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-- case "$ac_given_srcdir" in
-- .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-- /*) top_srcdir="$ac_given_srcdir" ;;
-- *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
-- esac
-- if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-- rm -f "$ac_dir/POTFILES"
-- test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-- cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-- # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
-- # on $ac_dir but don't depend on user-specified configuration
-- # parameters.
-- if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-- # The LINGUAS file contains the set of available languages.
-- if test -n "$ALL_LINGUAS"; then
-- test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-- fi
-- ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-- # Hide the ALL_LINGUAS assigment from automake.
-- eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-- fi
-- case "$ac_given_srcdir" in
-- .) srcdirpre= ;;
-- *) srcdirpre='$(srcdir)/' ;;
-- esac
-- POFILES=
-- GMOFILES=
-- UPDATEPOFILES=
-- DUMMYPOFILES=
-- for lang in $ALL_LINGUAS; do
-- POFILES="$POFILES $srcdirpre$lang.po"
-- GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-- UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-- DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-- done
-- # CATALOGS depends on both $ac_dir and the user's LINGUAS
-- # environment variable.
-- INST_LINGUAS=
-- if test -n "$ALL_LINGUAS"; then
-- for presentlang in $ALL_LINGUAS; do
-- useit=no
-- if test "%UNSET%" != "$LINGUAS"; then
-- desiredlanguages="$LINGUAS"
-- else
-- desiredlanguages="$ALL_LINGUAS"
-- fi
-- for desiredlang in $desiredlanguages; do
-- # Use the presentlang catalog if desiredlang is
-- # a. equal to presentlang, or
-- # b. a variant of presentlang (because in this case,
-- # presentlang can be used as a fallback for messages
-- # which are not translated in the desiredlang catalog).
-- case "$desiredlang" in
-- "$presentlang"*) useit=yes;;
-- esac
-- done
-- if test $useit = yes; then
-- INST_LINGUAS="$INST_LINGUAS $presentlang"
-- fi
-- done
-- fi
-- CATALOGS=
-- if test -n "$INST_LINGUAS"; then
-- for lang in $INST_LINGUAS; do
-- CATALOGS="$CATALOGS $lang.gmo"
-- done
-- fi
-- test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-- sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-- for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-- if test -f "$f"; then
-- case "$f" in
-- *.orig | *.bak | *~) ;;
-- *) cat "$f" >> "$ac_dir/Makefile" ;;
-- esac
-- fi
-- done
-- fi
-- ;;
-- esac
-- done]],
-- [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-- # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
-- # from automake.
-- eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
-- # Capture the value of LINGUAS because we need it to compute CATALOGS.
-- LINGUAS="${LINGUAS-%UNSET%}"
-- ])
-+ INTL_MACOSX_LIBS=
-+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-+ INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-+ fi
-+ AC_SUBST([INTL_MACOSX_LIBS])
- ])
-
-
--dnl Checks for all prerequisites of the intl subdirectory,
--dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
--dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
--AC_DEFUN([AM_INTL_SUBDIR],
-+dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
-+m4_define([gt_NEEDS_INIT],
- [
-- AC_REQUIRE([AC_PROG_INSTALL])dnl
-- AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-- AC_REQUIRE([AC_PROG_CC])dnl
-- AC_REQUIRE([AC_CANONICAL_HOST])dnl
-- AC_REQUIRE([AC_PROG_RANLIB])dnl
-- AC_REQUIRE([AC_ISC_POSIX])dnl
-- AC_REQUIRE([AC_HEADER_STDC])dnl
-- AC_REQUIRE([AC_C_CONST])dnl
-- AC_REQUIRE([AC_C_INLINE])dnl
-- AC_REQUIRE([AC_TYPE_OFF_T])dnl
-- AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-- AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-- AC_REQUIRE([AC_FUNC_MMAP])dnl
-- AC_REQUIRE([jm_GLIBC21])dnl
-- AC_REQUIRE([gt_INTDIV0])dnl
-- AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
-- AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
-- AC_REQUIRE([gt_INTTYPES_PRI])dnl
--
-- AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
--stdlib.h string.h unistd.h sys/param.h])
-- AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
--geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
--strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
--
-- AM_ICONV
-- AM_LANGINFO_CODESET
-- if test $ac_cv_header_locale_h = yes; then
-- gt_LC_MESSAGES
-- fi
--
-- dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-- dnl because plural.y uses bison specific features. It requires at least
-- dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-- dnl compile.
-- dnl bison is only needed for the maintainer (who touches plural.y). But in
-- dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-- dnl the rule in general Makefile. Now, some people carelessly touch the
-- dnl files or have a broken "make" program, hence the plural.c rule will
-- dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-- dnl present or too old.
-- AC_CHECK_PROGS([INTLBISON], [bison])
-- if test -z "$INTLBISON"; then
-- ac_verc_fail=yes
-- else
-- dnl Found it, now check the version.
-- AC_MSG_CHECKING([version of bison])
--changequote(<<,>>)dnl
-- ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-- case $ac_prog_version in
-- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-- 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
--changequote([,])dnl
-- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-- esac
-- AC_MSG_RESULT([$ac_prog_version])
-- fi
-- if test $ac_verc_fail = yes; then
-- INTLBISON=:
-- fi
-+ m4_divert_text([DEFAULTS], [gt_needs=])
-+ m4_define([gt_NEEDS_INIT], [])
- ])
-
-
--AC_DEFUN([AM_MKINSTALLDIRS],
-+dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
-+AC_DEFUN([AM_GNU_GETTEXT_NEED],
- [
-- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-- dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
-- dnl Try to locate is.
-- MKINSTALLDIRS=
-- if test -n "$ac_aux_dir"; then
-- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-- fi
-- if test -z "$MKINSTALLDIRS"; then
-- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-- fi
-- AC_SUBST(MKINSTALLDIRS)
-+ m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
- ])
-
-
diff --git a/ncpfs-hg-commit-409.patch b/ncpfs-hg-commit-409.patch
index bf72d33..489fb86 100644
--- a/ncpfs-hg-commit-409.patch
+++ b/ncpfs-hg-commit-409.patch
@@ -20,7 +20,7 @@ diff -r 3ad605e1e151 -r 0cc3f7f08de0 mkinstalldirs
# Created: 1993-05-16
-# Public domain
-
--# $Id$
+-# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
+# Public domain.
+#
+# This file is maintained in Automake, please report
diff --git a/ncpfs-syslog.patch b/ncpfs-syslog.patch
deleted file mode 100644
index ab9c85b..0000000
--- a/ncpfs-syslog.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur ncpfs-2.2.6.orig/contrib/pam/pam_ncp_auth.c ncpfs-2.2.6.chng/contrib/pam/pam_ncp_auth.c
---- ncpfs-2.2.6.orig/contrib/pam/pam_ncp_auth.c 2005-01-27 18:35:59.000000000 +0100
-+++ ncpfs-2.2.6.chng/contrib/pam/pam_ncp_auth.c 2007-03-29 10:16:46.000000000 +0200
-@@ -266,6 +266,7 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <ctype.h>
-+#include <syslog.h>
-
- #include "support.h"
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ncpfs.git/commitdiff/8f1471e2f0e9e032e3cc7fdfdf5d3075bf13a7f8
More information about the pld-cvs-commit
mailing list