Date: Thu, 11 Sep 2014 07:48:18 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367909 - in head: chinese/FreeWnn-server japanese/FreeWnn-lib japanese/FreeWnn-lib/files japanese/FreeWnn-server japanese/FreeWnn-server/files korean/FreeWnn-server Message-ID: <201409110748.s8B7mIea072367@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Thu Sep 11 07:48:17 2014 New Revision: 367909 URL: http://svnweb.freebsd.org/changeset/ports/367909 QAT: https://qat.redports.org/buildarchive/r367909/ Log: - Fix a bug which prevented a bind(2) call from working. - Support "make stage" by a non-root user. - Set $*wnn_enable=NO by default. [*] - Fix pkg-plist. PR: 149250 [*] Added: head/japanese/FreeWnn-lib/files/patch-Contrib-dic-gerodic-Makefile.in (contents, props changed) head/japanese/FreeWnn-lib/files/patch-Wnn-jutil-Makefile.in (contents, props changed) head/japanese/FreeWnn-lib/files/patch-Wnn-pubdicplus-Makefile.in (contents, props changed) head/japanese/FreeWnn-lib/files/patch-Wnn-wnncons-dic-Makefile.in (contents, props changed) head/japanese/FreeWnn-lib/files/patch-Xwnmo-xjutil-Makefile.in (contents, props changed) head/japanese/FreeWnn-lib/files/patch-Xwnmo-xwnmo-Makefile.in (contents, props changed) head/japanese/FreeWnn-lib/files/patch-aclocal.m4 (contents, props changed) head/japanese/FreeWnn-lib/files/patch-cWnn-cd-Makefile.in (contents, props changed) head/japanese/FreeWnn-lib/files/patch-cWnn-cdic-Makefile.in (contents, props changed) head/japanese/FreeWnn-lib/files/patch-cWnn-jutil-Makefile.in (contents, props changed) head/japanese/FreeWnn-lib/files/patch-cWnn-tdic-Makefile.in (contents, props changed) head/japanese/FreeWnn-lib/files/patch-config.h.in (contents, props changed) head/japanese/FreeWnn-lib/files/patch-configure (contents, props changed) head/japanese/FreeWnn-lib/files/patch-kWnn-jutil-Makefile.in (contents, props changed) head/japanese/FreeWnn-lib/files/patch-kWnn-kd-Makefile.in (contents, props changed) head/japanese/FreeWnn-lib/files/patch-kWnn-kdic-Makefile.in (contents, props changed) head/japanese/FreeWnn-lib/files/patch-ltmain.sh (contents, props changed) head/japanese/FreeWnn-server/files/patch-Contrib-dic-gerodic-Makefile.in (contents, props changed) head/japanese/FreeWnn-server/files/patch-Wnn-jutil-Makefile.in (contents, props changed) head/japanese/FreeWnn-server/files/patch-Wnn-pubdicplus-Makefile.in (contents, props changed) head/japanese/FreeWnn-server/files/patch-Wnn-wnncons-dic-Makefile.in (contents, props changed) head/japanese/FreeWnn-server/files/patch-Xwnmo-xjutil-Makefile.in (contents, props changed) head/japanese/FreeWnn-server/files/patch-Xwnmo-xwnmo-Makefile.in (contents, props changed) head/japanese/FreeWnn-server/files/patch-aclocal.m4 (contents, props changed) head/japanese/FreeWnn-server/files/patch-cWnn-cd-Makefile.in (contents, props changed) head/japanese/FreeWnn-server/files/patch-cWnn-cdic-Makefile.in (contents, props changed) head/japanese/FreeWnn-server/files/patch-cWnn-jutil-Makefile.in (contents, props changed) head/japanese/FreeWnn-server/files/patch-cWnn-tdic-Makefile.in (contents, props changed) head/japanese/FreeWnn-server/files/patch-config.h.in (contents, props changed) head/japanese/FreeWnn-server/files/patch-configure (contents, props changed) head/japanese/FreeWnn-server/files/patch-kWnn-jutil-Makefile.in (contents, props changed) head/japanese/FreeWnn-server/files/patch-kWnn-kd-Makefile.in (contents, props changed) head/japanese/FreeWnn-server/files/patch-kWnn-kdic-Makefile.in (contents, props changed) head/japanese/FreeWnn-server/files/patch-ltmain.sh (contents, props changed) Modified: head/chinese/FreeWnn-server/pkg-plist head/japanese/FreeWnn-lib/Makefile head/japanese/FreeWnn-lib/files/patch-Wnn-jserver-Makefile.in head/japanese/FreeWnn-lib/files/patch-Wnn-jserver-de.c head/japanese/FreeWnn-lib/files/patch-cWnn-jserver-Makefile.in head/japanese/FreeWnn-lib/files/patch-kWnn-jserver-Makefile.in head/japanese/FreeWnn-server/Makefile head/japanese/FreeWnn-server/files/cwnn.in head/japanese/FreeWnn-server/files/kwnn.in head/japanese/FreeWnn-server/files/patch-Wnn-jserver-Makefile.in head/japanese/FreeWnn-server/files/patch-Wnn-jserver-de.c head/japanese/FreeWnn-server/files/patch-cWnn-jserver-Makefile.in head/japanese/FreeWnn-server/files/patch-kWnn-jserver-Makefile.in head/japanese/FreeWnn-server/files/patch-makerule.mk.in head/japanese/FreeWnn-server/files/twnn.in head/japanese/FreeWnn-server/files/wnn.in head/korean/FreeWnn-server/pkg-plist Modified: head/chinese/FreeWnn-server/pkg-plist ============================================================================== --- head/chinese/FreeWnn-server/pkg-plist Thu Sep 11 07:45:08 2014 (r367908) +++ head/chinese/FreeWnn-server/pkg-plist Thu Sep 11 07:48:17 2014 (r367909) @@ -28,3 +28,18 @@ lib/wnn/zh_TW/dic/sys/full.conR @dirrm lib/wnn/zh_CN/dic @dirrm lib/wnn/zh_TW/dic/sys @dirrm lib/wnn/zh_TW/dic +man/ja/man1/catod.1.gz +man/ja/man1/catof.1.gz +man/ja/man1/cdicsort.1.gz +man/ja/man1/cdtoa.1.gz +man/ja/man1/cserver.1.gz +man/ja/man1/cuum.1.gz +man/ja/man1/cwddel.1.gz +man/ja/man1/cwdreg.1.gz +man/ja/man1/cwnnkill.1.gz +man/ja/man1/cwnnstat.1.gz +man/ja/man1/cwnntouch.1.gz +man/ja/man4/cenv.4.gz +man/ja/man4/ckey.4.gz +man/ja/man4/cst_end.4.gz +man/ja/man4/cwnn.4.gz Modified: head/japanese/FreeWnn-lib/Makefile ============================================================================== --- head/japanese/FreeWnn-lib/Makefile Thu Sep 11 07:45:08 2014 (r367908) +++ head/japanese/FreeWnn-lib/Makefile Thu Sep 11 07:48:17 2014 (r367909) @@ -3,7 +3,7 @@ PORTNAME= FreeWnn PORTVERSION= 1.1.1.a021 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES?= japanese MASTER_SITES= ftp://ftp.freewnn.org/pub/%SUBDIR%/ \ ${MASTER_SITE_SOURCEFORGE_JP} Added: head/japanese/FreeWnn-lib/files/patch-Contrib-dic-gerodic-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/FreeWnn-lib/files/patch-Contrib-dic-gerodic-Makefile.in Thu Sep 11 07:48:17 2014 (r367909) @@ -0,0 +1,20 @@ +--- Contrib/dic/gerodic/Makefile.in.orig 2001-08-14 22:43:20.000000000 +0900 ++++ Contrib/dic/gerodic/Makefile.in 2014-09-10 01:41:30.000000000 +0900 +@@ -43,7 +43,6 @@ + + + INSTALL = @INSTALL@ $(INSTALLFLAGS) +-LOCAL_INSTFLAGS = -o ${WNNOWNER} + + #ATOD=${JWNNBINDIR}/atod + ATOD=${WNNJUTILSRC}/atod +@@ -67,9 +66,7 @@ + install:: ${OBJ} + @if [ -d $(DESTDIR)$(GERODIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(DESTDIR)$(GERODIR)); fi +- chown ${WNNOWNER} $(DESTDIR)$(GERODIR) + $(INSTALL) $(INSTDATFLAGS) $(LOCAL_INSTFLAGS) ${OBJ} $(DESTDIR)$(GERODIR) +- ${WNNTOUCH} $(DESTDIR)$(GERODIR)/${OBJ} + + clean:: + $(RM) ${OBJ} Modified: head/japanese/FreeWnn-lib/files/patch-Wnn-jserver-Makefile.in ============================================================================== --- head/japanese/FreeWnn-lib/files/patch-Wnn-jserver-Makefile.in Thu Sep 11 07:45:08 2014 (r367908) +++ head/japanese/FreeWnn-lib/files/patch-Wnn-jserver-Makefile.in Thu Sep 11 07:48:17 2014 (r367909) @@ -1,12 +1,14 @@ -Index: Wnn/jserver/Makefile.in -=================================================================== -RCS file: /home/cvs/private/hrs/freewnn/Wnn/jserver/Makefile.in,v -retrieving revision 1.1.1.1 -retrieving revision 1.2 -diff -u -p -r1.1.1.1 -r1.2 ---- Wnn/jserver/Makefile.in 20 Dec 2008 07:13:30 -0000 1.1.1.1 -+++ Wnn/jserver/Makefile.in 2 Jan 2009 21:09:34 -0000 1.2 -@@ -80,13 +80,15 @@ SRC20= $(WNNETCSRC)/getopt.c +--- Wnn/jserver/Makefile.in.orig 2004-05-22 01:39:32.000000000 +0900 ++++ Wnn/jserver/Makefile.in 2014-09-10 01:24:03.000000000 +0900 +@@ -36,7 +36,6 @@ + top_builddir = @top_builddir@ + + INSTALL = @INSTALL@ $(INSTALLFLAGS) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) + + JSERVERDEFINES = -DJSERVER -DWRITE_CHECK + INCLUDES = -I$(WNNINCLUDESRC) -I$(top_builddir) -I$(srcdir) +@@ -80,13 +79,15 @@ OBJ20= getopt.o SRC21= $(WNNETCSRC)/getopt1.c OBJ21= getopt1.o @@ -24,7 +26,16 @@ diff -u -p -r1.1.1.1 -r1.2 all:: jserver -@@ -151,6 +153,9 @@ $(OBJ20) : $(SRC20) $(WNNINCLUDESRC)/get +@@ -104,7 +105,7 @@ + install:: jserver + @if [ -d $(DESTDIR)$(JWNNBINDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(DESTDIR)$(JWNNBINDIR)); fi +- $(LIBTOOL) --mode=install $(INSTALL) $(INSTPGMFLAGS) $(INSTUIDFLAGS) $(LOCAL_INSTFLAGS) jserver $(DESTDIR)$(JWNNBINDIR)/jserver ++ $(LIBTOOL) --mode=install $(INSTALL) $(INSTPGMFLAGS) jserver $(DESTDIR)$(JWNNBINDIR)/jserver + + $(OBJ0) : $(SRC0) + $(CC) -c $(CFLAGS) $(SERVERINITDEF) $(SOLINGERDEFS) $(srcdir)/`basename $@ .o`.c +@@ -151,6 +152,9 @@ $(OBJ21) : $(SRC21) $(WNNINCLUDESRC)/getopt.h $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c Modified: head/japanese/FreeWnn-lib/files/patch-Wnn-jserver-de.c ============================================================================== --- head/japanese/FreeWnn-lib/files/patch-Wnn-jserver-de.c Thu Sep 11 07:45:08 2014 (r367908) +++ head/japanese/FreeWnn-lib/files/patch-Wnn-jserver-de.c Thu Sep 11 07:48:17 2014 (r367909) @@ -2,10 +2,10 @@ Index: Wnn/jserver/de.c =================================================================== RCS file: /home/cvs/private/hrs/freewnn/Wnn/jserver/de.c,v retrieving revision 1.1.1.1 -retrieving revision 1.7 -diff -u -p -r1.1.1.1 -r1.7 +retrieving revision 1.8 +diff -u -p -r1.1.1.1 -r1.8 --- Wnn/jserver/de.c 20 Dec 2008 07:13:30 -0000 1.1.1.1 -+++ Wnn/jserver/de.c 2 Jan 2010 14:05:14 -0000 1.7 ++++ Wnn/jserver/de.c 9 Sep 2014 16:18:01 -0000 1.8 @@ -1,7 +1,7 @@ /* * FreeWnn is a network-extensible Kana-to-Kanji conversion system. @@ -709,7 +709,7 @@ diff -u -p -r1.1.1.1 -r1.7 } /** クライアントをcblkから削除する **/ -@@ -555,746 +505,724 @@ new_client (void) /* NewCl +@@ -555,746 +505,726 @@ new_client (void) /* NewCl void del_client (void) { @@ -1599,6 +1599,8 @@ diff -u -p -r1.1.1.1 -r1.7 - } - setsockopt (sock_d_in, SOL_SOCKET, SO_REUSEADDR, (char *) &on, sizeof (int)); +#endif /* INET6 */ ++ default: ++ continue; + } + setsockopt (sock_d_in, SOL_SOCKET, SO_REUSEADDR, (char *) &on, sizeof (int)); #ifdef SO_DONTLINGER @@ -1971,7 +1973,7 @@ diff -u -p -r1.1.1.1 -r1.7 } void -@@ -1302,25 +1230,25 @@ js_kill (void) +@@ -1302,25 +1232,25 @@ js_kill (void) { if (clientp == 1) { Added: head/japanese/FreeWnn-lib/files/patch-Wnn-jutil-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/FreeWnn-lib/files/patch-Wnn-jutil-Makefile.in Thu Sep 11 07:48:17 2014 (r367909) @@ -0,0 +1,19 @@ +--- Wnn/jutil/Makefile.in.orig 2014-09-10 01:24:48.000000000 +0900 ++++ Wnn/jutil/Makefile.in 2014-09-10 01:25:04.000000000 +0900 +@@ -37,7 +37,6 @@ + INSTALL = @INSTALL@ $(INSTALLFLAGS) + LT_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + LT_LD = $(LIBTOOL) --mode=link $(CCLINK) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) + + INCLUDES = -I$(WNNINCLUDESRC) -I$(top_builddir) + DEFINES = $(WNNDEFINES) $(WNNLANGDEF) +@@ -193,7 +192,7 @@ + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; *[i]*) set +e;; esac; done; \ + for i in $(PROGRAMS); do \ +- (set -x; $(LT_INSTALL) $(INSTBINFLAGS) $(INSTPGMFLAGS) $(LOCAL_INSTFLAGS) $$i $(DESTDIR)$(JWNNBINDIR)); \ ++ (set -x; $(LT_INSTALL) $(INSTBINFLAGS) $(INSTPGMFLAGS) $$i $(DESTDIR)$(JWNNBINDIR)); \ + done + + $(OBJ1) : $(SRC1) Added: head/japanese/FreeWnn-lib/files/patch-Wnn-pubdicplus-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/FreeWnn-lib/files/patch-Wnn-pubdicplus-Makefile.in Thu Sep 11 07:48:17 2014 (r367909) @@ -0,0 +1,49 @@ +--- Wnn/pubdicplus/Makefile.in.orig 2004-04-25 03:56:40.000000000 +0900 ++++ Wnn/pubdicplus/Makefile.in 2014-09-10 01:42:29.000000000 +0900 +@@ -35,7 +35,6 @@ + WNNJUTILOBJ = $(top_builddir)/Wnn/jutil + + INSTALL = @INSTALL@ $(INSTALLFLAGS) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) + + INCLUDES = -I$(top_builddir) + ATOD = $(WNNJUTILOBJ)/atod +@@ -377,8 +376,7 @@ + install:: + @case '${MFLAGS}' in *[i]*) set +e;; esac; + @for i in $(JWNNDICDIR); do if [ -d $(DESTDIR)$$i ]; then \ +- set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i; \ +- chown $(WNNOWNER) $(DESTDIR)$$i); fi \ ++ set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i); fi; \ + done + + install:: $(DIC) +@@ -388,8 +386,7 @@ + @for i in $(DIC); do if [ -f $(DESTDIR)$(JWNNPUBDICDIR)/$$i ]; then \ + set +x; \ + else (set -x; \ +- $(INSTALL) $(INSTLIBFLAGS) $(LOCAL_INSTFLAGS) $$i $(DESTDIR)$(JWNNPUBDICDIR); \ +- $(WNNTOUCH) $(DESTDIR)$(JWNNPUBDICDIR)/$$i); fi \ ++ $(INSTALL) $(INSTLIBFLAGS) $$i $(DESTDIR)$(JWNNPUBDICDIR)); fi \ + done + + install:: $(FZKDATA) +@@ -399,8 +396,7 @@ + @for i in $(FZKDATA); do if [ -f $(DESTDIR)$(JWNNPUBDICDIR)/$$i ]; then \ + set +x; \ + else (set -x; \ +- $(INSTALL) $(INSTLIBFLAGS) $(LOCAL_INSTFLAGS) $$i $(DESTDIR)$(JWNNPUBDICDIR); \ +- $(WNNTOUCH) $(DESTDIR)$(JWNNPUBDICDIR)/$$i); fi \ ++ $(INSTALL) $(INSTLIBFLAGS) $$i $(DESTDIR)$(JWNNPUBDICDIR)); fi \ + done + + install:: $(FZK_SRC) +@@ -409,7 +405,7 @@ + @for flag in ${MAKEFLAGS} ''; do \ + case "$$flag" in *=*) ;; *[i]*) set +e;; esac; done; \ + for i in $(FZK_SRC); do \ +- (set -x; $(INSTALL) $(INSTDATFLAGS) $(LOCAL_INSTFLAGS) $$i $(DESTDIR)$(JWNNFZKSRCDIR)); \ ++ (set -x; $(INSTALL) $(INSTDATFLAGS) $$i $(DESTDIR)$(JWNNFZKSRCDIR)); \ + done + + depend:: Added: head/japanese/FreeWnn-lib/files/patch-Wnn-wnncons-dic-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/FreeWnn-lib/files/patch-Wnn-wnncons-dic-Makefile.in Thu Sep 11 07:48:17 2014 (r367909) @@ -0,0 +1,20 @@ +--- Wnn/wnncons/dic/Makefile.in.orig 2001-08-14 22:43:21.000000000 +0900 ++++ Wnn/wnncons/dic/Makefile.in 2014-09-10 01:43:05.000000000 +0900 +@@ -33,7 +33,6 @@ + top_builddir = ../../.. + + INSTALL = @INSTALL@ $(INSTALLFLAGS) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) + + ATOD = $(WNNJUTILSRC)/atod + WNNTOUCH = $(WNNJUTILSRC)/wnntouch +@@ -85,8 +84,7 @@ + @for i in $(DICS); do if [ -f $(DESTDIR)$(JWNNWNNCONSDICDIR)/$$i ]; then \ + set +x; \ + else (set -x; \ +- $(INSTALL) $(INSTDATFLAGS) $(LOCAL_INSTFLAGS) $$i $(DESTDIR)$(JWNNWNNCONSDICDIR); \ +- $(WNNTOUCH) $(DESTDIR)$(JWNNWNNCONSDICDIR)/$$i); fi \ ++ $(INSTALL) $(INSTDATFLAGS) $$i $(DESTDIR)$(JWNNWNNCONSDICDIR)); fi \ + done + + depend:: Added: head/japanese/FreeWnn-lib/files/patch-Xwnmo-xjutil-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/FreeWnn-lib/files/patch-Xwnmo-xjutil-Makefile.in Thu Sep 11 07:48:17 2014 (r367909) @@ -0,0 +1,19 @@ +--- ./Xwnmo/xjutil/Makefile.in.orig 2014-09-10 01:27:13.000000000 +0900 ++++ ./Xwnmo/xjutil/Makefile.in 2014-09-10 01:27:24.000000000 +0900 +@@ -26,7 +26,6 @@ + top_builddir = ../.. + + INSTALL = @INSTALL@ $(INSTALLFLAGS) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) + + INCLUDES = -I. $(XWNMOINCLUDES) -I$(XWNMOSRC) + +@@ -115,7 +114,7 @@ + install:: xjutil + @if [ -d $(DESTDIR)$(BINDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); fi +- $(INSTALL) $(INSTPGMFLAGS) $(INSTBINFLAGS) $(LOCAL_INSTFLAGS) xjutil $(DESTDIR)$(BINDIR)/xjutil ++ $(INSTALL) $(INSTPGMFLAGS) $(INSTBINFLAGS) xjutil $(DESTDIR)$(BINDIR)/xjutil + + install.man:: xjutil.man + @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ Added: head/japanese/FreeWnn-lib/files/patch-Xwnmo-xwnmo-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/FreeWnn-lib/files/patch-Xwnmo-xwnmo-Makefile.in Thu Sep 11 07:48:17 2014 (r367909) @@ -0,0 +1,25 @@ +--- ./Xwnmo/xwnmo/Makefile.in.orig 2014-09-10 01:28:06.000000000 +0900 ++++ ./Xwnmo/xwnmo/Makefile.in 2014-09-10 01:28:19.000000000 +0900 +@@ -26,7 +26,6 @@ + top_builddir = ../.. + + INSTALL = @INSTALL@ $(INSTALLFLAGS) +-LOCAL_INSTFLAGS = -o $(WNNOWNER) + + INCLUDES = $(XWNMOINCLUDES) + +@@ -181,12 +180,12 @@ + install:: xwnmo + @if [ -d $(DESTDIR)$(BINDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); fi +- $(INSTALL) $(INSTPGMFLAGS) $(INSTBINFLAGS) $(LOCAL_INSTFLAGS) xwnmo $(DESTDIR)$(BINDIR)/xwnmo ++ $(INSTALL) $(INSTPGMFLAGS) $(INSTBINFLAGS) xwnmo $(DESTDIR)$(BINDIR)/xwnmo + + install:: killxwnmo + @if [ -d $(DESTDIR)$(BINDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); fi +- $(INSTALL) $(INSTPGMFLAGS) $(INSTBINFLAGS) $(LOCAL_INSTFLAGS) killxwnmo $(DESTDIR)$(BINDIR)/killxwnmo ++ $(INSTALL) $(INSTPGMFLAGS) $(INSTBINFLAGS) killxwnmo $(DESTDIR)$(BINDIR)/killxwnmo + + install:: Xwnmo.ad + @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then set +x; \ Added: head/japanese/FreeWnn-lib/files/patch-aclocal.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/FreeWnn-lib/files/patch-aclocal.m4 Thu Sep 11 07:48:17 2014 (r367909) @@ -0,0 +1,11633 @@ +Index: aclocal.m4 +=================================================================== +RCS file: /home/cvs/private/hrs/freewnn/aclocal.m4,v +retrieving revision 1.1.1.1 +retrieving revision 1.2 +diff -u -p -r1.1.1.1 -r1.2 +--- aclocal.m4 20 Dec 2008 07:13:30 -0000 1.1.1.1 ++++ aclocal.m4 2 Jan 2010 11:58:36 -0000 1.2 +@@ -1,7 +1,7 @@ +-# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- ++# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + +-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +-# Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -12,102 +12,187 @@ + # PARTICULAR PURPOSE. + + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- ++# ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++# 2006, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gordon Matzigkeit, 1996 ++# ++# 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. ++ ++m4_define([_LT_COPYING], [dnl ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++# 2006, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gordon Matzigkeit, 1996 ++# ++# This file is part of GNU Libtool. ++# ++# GNU Libtool is free software; you can redistribute it and/or ++# modify it under the terms of the GNU General Public License as ++# published by the Free Software Foundation; either version 2 of ++# the License, or (at your option) any later version. ++# ++# As a special exception to the GNU General Public License, ++# if you distribute this file as part of a program or library that ++# is built using GNU Libtool, you may include this file under the ++# same distribution terms that you use for the rest of that program. ++# ++# GNU Libtool is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with GNU Libtool; see the file COPYING. If not, a copy ++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or ++# obtained by writing to the Free Software Foundation, Inc., ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++]) + +-# serial 47 AC_PROG_LIBTOOL +- ++# serial 56 LT_INIT + +-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +-# ----------------------------------------------------------- +-# If this macro is not defined by Autoconf, define it here. +-m4_ifdef([AC_PROVIDE_IFELSE], +- [], +- [m4_define([AC_PROVIDE_IFELSE], +- [m4_ifdef([AC_PROVIDE_$1], +- [$2], [$3])])]) + ++# LT_PREREQ(VERSION) ++# ------------------ ++# Complain and exit if this libtool version is less that VERSION. ++m4_defun([LT_PREREQ], ++[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, ++ [m4_default([$3], ++ [m4_fatal([Libtool version $1 or higher is required], ++ 63)])], ++ [$2])]) ++ ++ ++# _LT_CHECK_BUILDDIR ++# ------------------ ++# Complain if the absolute build directory name contains unusual characters ++m4_defun([_LT_CHECK_BUILDDIR], ++[case `pwd` in ++ *\ * | *\ *) ++ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; ++esac ++]) + +-# AC_PROG_LIBTOOL +-# --------------- +-AC_DEFUN([AC_PROG_LIBTOOL], +-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. +- AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [AC_LIBTOOL_CXX], +- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX +- ])]) +-dnl And a similar setup for Fortran 77 support +- AC_PROVIDE_IFELSE([AC_PROG_F77], +- [AC_LIBTOOL_F77], +- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +-])]) +- +-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. +- AC_PROVIDE_IFELSE([AC_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [ifdef([AC_PROG_GCJ], +- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) +- ifdef([A][M_PROG_GCJ], +- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) +- ifdef([LT_AC_PROG_GCJ], +- [define([LT_AC_PROG_GCJ], +- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +-])])# AC_PROG_LIBTOOL + ++# LT_INIT([OPTIONS]) ++# ------------------ ++AC_DEFUN([LT_INIT], ++[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT ++AC_BEFORE([$0], [LT_LANG])dnl ++AC_BEFORE([$0], [LT_OUTPUT])dnl ++AC_BEFORE([$0], [LTDL_INIT])dnl ++m4_require([_LT_CHECK_BUILDDIR])dnl ++ ++dnl Autoconf doesn't catch unexpanded LT_ macros by default: ++m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl ++m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl ++dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 ++dnl unless we require an AC_DEFUNed macro: ++AC_REQUIRE([LTOPTIONS_VERSION])dnl ++AC_REQUIRE([LTSUGAR_VERSION])dnl ++AC_REQUIRE([LTVERSION_VERSION])dnl ++AC_REQUIRE([LTOBSOLETE_VERSION])dnl ++m4_require([_LT_PROG_LTMAIN])dnl + +-# _AC_PROG_LIBTOOL +-# ---------------- +-AC_DEFUN([_AC_PROG_LIBTOOL], +-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl ++dnl Parse OPTIONS ++_LT_SET_OPTIONS([$0], [$1]) + + # This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++LIBTOOL_DEPS="$ltmain" + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' + AC_SUBST(LIBTOOL)dnl + +-# Prevent multiple expansion +-define([AC_PROG_LIBTOOL], []) +-])# _AC_PROG_LIBTOOL ++_LT_SETUP + ++# Only expand once: ++m4_define([LT_INIT]) ++])# LT_INIT + +-# AC_LIBTOOL_SETUP +-# ---------------- +-AC_DEFUN([AC_LIBTOOL_SETUP], +-[AC_PREREQ(2.50)dnl +-AC_REQUIRE([AC_ENABLE_SHARED])dnl +-AC_REQUIRE([AC_ENABLE_STATIC])dnl +-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl ++# Old names: ++AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) ++AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_PROG_LIBTOOL], []) ++dnl AC_DEFUN([AM_PROG_LIBTOOL], []) ++ ++ ++# _LT_CC_BASENAME(CC) ++# ------------------- ++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. ++m4_defun([_LT_CC_BASENAME], ++[for cc_temp in $1""; do ++ case $cc_temp in ++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; ++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++]) ++ ++ ++# _LT_FILEUTILS_DEFAULTS ++# ---------------------- ++# It is okay to use these file commands and assume they have been set ++# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. ++m4_defun([_LT_FILEUTILS_DEFAULTS], ++[: ${CP="cp -f"} ++: ${MV="mv -f"} ++: ${RM="rm -f"} ++])# _LT_FILEUTILS_DEFAULTS ++ ++ ++# _LT_SETUP ++# --------- ++m4_defun([_LT_SETUP], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl + AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++_LT_DECL([], [host_alias], [0], [The host system])dnl ++_LT_DECL([], [host], [0])dnl ++_LT_DECL([], [host_os], [0])dnl ++dnl ++_LT_DECL([], [build_alias], [0], [The build system])dnl ++_LT_DECL([], [build], [0])dnl ++_LT_DECL([], [build_os], [0])dnl ++dnl + AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_PROG_LD])dnl +-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +-AC_REQUIRE([AC_PROG_NM])dnl +- ++AC_REQUIRE([LT_PATH_LD])dnl ++AC_REQUIRE([LT_PATH_NM])dnl ++dnl + AC_REQUIRE([AC_PROG_LN_S])dnl +-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +-AC_REQUIRE([AC_OBJEXT])dnl +-AC_REQUIRE([AC_EXEEXT])dnl ++test -z "$LN_S" && LN_S="ln -s" ++_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl ++dnl ++AC_REQUIRE([LT_CMD_MAX_LEN])dnl ++_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl ++_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl + dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_CHECK_SHELL_FEATURES])dnl ++m4_require([_LT_CMD_RELOAD])dnl ++m4_require([_LT_CHECK_MAGIC_METHOD])dnl ++m4_require([_LT_CMD_OLD_ARCHIVE])dnl ++m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++ ++_LT_CONFIG_LIBTOOL_INIT([ ++# See if we are running on zsh, and set the options which allow our ++# commands through without removal of \ escapes INIT. ++if test -n "\${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++fi ++]) ++if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++fi + +-AC_LIBTOOL_SYS_MAX_CMD_LEN +-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +-AC_LIBTOOL_OBJDIR ++_LT_CHECK_OBJDIR + +-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +-_LT_AC_PROG_ECHO_BACKSLASH ++m4_require([_LT_TAG_COMPILER])dnl ++_LT_PROG_ECHO_BACKSLASH + + case $host_os in + aix3*) +@@ -123,174 +208,879 @@ esac + + # Sed substitution that helps us do robust quoting. It backslashifies + # metacharacters that are still active within double-quoted strings. +-Xsed='sed -e s/^X//' +-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] ++sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' + + # Same as above, but do not quote variable references. +-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] ++double_quote_subst='s/\([["`\\]]\)/\\\1/g' + + # Sed substitution to delay expansion of an escaped shell variable in a + # double_quote_subst'ed string. + delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + ++# Sed substitution to delay expansion of an escaped single quote. ++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' ++ + # Sed substitution to avoid accidental globbing in evaled expressions + no_glob_subst='s/\*/\\\*/g' + +-# Constants: +-rm="rm -f" +- + # Global variables: +-default_ofile=libtool ++ofile=libtool + can_build_shared=yes + +-# All known linkers require a `.a' archive for static linking (except M$VC, ++# All known linkers require a `.a' archive for static linking (except MSVC, + # which needs '.lib'). + libext=a +-ltmain="$ac_aux_dir/ltmain.sh" +-ofile="$default_ofile" +-with_gnu_ld="$lt_cv_prog_gnu_ld" + +-AC_CHECK_TOOL(AR, ar, false) +-AC_CHECK_TOOL(RANLIB, ranlib, :) +-AC_CHECK_TOOL(STRIP, strip, :) ++with_gnu_ld="$lt_cv_prog_gnu_ld" + + old_CC="$CC" + old_CFLAGS="$CFLAGS" + + # Set sane defaults for various variables +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru +-test -z "$AS" && AS=as + test -z "$CC" && CC=cc + test -z "$LTCC" && LTCC=$CC +-test -z "$DLLTOOL" && DLLTOOL=dlltool ++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS + test -z "$LD" && LD=ld +-test -z "$LN_S" && LN_S="ln -s" +-test -z "$MAGIC_CMD" && MAGIC_CMD=file +-test -z "$NM" && NM=nm +-test -z "$SED" && SED=sed +-test -z "$OBJDUMP" && OBJDUMP=objdump +-test -z "$RANLIB" && RANLIB=: +-test -z "$STRIP" && STRIP=: + test -z "$ac_objext" && ac_objext=o + +-# Determine commands to create old-style static archives. +-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +-old_postinstall_cmds='chmod 644 $oldlib' +-old_postuninstall_cmds= +- +-if test -n "$RANLIB"; then +- case $host_os in +- openbsd*) +- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" +- ;; +- *) +- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" +- ;; +- esac +- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +-fi ++_LT_CC_BASENAME([$compiler]) + + # Only perform the check for file, if the check method requires it ++test -z "$MAGIC_CMD" && MAGIC_CMD=file + case $deplibs_check_method in + file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- AC_PATH_MAGIC ++ _LT_PATH_MAGIC + fi + ;; + esac + +-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) +-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +-enable_win32_dll=yes, enable_win32_dll=no) +- +-AC_ARG_ENABLE([libtool-lock], +- [AC_HELP_STRING([--disable-libtool-lock], +- [avoid locking (might break parallel builds)])]) +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++# Use C for the default configuration in the libtool script ++LT_SUPPORTED_TAG([CC]) ++_LT_LANG_C_CONFIG ++_LT_LANG_DEFAULT_CONFIG ++_LT_CONFIG_COMMANDS ++])# _LT_SETUP ++ ++ ++# _LT_PROG_LTMAIN ++# --------------- ++# Note that this code is called both from `configure', and `config.status' ++# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, ++# `config.status' has no value for ac_aux_dir unless we are using Automake, ++# so we pass a copy along to make sure it has a sensible value anyway. ++m4_defun([_LT_PROG_LTMAIN], ++[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl ++_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) ++ltmain="$ac_aux_dir/ltmain.sh" ++])# _LT_PROG_LTMAIN ++ ++ ++ ++# So that we can recreate a full libtool script including additional ++# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS ++# in macros and then make a single call at the end using the `libtool' ++# label. ++ ++ ++# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) ++# ---------------------------------------- ++# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. ++m4_define([_LT_CONFIG_LIBTOOL_INIT], ++[m4_ifval([$1], ++ [m4_append([_LT_OUTPUT_LIBTOOL_INIT], ++ [$1 ++])])]) ++ ++# Initialize. ++m4_define([_LT_OUTPUT_LIBTOOL_INIT]) ++ ++ ++# _LT_CONFIG_LIBTOOL([COMMANDS]) ++# ------------------------------ ++# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. ++m4_define([_LT_CONFIG_LIBTOOL], ++[m4_ifval([$1], ++ [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], ++ [$1 ++])])]) ++ ++# Initialize. ++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) ++ ++ ++# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) ++# ----------------------------------------------------- ++m4_defun([_LT_CONFIG_SAVE_COMMANDS], ++[_LT_CONFIG_LIBTOOL([$1]) ++_LT_CONFIG_LIBTOOL_INIT([$2]) ++]) ++ ++ ++# _LT_FORMAT_COMMENT([COMMENT]) ++# ----------------------------- ++# Add leading comment marks to the start of each line, and a trailing ++# full-stop to the whole comment if one is not present already. ++m4_define([_LT_FORMAT_COMMENT], ++[m4_ifval([$1], [ ++m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], ++ [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) ++)]) ++ ++ + +-AC_ARG_WITH([pic], +- [AC_HELP_STRING([--with-pic], +- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], +- [pic_mode="$withval"], +- [pic_mode=default]) +-test -z "$pic_mode" && pic_mode=default + +-# Use C for the default configuration in the libtool script +-tagname= +-AC_LIBTOOL_LANG_C_CONFIG +-_LT_AC_TAGCONFIG +-])# AC_LIBTOOL_SETUP ++ ++# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) ++# ------------------------------------------------------------------- ++# CONFIGNAME is the name given to the value in the libtool script. ++# VARNAME is the (base) name used in the configure script. ++# VALUE may be 0, 1 or 2 for a computed quote escaped value based on ++# VARNAME. Any other value will be used directly. ++m4_define([_LT_DECL], ++[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], ++ [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], ++ [m4_ifval([$1], [$1], [$2])]) ++ lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) ++ m4_ifval([$4], ++ [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) ++ lt_dict_add_subkey([lt_decl_dict], [$2], ++ [tagged?], [m4_ifval([$5], [yes], [no])])]) ++]) ++ ++ ++# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) ++# -------------------------------------------------------- ++m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) ++ ++ ++# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) ++# ------------------------------------------------ ++m4_define([lt_decl_tag_varnames], ++[_lt_decl_filter([tagged?], [yes], $@)]) ++ ++ ++# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) ++# --------------------------------------------------------- ++m4_define([_lt_decl_filter], ++[m4_case([$#], ++ [0], [m4_fatal([$0: too few arguments: $#])], ++ [1], [m4_fatal([$0: too few arguments: $#: $1])], ++ [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], ++ [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], ++ [lt_dict_filter([lt_decl_dict], $@)])[]dnl ++]) ++ ++ ++# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) ++# -------------------------------------------------- ++m4_define([lt_decl_quote_varnames], ++[_lt_decl_filter([value], [1], $@)]) ++ ++ ++# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) ++# --------------------------------------------------- ++m4_define([lt_decl_dquote_varnames], ++[_lt_decl_filter([value], [2], $@)]) ++ ++ ++# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) ++# --------------------------------------------------- ++m4_define([lt_decl_varnames_tagged], ++[m4_assert([$# <= 2])dnl ++_$0(m4_quote(m4_default([$1], [[, ]])), ++ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), ++ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) ++m4_define([_lt_decl_varnames_tagged], ++[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) ++ ++ ++# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) ++# ------------------------------------------------ ++m4_define([lt_decl_all_varnames], ++[_$0(m4_quote(m4_default([$1], [[, ]])), ++ m4_if([$2], [], ++ m4_quote(lt_decl_varnames), ++ m4_quote(m4_shift($@))))[]dnl ++]) ++m4_define([_lt_decl_all_varnames], ++[lt_join($@, lt_decl_varnames_tagged([$1], ++ lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl ++]) ++ ++ ++# _LT_CONFIG_STATUS_DECLARE([VARNAME]) ++# ------------------------------------ ++# Quote a variable value, and forward it to `config.status' so that its ++# declaration there will have the same value as in `configure'. VARNAME ++# must have a single quote delimited value for this to work. ++m4_define([_LT_CONFIG_STATUS_DECLARE], ++[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) ++ ++ ++# _LT_CONFIG_STATUS_DECLARATIONS ++# ------------------------------ ++# We delimit libtool config variables with single quotes, so when ++# we write them to config.status, we have to be sure to quote all ++# embedded single quotes properly. In configure, this macro expands ++# each variable declared with _LT_DECL (and _LT_TAGDECL) into: ++# ++# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' ++m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], ++[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), ++ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) ++ ++ ++# _LT_LIBTOOL_TAGS ++# ---------------- ++# Output comment and list of tags supported by the script ++m4_defun([_LT_LIBTOOL_TAGS], ++[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl ++available_tags="_LT_TAGS"dnl ++]) ++ ++ ++# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) ++# ----------------------------------- ++# Extract the dictionary values for VARNAME (optionally with TAG) and ++# expand to a commented shell variable setting: ++# ++# # Some comment about what VAR is for. ++# visible_name=$lt_internal_name ++m4_define([_LT_LIBTOOL_DECLARE], ++[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], ++ [description])))[]dnl ++m4_pushdef([_libtool_name], ++ m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl ++m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), ++ [0], [_libtool_name=[$]$1], ++ [1], [_libtool_name=$lt_[]$1], ++ [2], [_libtool_name=$lt_[]$1], ++ [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl ++m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl ++]) + + +-# _LT_AC_SYS_COMPILER ++# _LT_LIBTOOL_CONFIG_VARS ++# ----------------------- ++# Produce commented declarations of non-tagged libtool config variables ++# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' ++# script. Tagged libtool config variables (even for the LIBTOOL CONFIG ++# section) are produced by _LT_LIBTOOL_TAG_VARS. ++m4_defun([_LT_LIBTOOL_CONFIG_VARS], ++[m4_foreach([_lt_var], ++ m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), ++ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) ++ ++ ++# _LT_LIBTOOL_TAG_VARS(TAG) ++# ------------------------- ++m4_define([_LT_LIBTOOL_TAG_VARS], ++[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), ++ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) ++ ++ ++# _LT_TAGVAR(VARNAME, [TAGNAME]) ++# ------------------------------ ++m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) ++ ++ ++# _LT_CONFIG_COMMANDS + # ------------------- +-AC_DEFUN([_LT_AC_SYS_COMPILER], ++# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of ++# variables for single and double quote escaping we saved from calls ++# to _LT_DECL, we can put quote escaped variables declarations ++# into `config.status', and then the shell code to quote escape them in ++# for loops in `config.status'. Finally, any additional code accumulated ++# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. ++m4_defun([_LT_CONFIG_COMMANDS], ++[AC_PROVIDE_IFELSE([LT_OUTPUT], ++ dnl If the libtool generation code has been placed in $CONFIG_LT, ++ dnl instead of duplicating it all over again into config.status, ++ dnl then we will have config.status run $CONFIG_LT later, so it ++ dnl needs to know what name is stored there: ++ [AC_CONFIG_COMMANDS([libtool], ++ [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], ++ dnl If the libtool generation code is destined for config.status, ++ dnl expand the accumulated commands and init code now: ++ [AC_CONFIG_COMMANDS([libtool], ++ [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) ++])#_LT_CONFIG_COMMANDS ++ ++ ++# Initialize. ++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], ++[ ++ ++# The HP-UX ksh and POSIX shell print the target directory to stdout ++# if CDPATH is set. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++sed_quote_subst='$sed_quote_subst' ++double_quote_subst='$double_quote_subst' ++delay_variable_subst='$delay_variable_subst' ++_LT_CONFIG_STATUS_DECLARATIONS ++LTCC='$LTCC' ++LTCFLAGS='$LTCFLAGS' ++compiler='$compiler_DEFAULT' ++ ++# Quote evaled strings. ++for var in lt_decl_all_varnames([[ \ ++]], lt_decl_quote_varnames); do ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ *[[\\\\\\\`\\"\\\$]]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac ++done ++ ++# Double-quote double-evaled strings. ++for var in lt_decl_all_varnames([[ \ ++]], lt_decl_dquote_varnames); do ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ *[[\\\\\\\`\\"\\\$]]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac ++done ++ ++# Fix-up fallback echo if it was mangled by the above quoting rules. ++case \$lt_ECHO in ++*'\\\[$]0 --fallback-echo"')dnl " ++ lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` ++ ;; ++esac ++ ++_LT_OUTPUT_LIBTOOL_INIT ++]) ++ ++ ++# LT_OUTPUT ++# --------- ++# This macro allows early generation of the libtool script (before ++# AC_OUTPUT is called), incase it is used in configure for compilation ++# tests. ++AC_DEFUN([LT_OUTPUT], *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409110748.s8B7mIea072367>