From: Bruno Haible Date: Thu, 25 Oct 2001 10:07:48 +0000 (+0000) Subject: Regenerated. X-Git-Tag: v0.11~407 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63d9943b56375176d368059f835f992a676ce052;p=thirdparty%2Fgettext.git Regenerated. --- diff --git a/Makefile.in b/Makefile.in index cae570506..ca793efac 100644 --- a/Makefile.in +++ b/Makefile.in @@ -127,7 +127,7 @@ ACLOCAL_AMFLAGS = -I m4 gettextsrcdir = $(datadir)/gettext gettextsrc_DATA = ABOUT-NLS -SUBDIRS = doc intl intl-java lib src po man m4 misc tests +SUBDIRS = doc intl intl-java lib src po man m4 projects misc tests EXTRA_DIST = BUGS DISCLAIM README.gemtext \ djgpp/Makefile.maint djgpp/README.in djgpp/README \ @@ -181,7 +181,7 @@ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): configure.in m4/backupfile.m4 m4/c-bs-a.m4 m4/codeset.m4 m4/flex.m4 m4/getline.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/javacomp.m4 m4/javaexec.m4 m4/lcmessage.m4 m4/libtool.m4 m4/mbrtowc.m4 m4/mbstate_t.m4 m4/mbswidth.m4 m4/mkdtemp.m4 m4/progtest.m4 m4/setenv.m4 m4/setlocale.m4 m4/siginfo.m4 m4/signalblocking.m4 m4/signed.m4 m4/ssize_t.m4 m4/stdbool.m4 m4/tmpdir.m4 m4/uintmax_t.m4 m4/ulonglong.m4 m4/unionwait.m4 +$(ACLOCAL_M4): configure.in m4/backupfile.m4 m4/c-bs-a.m4 m4/codeset.m4 m4/flex.m4 m4/getline.m4 m4/gettext.m4 m4/glibc21.m4 m4/hostname.m4 m4/iconv.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/javacomp.m4 m4/javaexec.m4 m4/lcmessage.m4 m4/libtool.m4 m4/mbrtowc.m4 m4/mbstate_t.m4 m4/mbswidth.m4 m4/mkdtemp.m4 m4/progtest.m4 m4/setenv.m4 m4/setlocale.m4 m4/siginfo.m4 m4/signalblocking.m4 m4/signed.m4 m4/ssize_t.m4 m4/stdbool.m4 m4/tmpdir.m4 m4/uintmax_t.m4 m4/ulonglong.m4 m4/unionwait.m4 cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.h: stamp-h @if test ! -f $@; then \ @@ -332,7 +332,7 @@ GZIP_ENV = --best distdir: $(DISTFILES) -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) mkdir $(distdir) - $(mkinstalldirs) $(distdir)/djgpp $(distdir)/intl $(distdir)/lib $(distdir)/man $(distdir)/misc $(distdir)/os2 $(distdir)/po + $(mkinstalldirs) $(distdir)/djgpp $(distdir)/intl $(distdir)/lib $(distdir)/man $(distdir)/misc $(distdir)/os2 $(distdir)/po $(distdir)/src @for file in $(DISTFILES); do \ if test -f $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ diff --git a/aclocal.m4 b/aclocal.m4 index aadf3d1bd..97f7a7d75 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -592,7 +592,7 @@ AC_DEFUN([gt_JAVACOMP], if test -n "$JAVAC"; then ac_result="$JAVAC" else - if gcj --version >/dev/null 2>/dev/null; then + if gcj --version 2>/dev/null | grep '^[3-9]' >/dev/null; then HAVE_GCJ=1 ac_result="gcj -C" else @@ -4535,6 +4535,29 @@ AC_DEFINE_UNQUOTED(SETLOCALE_CONST,$gt_cv_proto_setlocale_arg1, [Define as const if the declaration of setlocale() needs const.]) ]) +#serial 1 + +# Prerequisites of the hostname.c program. +AC_DEFUN(gt_PREREQ_HOSTNAME, +[ + AC_CHECK_HEADERS(arpa/inet.h) + AC_CHECK_FUNCS(gethostname gethostbyname inet_ntop) + + AC_MSG_CHECKING([for IPv6 sockets]) + AC_CACHE_VAL(gt_cv_socket_ipv6,[ + AC_TRY_COMPILE([ +#include +#include +#include ], +[int x = AF_INET6; struct in6_addr y; struct sockaddr_in6 z;], + gt_cv_socket_ipv6=yes, gt_cv_socket_ipv6=no) + ]) + AC_MSG_RESULT($gt_cv_socket_ipv6) + if test $gt_cv_socket_ipv6 = yes; then + AC_DEFINE(HAVE_IPV6, 1, [Define if defines AF_INET6.]) + fi +]) + # Macro to add for using GNU gettext. # Ulrich Drepper , 1995. # diff --git a/config.h.in b/config.h.in index 945784ea6..36994c10a 100644 --- a/config.h.in +++ b/config.h.in @@ -115,6 +115,12 @@ /* Define if you have the getgid function. */ #undef HAVE_GETGID +/* Define if you have the gethostbyname function. */ +#undef HAVE_GETHOSTBYNAME + +/* Define if you have the gethostname function. */ +#undef HAVE_GETHOSTNAME + /* Define if you have the getpagesize function. */ #undef HAVE_GETPAGESIZE @@ -124,6 +130,9 @@ /* Define if you have the getuid function. */ #undef HAVE_GETUID +/* Define if you have the inet_ntop function. */ +#undef HAVE_INET_NTOP + /* Define if you have the isascii function. */ #undef HAVE_ISASCII @@ -229,6 +238,9 @@ /* Define if you have the header file. */ #undef HAVE_ARGZ_H +/* Define if you have the header file. */ +#undef HAVE_ARPA_INET_H + /* Define if you have the header file. */ #undef HAVE_DIRENT_H @@ -358,6 +370,9 @@ /* Define as const if the declaration of setlocale() needs const. */ #undef SETLOCALE_CONST +/* Define if defines AF_INET6. */ +#undef HAVE_IPV6 + /* Define if you have the iconv() function. */ #undef HAVE_ICONV diff --git a/configure b/configure index 8efba71a7..186726f26 100755 --- a/configure +++ b/configure @@ -1583,7 +1583,7 @@ rm -f conftest* if test -n "$JAVAC"; then ac_result="$JAVAC" else - if gcj --version >/dev/null 2>/dev/null; then + if gcj --version 2>/dev/null | grep '^3-9' >/dev/null; then HAVE_GCJ=1 ac_result="gcj -C" else @@ -8540,10 +8540,146 @@ EOF + + for ac_hdr in arpa/inet.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:8549: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:8559: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + + for ac_func in gethostname gethostbyname inet_ntop +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:8588: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:8616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + + + echo $ac_n "checking for IPv6 sockets""... $ac_c" 1>&6 +echo "configure:8642: checking for IPv6 sockets" >&5 + if eval "test \"`echo '$''{'gt_cv_socket_ipv6'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext < +#include +#include +int main() { +int x = AF_INET6; struct in6_addr y; struct sockaddr_in6 z; +; return 0; } +EOF +if { (eval echo configure:8658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + gt_cv_socket_ipv6=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + gt_cv_socket_ipv6=no +fi +rm -f conftest* + +fi + + echo "$ac_t""$gt_cv_socket_ipv6" 1>&6 + if test $gt_cv_socket_ipv6 = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_IPV6 1 +EOF + + fi + + # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8547: checking for $ac_word" >&5 +echo "configure:8683: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8574,17 +8710,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8578: checking for $ac_hdr" >&5 +echo "configure:8714: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8588: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8724: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8613,12 +8749,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8617: checking for $ac_func" >&5 +echo "configure:8753: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8666,7 +8802,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:8670: checking for working mmap" >&5 +echo "configure:8806: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8674,7 +8810,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -8838,12 +8974,12 @@ fi echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:8842: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo "configure:8978: checking whether we are using the GNU C Library 2.1 or newer" >&5 if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -8879,17 +9015,17 @@ stdlib.h string.h unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8883: checking for $ac_hdr" >&5 +echo "configure:9019: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8920,12 +9056,12 @@ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strcasecmp strdup \ strtoul tsearch __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8924: checking for $ac_func" >&5 +echo "configure:9060: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8988,7 +9124,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:8992: checking for iconv" >&5 +echo "configure:9128: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8996,7 +9132,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -9006,7 +9142,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:9010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -9018,7 +9154,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext < #include @@ -9028,7 +9164,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:9032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -9049,13 +9185,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:9053: checking for iconv declaration" >&5 +echo "configure:9189: checking for iconv declaration" >&5 if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -9074,7 +9210,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -9103,19 +9239,19 @@ EOF echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:9107: checking for nl_langinfo and CODESET" >&5 +echo "configure:9243: checking for nl_langinfo and CODESET" >&5 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:9119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else @@ -9138,19 +9274,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:9142: checking for LC_MESSAGES" >&5 +echo "configure:9278: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:9154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -9172,7 +9308,7 @@ EOF fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:9176: checking whether NLS is requested" >&5 +echo "configure:9312: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -9194,7 +9330,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:9198: checking whether included gettext is requested" >&5 +echo "configure:9334: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -9214,17 +9350,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:9218: checking for libintl.h" >&5 +echo "configure:9354: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9228: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9241,12 +9377,12 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 -echo "configure:9245: checking for GNU gettext in libc" >&5 +echo "configure:9381: checking for GNU gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext2_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -9255,7 +9391,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:9259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext2_libc=yes else @@ -9271,14 +9407,14 @@ echo "$ac_t""$gt_cv_func_gnugettext2_libc" 1>&6 if test "$gt_cv_func_gnugettext2_libc" != "yes"; then echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 -echo "configure:9275: checking for GNU gettext in libintl" >&5 +echo "configure:9411: checking for GNU gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext2_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else gt_save_LIBS="$LIBS" LIBS="$LIBS -lintl $LIBICONV" cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -9287,7 +9423,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:9291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext2_libintl=yes else @@ -9334,12 +9470,12 @@ EOF for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9338: checking for $ac_func" >&5 +echo "configure:9474: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9405,7 +9541,7 @@ done # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9409: checking for $ac_word" >&5 +echo "configure:9545: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9439,7 +9575,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9443: checking for $ac_word" >&5 +echo "configure:9579: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9476,7 +9612,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9480: checking for $ac_word" >&5 +echo "configure:9616: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9511,7 +9647,7 @@ fi # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9515: checking for $ac_word" >&5 +echo "configure:9651: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGMERGE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9576,7 +9712,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9580: checking for $ac_word" >&5 +echo "configure:9716: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9609,7 +9745,7 @@ done ac_verc_fail=yes else echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:9613: checking version of bison" >&5 +echo "configure:9749: checking version of bison" >&5 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;; @@ -9660,7 +9796,7 @@ if test "${with_lispdir+set}" = set; then withval="$with_lispdir" lispdir="$withval" echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6 -echo "configure:9664: checking where .elc files should go" >&5 +echo "configure:9800: checking where .elc files should go" >&5 echo "$ac_t""$lispdir" 1>&6 else @@ -9672,7 +9808,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9676: checking for $ac_word" >&5 +echo "configure:9812: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_EMACS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9705,7 +9841,7 @@ test -n "$EMACS" || EMACS="no" if test $EMACS != "no"; then if test x${lispdir+set} != xset; then echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6 -echo "configure:9709: checking where .elc files should go" >&5 +echo "configure:9845: checking where .elc files should go" >&5 if eval "test \"`echo '$''{'am_cv_lispdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9732,7 +9868,7 @@ ac_aux_dir_abs=`cd $ac_aux_dir && pwd` # Extract the first word of "dvips", so it can be a program name with args. set dummy dvips; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9736: checking for $ac_word" >&5 +echo "configure:9872: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DVIPS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9768,7 +9904,7 @@ fi # Extract the first word of "texi2pdf", so it can be a program name with args. set dummy texi2pdf; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9772: checking for $ac_word" >&5 +echo "configure:9908: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TEXI2PDF'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9804,7 +9940,7 @@ fi # Extract the first word of "texi2html", so it can be a program name with args. set dummy texi2html; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9808: checking for $ac_word" >&5 +echo "configure:9944: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TEXI2HTML'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9843,7 +9979,7 @@ CROSS_COMPILING=$cross_compiling # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9847: checking for $ac_word" >&5 +echo "configure:9983: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9990,11 +10126,12 @@ ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo "Makefile \ lib/Makefile lib/javacomp.sh lib/javaexec.sh \ intl/Makefile intl-java/Makefile \ - src/Makefile \ + src/Makefile src/user-email \ po/Makefile.in \ doc/Makefile man/Makefile man/x-to-1 \ tests/Makefile \ m4/Makefile \ + projects/Makefile \ misc/Makefile misc/gettextize config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF diff --git a/lib/Makefile.in b/lib/Makefile.in index 30c331251..b6e91fcab 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -130,14 +130,14 @@ noinst_LIBRARIES = libnlsut.a libnlsut_a_SOURCES = addext.c argmatch.c backupfile.c basename.c c-ctype.c \ concatpath.c copy-file.c execute.c findprog.c fstrcmp.c full-write.c gcd.c \ getopt.c getopt1.c hash.c javacomp.c javaexec.c linebreak.c localcharset.c \ -mbswidth.c obstack.c pipe-bidi.c pipe-in.c pipe-out.c progname.c sh-quote.c \ -tmpdir.c wait-process.c xerror.c xgetcwd.c xmalloc.c xstrdup.c +mbswidth.c obstack.c pipe-bidi.c pipe-in.c pipe-out.c progname.c safe-read.c \ +sh-quote.c tmpdir.c wait-process.c xerror.c xgetcwd.c xmalloc.c xstrdup.c libnlsut_a_HEADER = argmatch.h backupfile.h basename.h c-ctype.h copy-file.h \ execute.h findprog.h fstrcmp.h full-write.h gcd.h getopt.h hash.h javacomp.h \ javaexec.h lbrkprop.h linebreak.h mbswidth.h obstack.h pathmax.h pipe.h \ -progname.h sh-quote.h system.h tmpdir.h utf8-ucs4.h utf16-ucs4.h \ +progname.h safe-read.h sh-quote.h system.h tmpdir.h utf8-ucs4.h utf16-ucs4.h \ wait-process.h xerror.h xmalloc.h @@ -152,9 +152,9 @@ LIBADD_HEADER = error.h getline.h mkdtemp.h setenv.h strpbrk.h strstr.h # Unused sources. -UNUSED_SOURCE = memmove.c safe-read.c +UNUSED_SOURCE = memmove.c -UNUSED_HEADER = safe-read.h +UNUSED_HEADER = libnlsut_a_LIBADD = @ALLOCA@ @LIBOBJS@ @@ -194,9 +194,9 @@ am_libnlsut_a_OBJECTS = addext.$(OBJEXT) argmatch.$(OBJEXT) \ javacomp.$(OBJEXT) javaexec.$(OBJEXT) linebreak.$(OBJEXT) \ localcharset.$(OBJEXT) mbswidth.$(OBJEXT) obstack.$(OBJEXT) \ pipe-bidi.$(OBJEXT) pipe-in.$(OBJEXT) pipe-out.$(OBJEXT) \ - progname.$(OBJEXT) sh-quote.$(OBJEXT) tmpdir.$(OBJEXT) \ - wait-process.$(OBJEXT) xerror.$(OBJEXT) xgetcwd.$(OBJEXT) \ - xmalloc.$(OBJEXT) xstrdup.$(OBJEXT) + progname.$(OBJEXT) safe-read.$(OBJEXT) sh-quote.$(OBJEXT) \ + tmpdir.$(OBJEXT) wait-process.$(OBJEXT) xerror.$(OBJEXT) \ + xgetcwd.$(OBJEXT) xmalloc.$(OBJEXT) xstrdup.$(OBJEXT) libnlsut_a_OBJECTS = $(am_libnlsut_a_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) CPPFLAGS = @CPPFLAGS@ diff --git a/m4/Makefile.in b/m4/Makefile.in index 9ea85ceba..97b807ee8 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -128,10 +128,11 @@ aclocal_DATA = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage. # |sed 's/@$/%/;s/@/ \\@/g' |tr @% '\012\012' EXTRA_DIST = README \ backupfile.m4 c-bs-a.m4 codeset.m4 flex.m4 getline.m4 gettext.m4 \ -glibc21.m4 iconv.m4 inttypes_h.m4 isc-posix.m4 javacomp.m4 javaexec.m4 \ -lcmessage.m4 libtool.m4 mbrtowc.m4 mbstate_t.m4 mbswidth.m4 mkdtemp.m4 \ -progtest.m4 setenv.m4 setlocale.m4 siginfo.m4 signalblocking.m4 signed.m4 \ -ssize_t.m4 stdbool.m4 tmpdir.m4 uintmax_t.m4 ulonglong.m4 unionwait.m4 +glibc21.m4 hostname.m4 iconv.m4 inttypes_h.m4 isc-posix.m4 javacomp.m4 \ +javaexec.m4 lcmessage.m4 libtool.m4 mbrtowc.m4 mbstate_t.m4 mbswidth.m4 \ +mkdtemp.m4 progtest.m4 setenv.m4 setlocale.m4 siginfo.m4 signalblocking.m4 \ +signed.m4 ssize_t.m4 stdbool.m4 tmpdir.m4 uintmax_t.m4 ulonglong.m4 \ +unionwait.m4 subdir = m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/man/Makefile.in b/man/Makefile.in index f269fd123..f16efbbe9 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -133,7 +133,7 @@ AUTOMAKE_OPTIONS = 1.2 gnits # A manual page for each of the bin_PROGRAMS in src/Makefile.am. man_aux = gettext.x ngettext.x \ msgcmp.x msgfmt.x msgmerge.x msgunfmt.x xgettext.x \ -msgattrib.x msgcat.x msgcomm.x msgconv.x msgen.x msgexec.x msggrep.x msguniq.x +msgattrib.x msgcat.x msgcomm.x msgconv.x msgen.x msgexec.x msggrep.x msginit.x msguniq.x @@ -142,7 +142,7 @@ man_MAN1GEN = gettext.1 ngettext.1 man_MAN1IN = gettext.1.in ngettext.1.in man_MAN1OTHER = \ msgcmp.1 msgfmt.1 msgmerge.1 msgunfmt.1 xgettext.1 \ -msgattrib.1 msgcat.1 msgcomm.1 msgconv.1 msgen.1 msgexec.1 msggrep.1 msguniq.1 +msgattrib.1 msgcat.1 msgcomm.1 msgconv.1 msgen.1 msgexec.1 msggrep.1 msginit.1 msguniq.1 man_MAN1 = $(man_MAN1GEN) $(man_MAN1OTHER) man_MAN3 = gettext.3 ngettext.3 \ @@ -158,7 +158,7 @@ man_HTMLGEN = gettext.1.html ngettext.1.html man_HTMLIN = gettext.1.html.in ngettext.1.html.in man_HTMLOTHER = \ msgcmp.1.html msgfmt.1.html msgmerge.1.html msgunfmt.1.html xgettext.1.html \ -msgattrib.1.html msgcat.1.html msgcomm.1.html msgconv.1.html msgen.1.html msgexec.1.html msggrep.1.html msguniq.1.html \ +msgattrib.1.html msgcat.1.html msgcomm.1.html msgconv.1.html msgen.1.html msgexec.1.html msggrep.1.html msginit.1.html msguniq.1.html \ gettext.3.html ngettext.3.html \ textdomain.3.html bindtextdomain.3.html bind_textdomain_codeset.3.html @@ -438,6 +438,8 @@ msgexec.1: msgexec.x $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msgexec$(EXEEXT) $(srcdir)/msgexec.x msgexec.1 msggrep.1: msggrep.x $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msggrep$(EXEEXT) $(srcdir)/msggrep.x msggrep.1 +msginit.1: msginit.x + $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msginit$(EXEEXT) $(srcdir)/msginit.x msginit.1 msguniq.1: msguniq.x $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msguniq$(EXEEXT) $(srcdir)/msguniq.x msguniq.1 @@ -514,6 +516,9 @@ msgexec.1.html: msgexec.1 msggrep.1.html: msggrep.1 $(MAN2HTML) `if test -f msggrep.1; then echo .; else echo $(srcdir); fi`/msggrep.1 | sed -e '/CreationDate:/d' > t-$@ mv t-$@ $@ +msginit.1.html: msginit.1 + $(MAN2HTML) `if test -f msginit.1; then echo .; else echo $(srcdir); fi`/msginit.1 | sed -e '/CreationDate:/d' > t-$@ + mv t-$@ $@ msguniq.1.html: msguniq.1 $(MAN2HTML) `if test -f msguniq.1; then echo .; else echo $(srcdir); fi`/msguniq.1 | sed -e '/CreationDate:/d' > t-$@ mv t-$@ $@ diff --git a/projects/Makefile.in b/projects/Makefile.in index 9d294d0bc..4bc474faf 100644 --- a/projects/Makefile.in +++ b/projects/Makefile.in @@ -67,7 +67,6 @@ CC = @CC@ CLASSPATH = @CLASSPATH@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@ CROSS_COMPILING = @CROSS_COMPILING@ -CXX = @CXX@ DATADIRNAME = @DATADIRNAME@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -110,6 +109,7 @@ RANLIB = @RANLIB@ STDBOOL_H = @STDBOOL_H@ STRIP = @STRIP@ TESTJAVA = @TESTJAVA@ +TEXI2HTML = @TEXI2HTML@ TEXI2PDF = @TEXI2PDF@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -142,7 +142,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = DIST_SOURCES = -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = ChangeLog Makefile.am Makefile.in all: all-am .SUFFIXES: diff --git a/src/Makefile.in b/src/Makefile.in index 68147a973..66f923edd 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -125,26 +125,29 @@ AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies bin_PROGRAMS = gettext ngettext \ msgcmp msgfmt msgmerge msgunfmt xgettext \ -msgattrib msgcat msgcomm msgconv msgen msgexec msggrep msguniq +msgattrib msgcat msgcomm msgconv msgen msgexec msggrep msginit msguniq +noinst_PROGRAMS = hostname urlget + noinst_HEADERS = pos.h message.h po-gram.h po-hash.h po-charset.h po-lex.h \ po.h open-po.h read-po.h str-list.h write-po.h dir-list.h file-list.h \ po-gram-gen.h po-hash-gen.h msgl-charset.h msgl-equal.h msgl-iconv.h \ -msgl-ascii.h msgl-cat.h msgfmt.h read-mo.h write-mo.h xgettext.h x-c.h x-po.h \ -x-java.h x-ycp.h x-rst.h +msgl-ascii.h msgl-cat.h msgl-english.h msgfmt.h read-mo.h write-mo.h \ +po-time.h xgettext.h x-c.h x-po.h x-java.h x-ycp.h x-rst.h EXTRA_DIST = FILES localedir = $(datadir)/locale jardir = $(datadir)/gettext +projectsdir = $(pkgdatadir)/projects INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/lib -I../intl \ -I$(top_srcdir)/intl DEFS = -DLOCALEDIR=\"$(localedir)\" -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \ -@DEFS@ +-DLIBDIR=\"$(libdir)\" -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@ LDADD = ../lib/libnlsut.a @INTLLIBS@ @@ -176,15 +179,18 @@ msgcmp_SOURCES = msgcmp.c $(COMMON_SOURCE) msgfmt_SOURCES = msgfmt.c $(COMMON_SOURCE) msgl-ascii.c msgl-iconv.c write-mo.c write-java.c plural.c plural-eval.c $(FORMAT_SOURCE) msgmerge_SOURCES = msgmerge.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-equal.c msgunfmt_SOURCES = msgunfmt.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c read-mo.c read-java.c -xgettext_SOURCES = xgettext.c $(COMMON_SOURCE) msgl-ascii.c write-po.c file-list.c x-c.c x-po.c x-java.l x-ycp.c x-rst.c $(FORMAT_SOURCE) +xgettext_SOURCES = xgettext.c $(COMMON_SOURCE) msgl-ascii.c write-po.c file-list.c po-time.c x-c.c x-po.c x-java.l x-ycp.c x-rst.c $(FORMAT_SOURCE) msgattrib_SOURCES = msgattrib.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgcat_SOURCES = msgcat.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-iconv.c msgl-cat.c file-list.c msgcomm_SOURCES = msgcomm.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-iconv.c msgl-cat.c file-list.c msgconv_SOURCES = msgconv.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-iconv.c -msgen_SOURCES = msgen.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c +msgen_SOURCES = msgen.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-english.c msgexec_SOURCES = msgexec.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-charset.c msggrep_SOURCES = msggrep.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-charset.c +msginit_SOURCES = msginit.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-english.c po-time.c msguniq_SOURCES = msguniq.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-iconv.c msgl-cat.c +hostname_SOURCES = hostname.c +urlget_SOURCES = urlget.c # Link dependencies. # po-lex.c and po.c may need -liconv. @@ -201,31 +207,41 @@ msgconv_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ msgen_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ msgexec_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ msggrep_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ +msginit_LDADD = ../intl/localealias.$(OBJEXT) ../intl/localename.$(OBJEXT) \ + ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ + msguniq_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ # Special rules for bison and flex generated files. BUILT_SOURCES = po-gram-gen.c po-hash-gen.c po-gram-gen.h po-hash-gen.h -DISTCLEANFILES = po-gram-gen2.h +DISTCLEANFILES = po-gram-gen2.h user-email CLEANFILES = gettext.jar gnu/gettext/*.class subdir = src mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = user-email bin_PROGRAMS = gettext$(EXEEXT) ngettext$(EXEEXT) msgcmp$(EXEEXT) \ msgfmt$(EXEEXT) msgmerge$(EXEEXT) msgunfmt$(EXEEXT) \ xgettext$(EXEEXT) msgattrib$(EXEEXT) msgcat$(EXEEXT) \ msgcomm$(EXEEXT) msgconv$(EXEEXT) msgen$(EXEEXT) \ - msgexec$(EXEEXT) msggrep$(EXEEXT) msguniq$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) + msgexec$(EXEEXT) msggrep$(EXEEXT) msginit$(EXEEXT) \ + msguniq$(EXEEXT) +noinst_PROGRAMS = hostname$(EXEEXT) urlget$(EXEEXT) +PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am_gettext_OBJECTS = gettext.$(OBJEXT) gettext_OBJECTS = $(am_gettext_OBJECTS) gettext_LDADD = $(LDADD) gettext_DEPENDENCIES = ../lib/libnlsut.a gettext_LDFLAGS = +am_hostname_OBJECTS = hostname.$(OBJEXT) +hostname_OBJECTS = $(am_hostname_OBJECTS) +hostname_LDADD = $(LDADD) +hostname_DEPENDENCIES = ../lib/libnlsut.a +hostname_LDFLAGS = am_msgattrib_OBJECTS = msgattrib.$(OBJEXT) message.$(OBJEXT) \ po.$(OBJEXT) po-lex.$(OBJEXT) po-gram-gen.$(OBJEXT) \ po-hash-gen.$(OBJEXT) po-charset.$(OBJEXT) open-po.$(OBJEXT) \ @@ -271,7 +287,7 @@ am_msgen_OBJECTS = msgen.$(OBJEXT) message.$(OBJEXT) po.$(OBJEXT) \ po-lex.$(OBJEXT) po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) \ po-charset.$(OBJEXT) open-po.$(OBJEXT) dir-list.$(OBJEXT) \ str-list.$(OBJEXT) msgl-ascii.$(OBJEXT) write-po.$(OBJEXT) \ - read-po.$(OBJEXT) + read-po.$(OBJEXT) msgl-english.$(OBJEXT) msgen_OBJECTS = $(am_msgen_OBJECTS) msgen_DEPENDENCIES = ../lib/libnlsut.a msgen_LDFLAGS = @@ -303,6 +319,15 @@ am_msggrep_OBJECTS = msggrep.$(OBJEXT) message.$(OBJEXT) po.$(OBJEXT) \ msggrep_OBJECTS = $(am_msggrep_OBJECTS) msggrep_DEPENDENCIES = ../lib/libnlsut.a msggrep_LDFLAGS = +am_msginit_OBJECTS = msginit.$(OBJEXT) message.$(OBJEXT) po.$(OBJEXT) \ + po-lex.$(OBJEXT) po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) \ + po-charset.$(OBJEXT) open-po.$(OBJEXT) dir-list.$(OBJEXT) \ + str-list.$(OBJEXT) msgl-ascii.$(OBJEXT) write-po.$(OBJEXT) \ + read-po.$(OBJEXT) msgl-english.$(OBJEXT) po-time.$(OBJEXT) +msginit_OBJECTS = $(am_msginit_OBJECTS) +msginit_DEPENDENCIES = ../intl/localealias.$(OBJEXT) \ + ../intl/localename.$(OBJEXT) ../lib/libnlsut.a +msginit_LDFLAGS = am_msgmerge_OBJECTS = msgmerge.$(OBJEXT) message.$(OBJEXT) po.$(OBJEXT) \ po-lex.$(OBJEXT) po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) \ po-charset.$(OBJEXT) open-po.$(OBJEXT) dir-list.$(OBJEXT) \ @@ -332,12 +357,17 @@ ngettext_OBJECTS = $(am_ngettext_OBJECTS) ngettext_LDADD = $(LDADD) ngettext_DEPENDENCIES = ../lib/libnlsut.a ngettext_LDFLAGS = +am_urlget_OBJECTS = urlget.$(OBJEXT) +urlget_OBJECTS = $(am_urlget_OBJECTS) +urlget_LDADD = $(LDADD) +urlget_DEPENDENCIES = ../lib/libnlsut.a +urlget_LDFLAGS = am_xgettext_OBJECTS = xgettext.$(OBJEXT) message.$(OBJEXT) po.$(OBJEXT) \ po-lex.$(OBJEXT) po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) \ po-charset.$(OBJEXT) open-po.$(OBJEXT) dir-list.$(OBJEXT) \ str-list.$(OBJEXT) msgl-ascii.$(OBJEXT) write-po.$(OBJEXT) \ - file-list.$(OBJEXT) x-c.$(OBJEXT) x-po.$(OBJEXT) \ - x-java.$(OBJEXT) x-ycp.$(OBJEXT) x-rst.$(OBJEXT) \ + file-list.$(OBJEXT) po-time.$(OBJEXT) x-c.$(OBJEXT) \ + x-po.$(OBJEXT) x-java.$(OBJEXT) x-ycp.$(OBJEXT) x-rst.$(OBJEXT) \ format.$(OBJEXT) format-c.$(OBJEXT) format-java.$(OBJEXT) \ format-lisp.$(OBJEXT) format-python.$(OBJEXT) \ format-pascal.$(OBJEXT) format-ycp.$(OBJEXT) @@ -362,16 +392,18 @@ LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS) YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS) LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS) YLWRAP = $(top_srcdir)/ylwrap -DIST_SOURCES = $(gettext_SOURCES) $(msgattrib_SOURCES) $(msgcat_SOURCES) \ - $(msgcmp_SOURCES) $(msgcomm_SOURCES) $(msgconv_SOURCES) \ - $(msgen_SOURCES) $(msgexec_SOURCES) $(msgfmt_SOURCES) \ - $(msggrep_SOURCES) $(msgmerge_SOURCES) $(msgunfmt_SOURCES) \ - $(msguniq_SOURCES) $(ngettext_SOURCES) $(xgettext_SOURCES) +DIST_SOURCES = $(gettext_SOURCES) $(hostname_SOURCES) \ + $(msgattrib_SOURCES) $(msgcat_SOURCES) $(msgcmp_SOURCES) \ + $(msgcomm_SOURCES) $(msgconv_SOURCES) $(msgen_SOURCES) \ + $(msgexec_SOURCES) $(msgfmt_SOURCES) $(msggrep_SOURCES) \ + $(msginit_SOURCES) $(msgmerge_SOURCES) $(msgunfmt_SOURCES) \ + $(msguniq_SOURCES) $(ngettext_SOURCES) $(urlget_SOURCES) \ + $(xgettext_SOURCES) HEADERS = $(noinst_HEADERS) DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in \ - po-gram-gen.c po-hash-gen.c x-java.c -SOURCES = $(gettext_SOURCES) $(msgattrib_SOURCES) $(msgcat_SOURCES) $(msgcmp_SOURCES) $(msgcomm_SOURCES) $(msgconv_SOURCES) $(msgen_SOURCES) $(msgexec_SOURCES) $(msgfmt_SOURCES) $(msggrep_SOURCES) $(msgmerge_SOURCES) $(msgunfmt_SOURCES) $(msguniq_SOURCES) $(ngettext_SOURCES) $(xgettext_SOURCES) + po-gram-gen.c po-hash-gen.c user-email.in x-java.c +SOURCES = $(gettext_SOURCES) $(hostname_SOURCES) $(msgattrib_SOURCES) $(msgcat_SOURCES) $(msgcmp_SOURCES) $(msgcomm_SOURCES) $(msgconv_SOURCES) $(msgen_SOURCES) $(msgexec_SOURCES) $(msgfmt_SOURCES) $(msggrep_SOURCES) $(msginit_SOURCES) $(msgmerge_SOURCES) $(msgunfmt_SOURCES) $(msguniq_SOURCES) $(ngettext_SOURCES) $(urlget_SOURCES) $(xgettext_SOURCES) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -394,6 +426,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +user-email: $(top_builddir)/config.status user-email.in + cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @@ -418,9 +452,15 @@ uninstall-binPROGRAMS: clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + +clean-noinstPROGRAMS: + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) gettext$(EXEEXT): $(gettext_OBJECTS) $(gettext_DEPENDENCIES) @rm -f gettext$(EXEEXT) $(LINK) $(gettext_LDFLAGS) $(gettext_OBJECTS) $(gettext_LDADD) $(LIBS) +hostname$(EXEEXT): $(hostname_OBJECTS) $(hostname_DEPENDENCIES) + @rm -f hostname$(EXEEXT) + $(LINK) $(hostname_LDFLAGS) $(hostname_OBJECTS) $(hostname_LDADD) $(LIBS) msgattrib$(EXEEXT): $(msgattrib_OBJECTS) $(msgattrib_DEPENDENCIES) @rm -f msgattrib$(EXEEXT) $(LINK) $(msgattrib_LDFLAGS) $(msgattrib_OBJECTS) $(msgattrib_LDADD) $(LIBS) @@ -448,6 +488,9 @@ msgfmt$(EXEEXT): $(msgfmt_OBJECTS) $(msgfmt_DEPENDENCIES) msggrep$(EXEEXT): $(msggrep_OBJECTS) $(msggrep_DEPENDENCIES) @rm -f msggrep$(EXEEXT) $(LINK) $(msggrep_LDFLAGS) $(msggrep_OBJECTS) $(msggrep_LDADD) $(LIBS) +msginit$(EXEEXT): $(msginit_OBJECTS) $(msginit_DEPENDENCIES) + @rm -f msginit$(EXEEXT) + $(LINK) $(msginit_LDFLAGS) $(msginit_OBJECTS) $(msginit_LDADD) $(LIBS) msgmerge$(EXEEXT): $(msgmerge_OBJECTS) $(msgmerge_DEPENDENCIES) @rm -f msgmerge$(EXEEXT) $(LINK) $(msgmerge_LDFLAGS) $(msgmerge_OBJECTS) $(msgmerge_LDADD) $(LIBS) @@ -460,6 +503,9 @@ msguniq$(EXEEXT): $(msguniq_OBJECTS) $(msguniq_DEPENDENCIES) ngettext$(EXEEXT): $(ngettext_OBJECTS) $(ngettext_DEPENDENCIES) @rm -f ngettext$(EXEEXT) $(LINK) $(ngettext_LDFLAGS) $(ngettext_OBJECTS) $(ngettext_LDADD) $(LIBS) +urlget$(EXEEXT): $(urlget_OBJECTS) $(urlget_DEPENDENCIES) + @rm -f urlget$(EXEEXT) + $(LINK) $(urlget_LDFLAGS) $(urlget_OBJECTS) $(urlget_LDADD) $(LIBS) xgettext$(EXEEXT): $(xgettext_OBJECTS) $(xgettext_DEPENDENCIES) @rm -f xgettext$(EXEEXT) $(LINK) $(xgettext_LDFLAGS) $(xgettext_OBJECTS) $(xgettext_LDADD) $(LIBS) @@ -574,7 +620,8 @@ maintainer-clean-generic: -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am -clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am +clean-am: clean-binPROGRAMS clean-generic clean-libtool \ + clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am @@ -591,7 +638,7 @@ info-am: install-data-am: install-data-local -install-exec-am: install-binPROGRAMS +install-exec-am: install-binPROGRAMS install-exec-local install-info: install-info-am @@ -611,17 +658,17 @@ mostlyclean-am: mostlyclean-compile mostlyclean-generic \ uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-local .PHONY: GTAGS all all-am all-local check check-am clean \ - clean-binPROGRAMS clean-generic clean-libtool distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-binPROGRAMS install-data install-data-am \ - install-data-local install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool tags uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-info-am \ - uninstall-local + clean-binPROGRAMS clean-generic clean-libtool \ + clean-noinstPROGRAMS distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-data-local install-exec \ + install-exec-am install-exec-local install-info install-info-am \ + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool tags uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-info-am uninstall-local po-lex.o: po-gram-gen2.h @@ -633,6 +680,24 @@ x-java.c: x-java.l $(LEX) -o$@-tmp -Px_java_yy $(srcdir)/x-java.l test "$(LEX)" = ":" || mv $@-tmp $@ +# Special rules for installation of auxiliary programs. + +install-exec-local: + $(mkinstalldirs) $(DESTDIR)$(libdir)/$(PACKAGE) + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) hostname$(EXEEXT) $(DESTDIR)$(libdir)/$(PACKAGE)/hostname$(EXEEXT) + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) urlget$(EXEEXT) $(DESTDIR)$(libdir)/$(PACKAGE)/urlget$(EXEEXT) + $(INSTALL_SCRIPT) user-email $(DESTDIR)$(libdir)/$(PACKAGE)/user-email + $(INSTALL_SCRIPT) $(srcdir)/project-id $(DESTDIR)$(libdir)/$(PACKAGE)/project-id + +installdirs-local: + $(mkinstalldirs) $(DESTDIR)$(libdir)/$(PACKAGE) + +uninstall-local: + $(RM) $(DESTDIR)$(libdir)/$(PACKAGE)/hostname$(EXEEXT) + $(RM) $(DESTDIR)$(libdir)/$(PACKAGE)/urlget$(EXEEXT) + $(RM) $(DESTDIR)$(libdir)/$(PACKAGE)/user-email + $(RM) $(DESTDIR)$(libdir)/$(PACKAGE)/project-id + # Special rules for Java compilation. all-local: all-java-@BUILDJAVA@ @@ -642,8 +707,11 @@ all-java-yes: gettext.jar gnu/gettext/DumpResource.class: $(srcdir)/gnu/gettext/DumpResource.java $(JAVACOMP) -d . $(srcdir)/gnu/gettext/DumpResource.java -gettext.jar: gnu/gettext/DumpResource.class - $(JAR) cf $@ gnu/gettext/DumpResource*.class +gnu/gettext/GetURL.class: $(srcdir)/gnu/gettext/GetURL.java + $(JAVACOMP) -d . $(srcdir)/gnu/gettext/GetURL.java + +gettext.jar: gnu/gettext/DumpResource.class gnu/gettext/GetURL.class + $(JAR) cf $@ gnu/gettext/DumpResource*.class gnu/gettext/GetURL*.class install-data-local: install-java-@BUILDJAVA@ install-java-no: