diff -u -r --new-file ypbind-mt-1.2/ABOUT-NLS ypbind-mt-1.3/ABOUT-NLS --- ypbind-mt-1.2/ABOUT-NLS Tue Feb 10 18:08:00 1998 +++ ypbind-mt-1.3/ABOUT-NLS Thu May 7 21:14:00 1998 @@ -137,7 +137,8 @@ International. You may reach your translation team at the address `LL@li.org', replacing LL by the two-letter ISO 639 code for your language. Language codes are *not* the same as the country codes given -in ISO 3166. The following translation teams exist, as of August 1997: +in ISO 3166. The following translation teams exist, as of December +1997: Chinese `zh', Czech `cs', Danish `da', Dutch `nl', English `en', Esperanto `eo', Finnish `fi', French `fr', German `de', Hungarian @@ -172,42 +173,42 @@ ================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of August +matrix shows the current state of internationalization, as of December 1997. The matrix shows, in regard of each package, for which languages PO files have been submitted to translation coordination. - Ready PO files cs da de en es fi fr it ja ko nl no pl pt sl sv - .-------------------------------------------------. - bash | [] [] [] | 3 - bison | [] [] [] | 3 - clisp | [] [] [] [] | 4 - cpio | [] [] [] [] [] | 5 - diffutils | [] [] [] [] [] | 5 - enscript | [] [] [] [] [] [] | 6 - fileutils | [] [] [] [] [] [] [] [] [] [] | 10 - findutils | [] [] [] [] [] [] [] [] | 8 - flex | [] [] [] [] | 4 - gcal | [] [] [] [] [] | 5 - gettext | [] [] [] [] [] [] [] [] [] [] | 11 - grep | [] [] [] [] [] [] [] [] [] | 9 - hello | [] [] [] [] [] [] [] [] [] [] | 10 - id-utils | [] [] [] | 3 - indent | [] [] [] [] | 4 - libc | [] [] [] [] [] [] [] | 7 - m4 | [] [] [] [] [] | 5 - make | [] [] [] [] [] [] | 6 - music | [] [] | 2 - ptx | [] [] [] [] [] [] [] [] | 8 - recode | [] [] [] [] [] [] [] [] [] | 9 - sh-utils | [] [] [] [] [] [] [] | 7 - sharutils | [] [] [] [] [] | 5 - tar | [] [] [] [] [] [] [] [] [] [] | 10 - texinfo | [] | 1 - textutils | [] [] [] [] [] [] [] [] [] | 9 - wdiff | [] [] [] [] [] [] [] [] | 8 - `-------------------------------------------------' - 16 languages cs da de en es fi fr it ja ko nl no pl pt sl sv - 27 packages 3 2 24 1 17 1 26 2 1 11 20 9 19 7 7 17 167 + Ready PO files cs da de en es fi fr it ja ko nl no pl pt ru sl sv + .----------------------------------------------------. + bash | [] [] [] | 3 + bison | [] [] [] | 3 + clisp | [] [] [] [] | 4 + cpio | [] [] [] [] [] [] | 6 + diffutils | [] [] [] [] [] | 5 + enscript | [] [] [] [] [] [] | 6 + fileutils | [] [] [] [] [] [] [] [] [] [] | 10 + findutils | [] [] [] [] [] [] [] [] [] | 9 + flex | [] [] [] [] | 4 + gcal | [] [] [] [] [] | 5 + gettext | [] [] [] [] [] [] [] [] [] [] [] | 12 + grep | [] [] [] [] [] [] [] [] [] [] | 10 + hello | [] [] [] [] [] [] [] [] [] [] [] | 11 + id-utils | [] [] [] | 3 + indent | [] [] [] [] [] | 5 + libc | [] [] [] [] [] [] [] | 7 + m4 | [] [] [] [] [] [] | 6 + make | [] [] [] [] [] [] | 6 + music | [] [] | 2 + ptx | [] [] [] [] [] [] [] [] | 8 + recode | [] [] [] [] [] [] [] [] [] | 9 + sh-utils | [] [] [] [] [] [] [] [] | 8 + sharutils | [] [] [] [] [] [] | 6 + tar | [] [] [] [] [] [] [] [] [] [] [] | 11 + texinfo | [] [] [] | 3 + textutils | [] [] [] [] [] [] [] [] [] | 9 + wdiff | [] [] [] [] [] [] [] [] | 8 + `----------------------------------------------------' + 17 languages cs da de en es fi fr it ja ko nl no pl pt ru sl sv + 27 packages 6 4 25 1 18 1 26 2 1 12 20 9 19 7 4 7 17 179 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -220,6 +221,6 @@ lag between the mere existence a PO file and its wide availability in a distribution. - If August 1997 seems to be old, you may fetch a more recent copy of -this `ABOUT-NLS' file on most GNU archive sites. + If December 1997 seems to be old, you may fetch a more recent copy +of this `ABOUT-NLS' file on most GNU archive sites. diff -u -r --new-file ypbind-mt-1.2/AUTHORS ypbind-mt-1.3/AUTHORS --- ypbind-mt-1.2/AUTHORS Thu Jan 1 02:00:00 1970 +++ ypbind-mt-1.3/AUTHORS Sun Apr 19 17:45:08 1998 @@ -0,0 +1,3 @@ +Authors of ypmake-mt: + +Thorsten Kukuk. First version of this package. diff -u -r --new-file ypbind-mt-1.2/ChangeLog ypbind-mt-1.3/ChangeLog --- ypbind-mt-1.2/ChangeLog Sun Apr 19 11:37:24 1998 +++ ypbind-mt-1.3/ChangeLog Wed Jul 1 21:45:22 1998 @@ -1,19 +1,54 @@ +1998-07-01 Thorsten Kukuk + + * release version 1.3 + + * man/ypbind.8.in: Add description of -c parameter. + + * src/ypbind-mt.c (load_config): Add error message. + (main): Better check for binding dir, add check option for yp.conf. + +1998-06-07 Thorsten Kukuk + + * etc/ypbind.init: Remove binding dir entries after killing ypbind. + +1998-05-24 Thorsten Kukuk + + * configure.in: Add efence support, fix for gettext 0.10.35, + Fix check for broken kernel versions (2.1.1xx isn't broken). + + * acinclude.m4: New, macros for efence. + +1998-04-28 Thorsten Kukuk + + * src/serv_list.c (add_server): Check if h_addr_list[0] is != NULL. + Reportet by Arnim Frithjof Brestrich . + +1998-04-20 Thorsten Kukuk + + * configure.in: Add dmalloc support. + + * acconfig.h: Add WITH_DMALLOC. + + * man/yp.conf.5.in: Fix Typo. + + * ypbind-mt.spec: Install yp.conf.5. + 1998-04-19 Thorsten Kukuk * release version 1.2 * src/serv_list.c (find_domain): If doamin is unbound, try to - find a new server + find a new server. 1998-04-18 Thorsten Kukuk - * configure.in: Create man/sedscript + * configure.in: Create man/sedscript. 1998-04-17 Thorsten Kukuk * man/ypbind.8.in: Fix some more comments. - * man/yp.conf.5: New. + * man/yp.conf.5.in: New. * src/serv_list.c: Save current status if ypset is used. diff -u -r --new-file ypbind-mt-1.2/Makefile.am ypbind-mt-1.3/Makefile.am --- ypbind-mt-1.2/Makefile.am Sun Mar 8 13:21:04 1998 +++ ypbind-mt-1.3/Makefile.am Sun Apr 19 18:19:14 1998 @@ -3,7 +3,7 @@ # # Author: Thorsten Kukuk # -AUTOMAKE_OPTIONS = 1.2 foreign +AUTOMAKE_OPTIONS = 1.3 gnits MAINT_CHARSET = latin1 # SUBDIRS = intl lib src man po diff -u -r --new-file ypbind-mt-1.2/Makefile.in ypbind-mt-1.3/Makefile.in --- ypbind-mt-1.2/Makefile.in Sun Apr 19 11:49:26 1998 +++ ypbind-mt-1.3/Makefile.in Wed Jul 1 22:17:52 1998 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.3 from Makefile.am # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -38,6 +38,8 @@ includedir = @includedir@ oldincludedir = /usr/include +DISTDIR = + pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -93,7 +95,7 @@ WARNFLAGS = @WARNFLAGS@ l = @l@ -AUTOMAKE_OPTIONS = 1.2 foreign +AUTOMAKE_OPTIONS = 1.3 gnits MAINT_CHARSET = latin1 # SUBDIRS = intl lib src man po @@ -105,27 +107,27 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = -DIST_COMMON = README ABOUT-NLS COPYING ChangeLog INSTALL Makefile.am \ -Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess config.h.in \ -config.sub configure configure.in install-sh missing mkinstalldirs \ -stamp-h.in +DIST_COMMON = README ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL \ +Makefile.am Makefile.in NEWS THANKS TODO acconfig.h acinclude.m4 \ +aclocal.m4 config.guess config.h.in config.sub configure configure.in \ +install-sh missing mkinstalldirs stamp-h.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP = --best -default: all +all: all-recursive-am all-am .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnits --include-deps Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(ACLOCAL_M4): configure.in +$(ACLOCAL_M4): configure.in acinclude.m4 cd $(srcdir) && $(ACLOCAL) config.status: $(srcdir)/configure @@ -252,6 +254,10 @@ GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) -rm -rf $(distdir) distdir: $(DISTFILES) + @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \ + echo "NEWS not updated; not releasing" 1>&2; \ + exit 1; \ + fi -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) @@ -291,8 +297,6 @@ uninstall: uninstall-recursive -all: all-recursive-am all-am - install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: installdirs-recursive @@ -333,12 +337,11 @@ @echo "it deletes files that may require special tools to rebuild." -rm -f config.status -.PHONY: default mostlyclean-hdr distclean-hdr clean-hdr \ -maintainer-clean-hdr install-data-recursive uninstall-data-recursive \ -install-exec-recursive uninstall-exec-recursive installdirs-recursive \ -uninstalldirs-recursive all-recursive check-recursive \ -installcheck-recursive info-recursive dvi-recursive \ -mostlyclean-recursive distclean-recursive clean-recursive \ +.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ +install-data-recursive uninstall-data-recursive install-exec-recursive \ +uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ +all-recursive check-recursive installcheck-recursive info-recursive \ +dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ installcheck all-recursive-am all-am install-exec install-data install \ diff -u -r --new-file ypbind-mt-1.2/NEWS ypbind-mt-1.3/NEWS --- ypbind-mt-1.2/NEWS Sun Apr 19 11:38:53 1998 +++ ypbind-mt-1.3/NEWS Wed Jul 1 21:46:39 1998 @@ -6,6 +6,12 @@ . +Version 1.3 + +* Add -c option for checking config file for syntax errors +* Bug fixes + + Version 1.2 * Save current host list if ypset is used. Now we use the old diff -u -r --new-file ypbind-mt-1.2/README ypbind-mt-1.3/README --- ypbind-mt-1.2/README Sun Apr 19 11:40:41 1998 +++ ypbind-mt-1.3/README Wed Jul 1 21:50:46 1998 @@ -1,5 +1,5 @@ -This directory contains the version 1.2 of the ypbind-mt. +This directory contains the version 1.3 of the ypbind-mt. As of this release, ypbind-mt is known to run on the following @@ -38,4 +38,4 @@ * Binds to the server which answered as first -Thorsten Kukuk , 19. April 1998 +Thorsten Kukuk , 1. July 1998 diff -u -r --new-file ypbind-mt-1.2/THANKS ypbind-mt-1.3/THANKS --- ypbind-mt-1.2/THANKS Thu Jan 1 02:00:00 1970 +++ ypbind-mt-1.3/THANKS Tue Apr 28 17:40:06 1998 @@ -0,0 +1,7 @@ +ypbind-mt was originally written by Thorsten Kukuk . +It would not be what it is today without the invaluable help of these +people: + +Arnim Frithjof Brestrich brest@rumms.uni-mannheim.de +Peter T. Breuer ptb@it.uc3m.es + diff -u -r --new-file ypbind-mt-1.2/TODO ypbind-mt-1.3/TODO --- ypbind-mt-1.2/TODO Sun Apr 19 11:34:59 1998 +++ ypbind-mt-1.3/TODO Wed Jul 1 21:36:14 1998 @@ -8,3 +8,6 @@ * Try to reconfigure the host search order for other libraries then glibc (like Solaris, Linux libc5, Linux libc5+NYS) + * Fix the stupid yp.conf parser + + * Write a better parser for yp.conf diff -u -r --new-file ypbind-mt-1.2/acconfig.h ypbind-mt-1.3/acconfig.h --- ypbind-mt-1.2/acconfig.h Wed Apr 1 20:54:48 1998 +++ ypbind-mt-1.3/acconfig.h Sun May 24 10:42:36 1998 @@ -25,3 +25,8 @@ /* Define as 1 if defines socklen_t. */ #undef HAVE_SOCKLEN_T +/* Define as 1 if dmalloc should be used. */ +#undef WITH_DMALLOC + +/* Define as 1 if efence should be used. */ +#undef WITH_EFENCE diff -u -r --new-file ypbind-mt-1.2/acinclude.m4 ypbind-mt-1.3/acinclude.m4 --- ypbind-mt-1.2/acinclude.m4 Thu Jan 1 02:00:00 1970 +++ ypbind-mt-1.3/acinclude.m4 Sun May 24 10:55:17 1998 @@ -0,0 +1,20 @@ +## ---------------------------------- ## +## Check if --with-efence was given. ## +## ---------------------------------- ## + +# serial 1 + +AC_DEFUN(AM_WITH_EFENCE, +[AC_MSG_CHECKING(if malloc debugging with efence is wanted) +AC_ARG_WITH(efence, +[ --with-efence use ElectricFence 2.05], +[if test "$withval" = yes; then + AC_MSG_RESULT(yes) + AC_DEFINE(WITH_EFENCE) + LIBS="$LIBS -lefence" + LDFLAGS="$LDFLAGS -g" + CFLAGS="-g" +else + AC_MSG_RESULT(no) +fi], [AC_MSG_RESULT(no)]) +]) diff -u -r --new-file ypbind-mt-1.2/aclocal.m4 ypbind-mt-1.3/aclocal.m4 --- ypbind-mt-1.2/aclocal.m4 Sun Apr 19 11:34:31 1998 +++ ypbind-mt-1.3/aclocal.m4 Wed Jul 1 21:47:16 1998 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.2f +dnl aclocal.m4 generated automatically by aclocal 1.3 dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. dnl This Makefile.in is free software; the Free Software Foundation @@ -10,6 +10,24 @@ dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A dnl PARTICULAR PURPOSE. + +# serial 1 + +AC_DEFUN(AM_WITH_EFENCE, +[AC_MSG_CHECKING(if malloc debugging with efence is wanted) +AC_ARG_WITH(efence, +[ --with-efence use ElectricFence 2.05], +[if test "$withval" = yes; then + AC_MSG_RESULT(yes) + AC_DEFINE(WITH_EFENCE) + LIBS="$LIBS -lefence" + LDFLAGS="$LDFLAGS -g" + CFLAGS="-g" +else + AC_MSG_RESULT(no) +fi], [AC_MSG_RESULT(no)]) +]) + # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. # But this isn't really a big deal. @@ -134,15 +152,33 @@ done<<>>dnl>>) changequote([,]))]) + +# serial 1 + +AC_DEFUN(AM_WITH_DMALLOC, +[AC_MSG_CHECKING(if malloc debugging is wanted) +AC_ARG_WITH(dmalloc, +[ --with-dmalloc use dmalloc, as in + ftp://ftp.letters.com/src/dmalloc/dmalloc.tar.gz], +[if test "$withval" = yes; then + AC_MSG_RESULT(yes) + AC_DEFINE(WITH_DMALLOC) + LIBS="$LIBS -ldmalloc" + LDFLAGS="$LDFLAGS -g" +else + AC_MSG_RESULT(no) +fi], [AC_MSG_RESULT(no)]) +]) + # Macro to add for using GNU gettext. # Ulrich Drepper , 1995. # -# This file file be copied and used freely without restrictions. It can +# This file can be copied and used freely without restrictions. It can # be used in projects which are not available under the GNU Public License # but which still want to provide support for the GNU gettext functionality. # Please note that the actual code is *not* freely available. -# serial 3 +# serial 5 AC_DEFUN(AM_WITH_NLS, [AC_MSG_CHECKING([whether NLS is requested]) @@ -184,9 +220,10 @@ AC_CHECK_LIB(intl, bindtextdomain, [AC_CACHE_CHECK([for gettext in libintl], gt_cv_func_gettext_libintl, - [AC_TRY_LINK([], [return (int) gettext ("")], - gt_cv_func_gettext_libintl=yes, - gt_cv_func_gettext_libintl=no)])]) + [AC_CHECK_LIB(intl, gettext, + gt_cv_func_gettext_libintl=yes, + gt_cv_func_gettext_libintl=no)], + gt_cv_func_gettext_libintl=no)]) fi if test "$gt_cv_func_gettext_libc" = "yes" \ @@ -280,7 +317,7 @@ : ; else AC_MSG_RESULT( - [found xgettext programs is not GNU xgettext; ignore it]) + [found xgettext program is not GNU xgettext; ignore it]) XGETTEXT=":" fi fi @@ -292,6 +329,12 @@ nls_cv_header_intl=intl/libintl.h nls_cv_header_libgt=intl/libgettext.h fi + AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac]) + # If this is used in GNU gettext we have to set USE_NLS to `yes' # because some of the sources are only built for this goal. @@ -336,9 +379,9 @@ AC_REQUIRE([AC_FUNC_MMAP])dnl AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ -unistd.h values.h sys/param.h]) +unistd.h sys/param.h]) AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ -__argz_count __argz_stringify __argz_next]) +strdup __argz_count __argz_stringify __argz_next]) if test "${ac_cv_func_stpcpy+set}" != "set"; then AC_CHECK_FUNCS(stpcpy) @@ -446,7 +489,7 @@ # Search path for a program which passes the given test. # Ulrich Drepper , 1996. # -# This file file be copied and used freely without restrictions. It can +# This file can be copied and used freely without restrictions. It can # be used in projects which are not available under the GNU Public License # but which still want to provide support for the GNU gettext functionality. # Please note that the actual code is *not* freely available. @@ -494,7 +537,7 @@ # Check whether LC_MESSAGES is available in . # Ulrich Drepper , 1995. # -# This file file be copied and used freely without restrictions. It can +# This file can be copied and used freely without restrictions. It can # be used in projects which are not available under the GNU Public License # but which still want to provide support for the GNU gettext functionality. # Please note that the actual code is *not* freely available. diff -u -r --new-file ypbind-mt-1.2/config.h.in ypbind-mt-1.3/config.h.in --- ypbind-mt-1.2/config.h.in Wed Apr 1 20:57:32 1998 +++ ypbind-mt-1.3/config.h.in Wed Jul 1 18:51:03 1998 @@ -67,6 +67,12 @@ /* Define as 1 if defines socklen_t. */ #undef HAVE_SOCKLEN_T +/* Define as 1 if dmalloc should be used. */ +#undef WITH_DMALLOC + +/* Define as 1 if efence should be used. */ +#undef WITH_EFENCE + /* Define if you have the __argz_count function. */ #undef HAVE___ARGZ_COUNT @@ -121,6 +127,9 @@ /* Define if you have the strchr function. */ #undef HAVE_STRCHR +/* Define if you have the strdup function. */ +#undef HAVE_STRDUP + /* Define if you have the header file. */ #undef HAVE_ARGZ_H @@ -159,9 +168,6 @@ /* Define if you have the header file. */ #undef HAVE_UNISTD_H - -/* Define if you have the header file. */ -#undef HAVE_VALUES_H /* Define if you have the i library (-li). */ #undef HAVE_LIBI diff -u -r --new-file ypbind-mt-1.2/configure ypbind-mt-1.3/configure --- ypbind-mt-1.2/configure Sun Apr 19 11:34:34 1998 +++ ypbind-mt-1.3/configure Wed Jul 1 21:47:19 1998 @@ -13,6 +13,11 @@ # Any additions from configure.in: ac_default_prefix=/usr ac_help="$ac_help + --with-dmalloc use dmalloc, as in + ftp://ftp.letters.com/src/dmalloc/dmalloc.tar.gz" +ac_help="$ac_help + --with-efence use ElectricFence 2.05" +ac_help="$ac_help --disable-nls do not use Native Language Support" ac_help="$ac_help --with-included-gettext use the GNU gettext library included here" @@ -555,7 +560,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:559: checking for a BSD compatible install" >&5 +echo "configure:564: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -608,7 +613,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:612: checking whether build environment is sane" >&5 +echo "configure:617: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -665,7 +670,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:669: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:674: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -694,7 +699,7 @@ PACKAGE=ypbind-mt -VERSION=1.2 +VERSION=1.3 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -711,7 +716,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:715: checking for working aclocal" >&5 +echo "configure:720: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -724,7 +729,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:728: checking for working autoconf" >&5 +echo "configure:733: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -737,7 +742,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:741: checking for working automake" >&5 +echo "configure:746: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -750,7 +755,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:754: checking for working autoheader" >&5 +echo "configure:759: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -763,7 +768,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:767: checking for working makeinfo" >&5 +echo "configure:772: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -793,7 +798,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:797: checking host system type" >&5 +echo "configure:802: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -819,7 +824,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:823: checking for $ac_word" >&5 +echo "configure:828: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -848,7 +853,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:852: checking for $ac_word" >&5 +echo "configure:857: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -896,7 +901,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:900: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:905: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -906,11 +911,11 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -930,12 +935,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:934: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:939: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:939: checking whether we are using GNU C" >&5 +echo "configure:944: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -944,7 +949,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:948: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -959,7 +964,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:963: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:968: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -990,7 +995,7 @@ test -n "$GCC" && WARNFLAGS="-Wall" echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:994: checking for POSIXized ISC" >&5 +echo "configure:999: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1021,7 +1026,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1025: checking for a BSD compatible install" >&5 +echo "configure:1030: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1071,7 +1076,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1075: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1080: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1097,9 +1102,82 @@ SET_MAKE="MAKE=${MAKE-make}" 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:1109: 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 + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="ranlib" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" +fi +fi +RANLIB="$ac_cv_prog_RANLIB" +if test -n "$RANLIB"; then + echo "$ac_t""$RANLIB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + +echo $ac_n "checking if malloc debugging is wanted""... $ac_c" 1>&6 +echo "configure:1137: checking if malloc debugging is wanted" >&5 +# Check whether --with-dmalloc or --without-dmalloc was given. +if test "${with_dmalloc+set}" = set; then + withval="$with_dmalloc" + if test "$withval" = yes; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define WITH_DMALLOC 1 +EOF + + LIBS="$LIBS -ldmalloc" + LDFLAGS="$LDFLAGS -g" +else + echo "$ac_t""no" 1>&6 +fi +else + echo "$ac_t""no" 1>&6 +fi + + +echo $ac_n "checking if malloc debugging with efence is wanted""... $ac_c" 1>&6 +echo "configure:1158: checking if malloc debugging with efence is wanted" >&5 +# Check whether --with-efence or --without-efence was given. +if test "${with_efence+set}" = set; then + withval="$with_efence" + if test "$withval" = yes; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define WITH_EFENCE 1 +EOF + + LIBS="$LIBS -lefence" + LDFLAGS="$LDFLAGS -g" + CFLAGS="-g" +else + echo "$ac_t""no" 1>&6 +fi +else + echo "$ac_t""no" 1>&6 +fi + + echo $ac_n "checking for yp_get_default_domain in -lnsl""... $ac_c" 1>&6 -echo "configure:1103: checking for yp_get_default_domain in -lnsl" >&5 +echo "configure:1181: checking for yp_get_default_domain in -lnsl" >&5 ac_lib_var=`echo nsl'_'yp_get_default_domain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1107,7 +1185,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1146,7 +1224,7 @@ fi echo $ac_n "checking for bind in -lsocket""... $ac_c" 1>&6 -echo "configure:1150: checking for bind in -lsocket" >&5 +echo "configure:1228: checking for bind in -lsocket" >&5 ac_lib_var=`echo socket'_'bind | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1154,7 +1232,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1193,7 +1271,7 @@ fi echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:1197: checking for pthread_create in -lpthread" >&5 +echo "configure:1275: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1201,7 +1279,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1243,12 +1321,12 @@ for ac_func in __nss_configure_lookup do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1247: checking for $ac_func" >&5 +echo "configure:1325: 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; then +if { (eval echo configure:1353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1297,7 +1375,7 @@ if eval "test \"`echo '$ac_cv_func___nss_configure_lookup'`\" != yes"; then echo $ac_n "checking for res_gethostbyname in -lresolv""... $ac_c" 1>&6 -echo "configure:1301: checking for res_gethostbyname in -lresolv" >&5 +echo "configure:1379: checking for res_gethostbyname in -lresolv" >&5 ac_lib_var=`echo resolv'_'res_gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1305,7 +1383,7 @@ ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1346,12 +1424,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1350: checking for working const" >&5 +echo "configure:1428: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1422,16 +1500,16 @@ echo $ac_n "checking wether defiens socklen_t""... $ac_c" 1>&6 -echo "configure:1426: checking wether defiens socklen_t" >&5 +echo "configure:1504: checking wether defiens socklen_t" >&5 cat > conftest.$ac_ext < int main() { socklen_t sock; ; return 0; } EOF -if { (eval echo configure:1435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* SOCKLEN_T=yes else @@ -1452,7 +1530,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1456: checking how to run the C preprocessor" >&5 +echo "configure:1534: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1467,13 +1545,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1484,13 +1562,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1516,17 +1594,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1520: checking for $ac_hdr" >&5 +echo "configure:1598: 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:1530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1556,12 +1634,12 @@ for ac_func in getline getdelim res_gethostbyname _dns_gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1560: checking for $ac_func" >&5 +echo "configure:1638: 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; then +if { (eval echo configure:1666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1609,42 +1687,13 @@ done -# 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:1616: 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 - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="ranlib" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" -fi -fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1643: checking for ANSI C header files" >&5 +echo "configure:1692: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1652,7 +1701,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1669,7 +1718,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1687,7 +1736,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1708,7 +1757,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1719,7 +1768,7 @@ exit (0); } EOF -if { (eval echo configure:1723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1743,21 +1792,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1747: checking for inline" >&5 +echo "configure:1796: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1783,12 +1832,12 @@ esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:1787: checking for off_t" >&5 +echo "configure:1836: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1816,12 +1865,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1820: checking for size_t" >&5 +echo "configure:1869: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1851,19 +1900,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1855: checking for working alloca.h" >&5 +echo "configure:1904: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -1884,12 +1933,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1888: checking for alloca" >&5 +echo "configure:1937: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+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; then +if { (eval echo configure:1965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -1944,12 +1993,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1948: checking whether alloca needs Cray hooks" >&5 +echo "configure:1997: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:1978: checking for $ac_func" >&5 +echo "configure:2027: 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; then +if { (eval echo configure:2055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2029,7 +2078,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2033: checking stack direction for C alloca" >&5 +echo "configure:2082: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2037,7 +2086,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2081,17 +2130,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2085: checking for $ac_hdr" >&5 +echo "configure:2134: 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:2095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2120,12 +2169,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2124: checking for $ac_func" >&5 +echo "configure:2173: 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; then +if { (eval echo configure:2201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2173,7 +2222,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2177: checking for working mmap" >&5 +echo "configure:2226: 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 @@ -2181,7 +2230,7 @@ ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -2345,21 +2394,21 @@ for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \ -unistd.h values.h sys/param.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:2353: checking for $ac_hdr" >&5 +echo "configure:2402: 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:2363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2386,15 +2435,15 @@ done for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \ -__argz_count __argz_stringify __argz_next +strdup __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2393: checking for $ac_func" >&5 +echo "configure:2442: 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; then +if { (eval echo configure:2470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2446,12 +2495,12 @@ for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2450: checking for $ac_func" >&5 +echo "configure:2499: 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; then +if { (eval echo configure:2527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2508,19 +2557,19 @@ if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:2512: checking for LC_MESSAGES" >&5 +echo "configure:2561: 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:2524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -2541,7 +2590,7 @@ fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:2545: checking whether NLS is requested" >&5 +echo "configure:2594: 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" @@ -2561,7 +2610,7 @@ EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:2565: checking whether included gettext is requested" >&5 +echo "configure:2614: 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" @@ -2580,17 +2629,17 @@ ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:2584: checking for libintl.h" >&5 +echo "configure:2633: 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:2594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2643: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2607,19 +2656,19 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:2611: checking for gettext in libc" >&5 +echo "configure:2660: checking for gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:2623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -2635,7 +2684,7 @@ if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:2639: checking for bindtextdomain in -lintl" >&5 +echo "configure:2688: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2643,7 +2692,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2670,28 +2719,51 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:2674: checking for gettext in libintl" >&5 +echo "configure:2723: checking for gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext <&6 +echo "configure:2728: checking for gettext in -lintl" >&5 +ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lintl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* - gt_cv_func_gettext_libintl=yes + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - gt_cv_func_gettext_libintl=no + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + gt_cv_func_gettext_libintl=yes +else + echo "$ac_t""no" 1>&6 +gt_cv_func_gettext_libintl=no +fi + fi echo "$ac_t""$gt_cv_func_gettext_libintl" 1>&6 @@ -2710,7 +2782,7 @@ # 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:2714: checking for $ac_word" >&5 +echo "configure:2786: 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 @@ -2744,12 +2816,12 @@ for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2748: checking for $ac_func" >&5 +echo "configure:2820: 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; then +if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2799,7 +2871,7 @@ # 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:2803: checking for $ac_word" >&5 +echo "configure:2875: 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 @@ -2831,7 +2903,7 @@ # 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:2835: checking for $ac_word" >&5 +echo "configure:2907: 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 @@ -2863,7 +2935,7 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -2894,7 +2966,7 @@ if test "$CATOBJEXT" = "NONE"; then echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:2898: checking whether catgets can be used" >&5 +echo "configure:2970: checking whether catgets can be used" >&5 # Check whether --with-catgets or --without-catgets was given. if test "${with_catgets+set}" = set; then withval="$with_catgets" @@ -2907,7 +2979,7 @@ if test "$nls_cv_use_catgets" = "yes"; then echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:2911: checking for main in -li" >&5 +echo "configure:2983: checking for main in -li" >&5 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2915,14 +2987,14 @@ ac_save_LIBS="$LIBS" LIBS="-li $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2950,12 +3022,12 @@ fi echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:2954: checking for catgets" >&5 +echo "configure:3026: checking for catgets" >&5 if eval "test \"`echo '$''{'ac_cv_func_catgets'+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; then +if { (eval echo configure:3054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_catgets=yes" else @@ -3000,7 +3072,7 @@ # Extract the first word of "gencat", so it can be a program name with args. set dummy gencat; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3004: checking for $ac_word" >&5 +echo "configure:3076: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3032,7 +3104,7 @@ # 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:3036: checking for $ac_word" >&5 +echo "configure:3108: 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 @@ -3065,7 +3137,7 @@ # 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:3069: checking for $ac_word" >&5 +echo "configure:3141: 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 @@ -3100,7 +3172,7 @@ # 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:3104: checking for $ac_word" >&5 +echo "configure:3176: 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 @@ -3158,7 +3230,7 @@ # 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:3162: checking for $ac_word" >&5 +echo "configure:3234: 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 @@ -3192,7 +3264,7 @@ # 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:3196: checking for $ac_word" >&5 +echo "configure:3268: 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 @@ -3224,7 +3296,7 @@ # 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:3228: checking for $ac_word" >&5 +echo "configure:3300: 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 @@ -3271,7 +3343,7 @@ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else - echo "$ac_t""found xgettext programs is not GNU xgettext; ignore it" 1>&6 + echo "$ac_t""found xgettext program is not GNU xgettext; ignore it" 1>&6 XGETTEXT=":" fi fi @@ -3283,6 +3355,9 @@ nls_cv_header_intl=intl/libintl.h nls_cv_header_libgt=intl/libgettext.h fi + + + # If this is used in GNU gettext we have to set USE_NLS to `yes' # because some of the sources are only built for this goal. @@ -3314,7 +3389,7 @@ LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:3318: checking for catalogs to be installed" >&5 +echo "configure:3393: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -3342,17 +3417,17 @@ if test "$CATOBJEXT" = ".cat"; then ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:3346: checking for linux/version.h" >&5 +echo "configure:3421: checking for linux/version.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:3356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3431: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3417,7 +3492,6 @@ < $srcdir/po/POTFILES.in > po/POTFILES - USE_PIDFILE=1 USE_BROADCAST=0 @@ -3425,9 +3499,9 @@ linux-gnu) USE_BROADCAST=1 echo $ac_n "checking wether we have glibc 2.1 or later""... $ac_c" 1>&6 -echo "configure:3429: checking wether we have glibc 2.1 or later" >&5 +echo "configure:3503: checking wether we have glibc 2.1 or later" >&5 cat > conftest.$ac_ext < int main() { @@ -3438,7 +3512,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:3442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* CLNTUDPSRC=yes else @@ -3456,9 +3530,9 @@ fi echo $ac_n "checking kernel version""... $ac_c" 1>&6 -echo "configure:3460: checking kernel version" >&5 +echo "configure:3534: checking kernel version" >&5 case `uname -r 2>&1` in - 0.* | 1.* | 2.0.* | 2.1.[0-8]* ) + 0.* | 1.* | 2.0.* | 2.1.[0-9] | 2.1.[0-8]? ) kernel_is_recent="has thread/file locking bug" USE_PIDFILE=0 ;; @@ -3658,8 +3732,8 @@ s%@host_os@%$host_os%g s%@CC@%$CC%g s%@WARNFLAGS@%$WARNFLAGS%g -s%@CPP@%$CPP%g s%@RANLIB@%$RANLIB%g +s%@CPP@%$CPP%g s%@ALLOCA@%$ALLOCA%g s%@USE_NLS@%$USE_NLS%g s%@MSGFMT@%$MSGFMT%g @@ -3942,12 +4016,15 @@ cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h +case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac \ - chmod +x man/sedscript; \ - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + chmod +x man/sedscript exit 0 EOF chmod +x $CONFIG_STATUS diff -u -r --new-file ypbind-mt-1.2/configure.in ypbind-mt-1.3/configure.in --- ypbind-mt-1.2/configure.in Sun Apr 19 11:34:30 1998 +++ ypbind-mt-1.3/configure.in Wed Jul 1 21:46:49 1998 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/ypbind-mt.c) -AM_INIT_AUTOMAKE(ypbind-mt, 1.2) +AM_INIT_AUTOMAKE(ypbind-mt, 1.3) AM_CONFIG_HEADER(config.h) AC_PREFIX_DEFAULT(/usr) @@ -22,6 +22,10 @@ AC_ISC_POSIX AC_PROG_INSTALL AC_PROG_MAKE_SET +AC_PROG_RANLIB + +AM_WITH_DMALLOC +AM_WITH_EFENCE dnl Checks for libraries. AC_CHECK_LIB(nsl, yp_get_default_domain) @@ -55,7 +59,6 @@ dnl internationalization macros AM_GNU_GETTEXT -AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) dnl By default, use PID file locking USE_PIDFILE=1 @@ -88,7 +91,7 @@ AC_MSG_CHECKING(kernel version) changequote(,)dnl case `uname -r 2>&1` in - 0.* | 1.* | 2.0.* | 2.1.[0-8]* ) + 0.* | 1.* | 2.0.* | 2.1.[0-9] | 2.1.[0-8]? ) kernel_is_recent="has thread/file locking bug" USE_PIDFILE=0 ;; @@ -143,5 +146,4 @@ AC_OUTPUT([Makefile intl/Makefile lib/Makefile src/Makefile man/Makefile \ po/Makefile.in man/sedscript],\ - [chmod +x man/sedscript; \ - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]) + [chmod +x man/sedscript]) diff -u -r --new-file ypbind-mt-1.2/etc/ypbind.init ypbind-mt-1.3/etc/ypbind.init --- ypbind-mt-1.2/etc/ypbind.init Tue Feb 24 20:14:08 1998 +++ ypbind-mt-1.3/etc/ypbind.init Sun Jun 7 12:55:52 1998 @@ -24,6 +24,8 @@ stop) echo -n "Shuting down NIS services: " killproc ypbind + # Remove binding files, if ypbind "forget" it + rm -f /var/yp/binding/* rm -f /var/lock/subsys/ypbind echo ;; @@ -40,4 +42,3 @@ esac exit 0 - diff -u -r --new-file ypbind-mt-1.2/intl/ChangeLog ypbind-mt-1.3/intl/ChangeLog --- ypbind-mt-1.2/intl/ChangeLog Tue Feb 10 18:06:50 1998 +++ ypbind-mt-1.3/intl/ChangeLog Thu May 7 21:13:51 1998 @@ -1,3 +1,67 @@ +1998-04-29 Ulrich Drepper + + * intl/localealias.c (read_alias_file): Use unsigned char for + local variables. Remove unused variable tp. + * intl/l10nflist.c (_nl_normalize_codeset): Use unsigned char * + for type of codeset. For loosing Solaris systems. + * intl/loadinfo.h: Adapt prototype of _nl_normalize_codeset. + * intl/bindtextdom.c (BINDTEXTDOMAIN): Don't define local variable + len if not needed. + Patches by Jim Meyering. + +1998-04-28 Ulrich Drepper + + * loadmsgcat.c (_nl_load_domain): Don't assign the element use_mmap if + mmap is not supported. + + * hash-string.h: Don't include . + +1998-04-27 Ulrich Drepper + + * textdomain.c: Use strdup is available. + + * localealias.c: Define HAVE_MEMPCPY so that we can use this + function. Define and use semapahores to protect modfication of + global objects when compiling for glibc. Add code to allow + freeing alias table. + + * l10nflist.c: Don't assume stpcpy not being a macro. + + * gettextP.h: Define internal_function macri if not already done. + Use glibc byte-swap macros instead of defining SWAP when compiled + for glibc. + (struct loaded_domain): Add elements to allow unloading. + + * Makefile.in (distclean): Don't remove libintl.h here. + + * bindtextdomain.c: Carry over changes from glibc. Use strdup if + available. + + * dcgettext.c: Don't assume stpcpy not being a macro. Mark internal + functions. Add memory freeing code for glibc. + + * dgettext.c: Update copyright. + + * explodename.c: Include stdlib.h and string.h only if they exist. + Use strings.h eventually. + + * finddomain.c: Mark internal functions. Use strdup if available. + Add memory freeing code for glibc. + +1997-10-10 20:00 Ulrich Drepper + + * libgettext.h: Fix dummy textdomain and bindtextdomain macros. + They should return reasonable values. + Reported by Tom Tromey . + +1997-09-16 03:33 Ulrich Drepper + + * libgettext.h: Define PARAMS also to `args' if __cplusplus is defined. + * intlh.inst.in: Likewise. + Reported by Jean-Marc Lasgouttes . + + * libintl.glibc: Update from current glibc version. + 1997-09-06 02:10 Ulrich Drepper * intlh.inst.in: Reformat copyright. diff -u -r --new-file ypbind-mt-1.2/intl/Makefile.in ypbind-mt-1.3/intl/Makefile.in --- ypbind-mt-1.2/intl/Makefile.in Tue Feb 10 18:06:50 1998 +++ ypbind-mt-1.3/intl/Makefile.in Thu May 7 21:13:51 1998 @@ -171,7 +171,7 @@ clean: mostlyclean distclean: clean - rm -f Makefile ID TAGS po2msg.sed po2tbl.sed libintl.h + rm -f Makefile ID TAGS po2msg.sed po2tbl.sed maintainer-clean: distclean @echo "This command is intended for maintainers to use;" diff -u -r --new-file ypbind-mt-1.2/intl/VERSION ypbind-mt-1.3/intl/VERSION --- ypbind-mt-1.2/intl/VERSION Tue Feb 10 18:06:50 1998 +++ ypbind-mt-1.3/intl/VERSION Thu May 7 21:13:51 1998 @@ -1 +1 @@ -GNU gettext library from gettext-0.10.32 +GNU gettext library from gettext-0.10.35 diff -u -r --new-file ypbind-mt-1.2/intl/bindtextdom.c ypbind-mt-1.3/intl/bindtextdom.c --- ypbind-mt-1.2/intl/bindtextdom.c Tue Feb 10 18:06:52 1998 +++ ypbind-mt-1.3/intl/bindtextdom.c Thu May 7 21:13:52 1998 @@ -1,5 +1,5 @@ /* Implementation of the bindtextdomain(3) function - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -61,7 +61,9 @@ prefix. So we have to make a difference here. */ #ifdef _LIBC # define BINDTEXTDOMAIN __bindtextdomain -# define strdup(str) __strdup (str) +# ifndef strdup +# define strdup(str) __strdup (str) +# endif #else # define BINDTEXTDOMAIN bindtextdomain__ #endif @@ -133,7 +135,9 @@ else { /* We have to create a new binding. */ +#if !defined _LIBC && !defined HAVE_STRDUP size_t len; +#endif struct binding *new_binding = (struct binding *) malloc (sizeof (*new_binding)); diff -u -r --new-file ypbind-mt-1.2/intl/dcgettext.c ypbind-mt-1.3/intl/dcgettext.c --- ypbind-mt-1.2/intl/dcgettext.c Tue Feb 10 18:06:52 1998 +++ ypbind-mt-1.3/intl/dcgettext.c Thu May 7 21:13:52 1998 @@ -1,5 +1,5 @@ -/* Implementation of the dcgettext(3) function - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. +/* Implementation of the dcgettext(3) function. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -91,7 +91,9 @@ because some ANSI C functions will require linking with this object file and the name space must not be polluted. */ # define getcwd __getcwd -# define stpcpy __stpcpy +# ifndef stpcpy +# define stpcpy __stpcpy +# endif #else # if !defined HAVE_GETCWD char *getwd (); @@ -162,10 +164,11 @@ /* Prototypes for local functions. */ static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file, - const char *msgid)); -static const char *category_to_name PARAMS ((int category)); + const char *msgid)) internal_function; +static const char *category_to_name PARAMS ((int category)) internal_function; static const char *guess_category_value PARAMS ((int category, - const char *categoryname)); + const char *categoryname)) + internal_function; /* For those loosing systems which don't have `alloca' we have to add @@ -388,6 +391,7 @@ static char * +internal_function find_msg (domain_file, msgid) struct loaded_l10nfile *domain_file; const char *msgid; @@ -476,6 +480,7 @@ /* Return string representation of locale CATEGORY. */ static const char * +internal_function category_to_name (category) int category; { @@ -535,6 +540,7 @@ /* Guess value of current locale from value of the environment variables. */ static const char * +internal_function guess_category_value (category, categoryname) int category; const char *categoryname; @@ -590,4 +596,29 @@ /* Do nothing. */ ; return dest - 1; } +#endif + + +#ifdef _LIBC +/* If we want to free all resources we have to do some work at + program's end. */ +static void __attribute__ ((unused)) +free_mem (void) +{ + struct binding *runp; + + for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next) + { + free (runp->domainname); + if (runp->dirname != _nl_default_dirname) + /* Yes, this is a pointer comparison. */ + free (runp->dirname); + } + + if (_nl_current_default_domain != _nl_default_default_domain) + /* Yes, again a pointer comparison. */ + free ((char *) _nl_current_default_domain); +} + +text_set_element (__libc_subfreeres, free_mem); #endif diff -u -r --new-file ypbind-mt-1.2/intl/dgettext.c ypbind-mt-1.3/intl/dgettext.c --- ypbind-mt-1.2/intl/dgettext.c Tue Feb 10 18:06:52 1998 +++ ypbind-mt-1.3/intl/dgettext.c Thu May 7 21:13:52 1998 @@ -1,19 +1,19 @@ -/* dgettext.c -- implementation of the dgettext(3) function - Copyright (C) 1995 Software Foundation, Inc. +/* Implementation of the dgettext(3) function + Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. -This program 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, or (at your option) -any later version. + This program 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, or (at your option) + any later version. -This program 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. + This program 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 this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H # include diff -u -r --new-file ypbind-mt-1.2/intl/explodename.c ypbind-mt-1.3/intl/explodename.c --- ypbind-mt-1.2/intl/explodename.c Tue Feb 10 18:06:53 1998 +++ ypbind-mt-1.3/intl/explodename.c Thu May 7 21:13:52 1998 @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. Contributed by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify @@ -19,8 +19,15 @@ # include #endif -#include -#include +#if defined STDC_HEADERS || defined _LIBC +# include +#endif + +#if defined HAVE_STRING_H || defined _LIBC +# include +#else +# include +#endif #include #include "loadinfo.h" diff -u -r --new-file ypbind-mt-1.2/intl/finddomain.c ypbind-mt-1.3/intl/finddomain.c --- ypbind-mt-1.2/intl/finddomain.c Tue Feb 10 18:06:52 1998 +++ ypbind-mt-1.3/intl/finddomain.c Thu May 7 21:13:52 1998 @@ -1,5 +1,5 @@ /* Handle list of needed message catalogs - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. Written by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify @@ -70,6 +70,7 @@ the DOMAINNAME and CATEGORY parameters with respect to the currently established bindings. */ struct loaded_l10nfile * +internal_function _nl_find_domain (dirname, locale, domainname) const char *dirname; char *locale; @@ -95,9 +96,9 @@ language[_territory][+audience][+special][,[sponsor][_revision]] - Beside the first all of them are allowed to be missing. If the - full specified locale is not found, the less specific one are - looked for. The various part will be stripped of according to + Beside the first part all of them are allowed to be missing. If + the full specified locale is not found, the less specific one are + looked for. The various parts will be stripped off according to the following order: (1) revision (2) sponsor @@ -142,12 +143,18 @@ alias_value = _nl_expand_alias (locale); if (alias_value != NULL) { +#if defined _LIBC || defined HAVE_STRDUP + locale = strdup (alias_value); + if (locale == NULL) + return NULL; +#else size_t len = strlen (alias_value) + 1; locale = (char *) malloc (len); if (locale == NULL) return NULL; memcpy (locale, alias_value, len); +#endif } /* Now we determine the single parts of the locale name. First @@ -187,3 +194,23 @@ return retval; } + + +#ifdef _LIBC +static void __attribute__ ((unused)) +free_mem (void) +{ + struct loaded_l10nfile *runp = _nl_loaded_domains; + + while (runp != NULL) + { + struct loaded_l10nfile *here = runp; + if (runp->data != NULL) + _nl_unload_domain ((struct loaded_domain *) runp->data); + runp = runp->next; + free (here); + } +} + +text_set_element (__libc_subfreeres, free_mem); +#endif diff -u -r --new-file ypbind-mt-1.2/intl/gettext.c ypbind-mt-1.3/intl/gettext.c --- ypbind-mt-1.2/intl/gettext.c Tue Feb 10 18:06:52 1998 +++ ypbind-mt-1.3/intl/gettext.c Thu May 7 21:13:52 1998 @@ -1,4 +1,4 @@ -/* Implementation of gettext(3) function +/* Implementation of gettext(3) function. Copyright (C) 1995, 1997 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff -u -r --new-file ypbind-mt-1.2/intl/gettext.h ypbind-mt-1.3/intl/gettext.h --- ypbind-mt-1.2/intl/gettext.h Tue Feb 10 18:06:51 1998 +++ ypbind-mt-1.3/intl/gettext.h Thu May 7 21:13:51 1998 @@ -1,4 +1,4 @@ -/* Internal header for GNU gettext internationalization functions +/* Internal header for GNU gettext internationalization functions. Copyright (C) 1995, 1997 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff -u -r --new-file ypbind-mt-1.2/intl/gettextP.h ypbind-mt-1.3/intl/gettextP.h --- ypbind-mt-1.2/intl/gettextP.h Tue Feb 10 18:06:51 1998 +++ ypbind-mt-1.3/intl/gettextP.h Thu May 7 21:13:51 1998 @@ -1,5 +1,6 @@ /* Header describing internals of gettext library - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Written by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,11 +31,19 @@ # endif #endif +#ifndef internal_function +# define internal_function +#endif + #ifndef W # define W(flag, data) ((flag) ? SWAP (data) : (data)) #endif +#ifdef _LIBC +# include +# define SWAP(i) bswap_32 (i) +#else static nls_uint32 SWAP PARAMS ((nls_uint32 i)); static inline nls_uint32 @@ -43,11 +52,14 @@ { return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24); } +#endif struct loaded_domain { const char *data; + int use_mmap; + size_t mmap_size; int must_swap; nls_uint32 nstrings; struct string_desc *orig_tab; @@ -65,8 +77,12 @@ struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname, char *__locale, - const char *__domainname)); -void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain)); + const char *__domainname)) + internal_function; +void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain)) + internal_function; +void _nl_unload_domain PARAMS ((struct loaded_domain *__domain)) + internal_function; /* @@ begin of epilog @@ */ diff -u -r --new-file ypbind-mt-1.2/intl/hash-string.h ypbind-mt-1.3/intl/hash-string.h --- ypbind-mt-1.2/intl/hash-string.h Tue Feb 10 18:06:51 1998 +++ ypbind-mt-1.3/intl/hash-string.h Thu May 7 21:13:51 1998 @@ -16,10 +16,6 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifdef HAVE_VALUES_H -# include -#endif - /* @@ end of prolog @@ */ #ifndef PARAMS diff -u -r --new-file ypbind-mt-1.2/intl/l10nflist.c ypbind-mt-1.3/intl/l10nflist.c --- ypbind-mt-1.2/intl/l10nflist.c Tue Feb 10 18:06:53 1998 +++ ypbind-mt-1.3/intl/l10nflist.c Thu May 7 21:13:52 1998 @@ -1,6 +1,6 @@ /* Handle list of needed message catalogs Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - Written by Ulrich Drepper , 1995. + Contributed by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -65,7 +65,9 @@ /* Rename the non ANSI C functions. This is required by the standard because some ANSI C functions will require linking with this object file and the name space must not be polluted. */ -# define stpcpy(dest, src) __stpcpy(dest, src) +# ifndef stpcpy +# define stpcpy(dest, src) __stpcpy(dest, src) +# endif #else # ifndef HAVE_STPCPY static char *stpcpy PARAMS ((char *dest, const char *src)); @@ -350,7 +352,7 @@ names. */ const char * _nl_normalize_codeset (codeset, name_len) - const char *codeset; + const unsigned char *codeset; size_t name_len; { int len = 0; diff -u -r --new-file ypbind-mt-1.2/intl/libgettext.h ypbind-mt-1.3/intl/libgettext.h --- ypbind-mt-1.2/intl/libgettext.h Tue Feb 10 18:06:51 1998 +++ ypbind-mt-1.3/intl/libgettext.h Thu May 7 21:13:51 1998 @@ -1,5 +1,5 @@ /* Message catalogs for internationalization. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,8 +20,8 @@ include protection above. But the systems header might perhaps also define _LIBINTL_H and therefore we have to protect the definition here. */ -#if !defined (_LIBINTL_H) || !defined (_LIBGETTEXT_H) -#if !defined (_LIBINTL_H) +#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H +#ifndef _LIBINTL_H # define _LIBINTL_H 1 #endif #define _LIBGETTEXT_H 1 @@ -44,7 +44,7 @@ /* @@ end of prolog @@ */ #ifndef PARAMS -# if __STDC__ +# if __STDC__ || defined __cplusplus # define PARAMS(args) args # else # define PARAMS(args) () @@ -168,8 +168,8 @@ # define gettext(Msgid) (Msgid) # define dgettext(Domainname, Msgid) (Msgid) # define dcgettext(Domainname, Msgid, Category) (Msgid) -# define textdomain(Domainname) while (0) /* nothing */ -# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */ +# define textdomain(Domainname) ((char *) Domainname) +# define bindtextdomain(Domainname, Dirname) ((char *) Dirname) #endif diff -u -r --new-file ypbind-mt-1.2/intl/loadinfo.h ypbind-mt-1.3/intl/loadinfo.h --- ypbind-mt-1.2/intl/loadinfo.h Tue Feb 10 18:06:51 1998 +++ ypbind-mt-1.3/intl/loadinfo.h Thu May 7 21:13:51 1998 @@ -1,3 +1,21 @@ +/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1996. + + This program 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, or (at your option) + any later version. + + This program 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 this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + #ifndef PARAMS # if __STDC__ # define PARAMS(args) args @@ -32,7 +50,7 @@ }; -extern const char *_nl_normalize_codeset PARAMS ((const char *codeset, +extern const char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset, size_t name_len)); extern struct loaded_l10nfile * diff -u -r --new-file ypbind-mt-1.2/intl/loadmsgcat.c ypbind-mt-1.3/intl/loadmsgcat.c --- ypbind-mt-1.2/intl/loadmsgcat.c Tue Feb 10 18:06:52 1998 +++ ypbind-mt-1.3/intl/loadmsgcat.c Thu May 7 21:13:52 1998 @@ -1,5 +1,5 @@ -/* Load needed message catalogs - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. +/* Load needed message catalogs. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -44,7 +44,6 @@ /* Rename the non ISO C functions. This is required by the standard because some ISO C functions will require linking with this object file and the name space must not be polluted. */ -# define fstat __fstat # define open __open # define close __close # define read __read @@ -61,10 +60,12 @@ /* Load the message catalogs specified by FILENAME. If it is no valid message catalog do nothing. */ void +internal_function _nl_load_domain (domain_file) struct loaded_l10nfile *domain_file; { int fd; + size_t size; struct stat st; struct mo_file_header *data = (struct mo_file_header *) -1; #if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ @@ -90,7 +91,8 @@ /* We must know about the size of the file. */ if (fstat (fd, &st) != 0 - && st.st_size < (off_t) sizeof (struct mo_file_header)) + || (size = (size_t) st.st_size) != st.st_size + || size < sizeof (struct mo_file_header)) { /* Something went wrong. */ close (fd); @@ -101,7 +103,7 @@ || defined _LIBC /* Now we are ready to load the file. If mmap() is available we try this first. If not available or it failed we try to load it. */ - data = (struct mo_file_header *) mmap (NULL, st.st_size, PROT_READ, + data = (struct mo_file_header *) mmap (NULL, size, PROT_READ, MAP_PRIVATE, fd, 0); if (data != (struct mo_file_header *) -1) @@ -116,14 +118,14 @@ it manually. */ if (data == (struct mo_file_header *) -1) { - off_t to_read; + size_t to_read; char *read_ptr; - data = (struct mo_file_header *) malloc (st.st_size); + data = (struct mo_file_header *) malloc (size); if (data == NULL) return; - to_read = st.st_size; + to_read = size; read_ptr = (char *) data; do { @@ -150,7 +152,7 @@ #if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ || defined _LIBC if (use_mmap) - munmap ((caddr_t) data, st.st_size); + munmap ((caddr_t) data, size); else #endif free (data); @@ -164,6 +166,11 @@ domain = (struct loaded_domain *) domain_file->data; domain->data = (char *) data; +#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ + || defined _LIBC + domain->use_mmap = use_mmap; +#endif + domain->mmap_size = size; domain->must_swap = data->magic != _MAGIC; /* Fill in the information about the available tables. */ @@ -184,7 +191,7 @@ #if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ || defined _LIBC if (use_mmap) - munmap ((caddr_t) data, st.st_size); + munmap ((caddr_t) data, size); else #endif free (data); @@ -197,3 +204,19 @@ translations invalid. */ ++_nl_msg_cat_cntr; } + + +#ifdef _LIBC +void +internal_function +_nl_unload_domain (domain) + struct loaded_domain *domain; +{ + if (domain->use_mmap) + munmap ((caddr_t) domain->data, domain->mmap_size); + else + free ((void *) domain->data); + + free (domain); +} +#endif diff -u -r --new-file ypbind-mt-1.2/intl/localealias.c ypbind-mt-1.3/intl/localealias.c --- ypbind-mt-1.2/intl/localealias.c Tue Feb 10 18:06:52 1998 +++ ypbind-mt-1.3/intl/localealias.c Thu May 7 21:13:52 1998 @@ -1,5 +1,5 @@ -/* Handle aliases for locale names - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. +/* Handle aliases for locale names. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. Written by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify @@ -79,6 +79,14 @@ because some ANSI C functions will require linking with this object file and the name space must not be polluted. */ # define strcasecmp __strcasecmp + +# define mempcpy __mempcpy +# define HAVE_MEMPCPY 1 + +/* We need locking here since we can be called from different places. */ +# include + +__libc_lock_define_initialized (static, lock); #endif @@ -125,13 +133,17 @@ }; +static char *string_space = NULL; +static size_t string_space_act = 0; +static size_t string_space_max = 0; static struct alias_map *map; static size_t nmap = 0; static size_t maxmap = 0; /* Prototypes for local functions. */ -static size_t read_alias_file PARAMS ((const char *fname, int fname_len)); +static size_t read_alias_file PARAMS ((const char *fname, int fname_len)) + internal_function; static void extend_alias_table PARAMS ((void)); static int alias_compare PARAMS ((const struct alias_map *map1, const struct alias_map *map2)); @@ -143,8 +155,13 @@ { static const char *locale_alias_path = LOCALE_ALIAS_PATH; struct alias_map *retval; + const char *result = NULL; size_t added; +#ifdef _LIBC + __libc_lock_lock (lock); +#endif + do { struct alias_map item; @@ -162,7 +179,10 @@ /* We really found an alias. Return the value. */ if (retval != NULL) - return retval->value; + { + result = retval->value; + break; + } /* Perhaps we can find another alias file. */ added = 0; @@ -183,11 +203,16 @@ } while (added != 0); - return NULL; +#ifdef _LIBC + __libc_lock_unlock (lock); +#endif + + return result; } static size_t +internal_function read_alias_file (fname, fname_len) const char *fname; int fname_len; @@ -202,8 +227,13 @@ full_fname = (char *) alloca (fname_len + sizeof aliasfile); ADD_BLOCK (block_list, full_fname); +#ifdef HAVE_MEMPCPY + mempcpy (mempcpy (full_fname, fname, fname_len), + aliasfile, sizeof aliasfile); +#else memcpy (full_fname, fname, fname_len); memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile); +#endif fp = fopen (full_fname, "r"); if (fp == NULL) @@ -220,15 +250,28 @@ b) these fields must be usable as file names and so must not be that long */ - char buf[BUFSIZ]; - char *alias; - char *value; - char *cp; + unsigned char buf[BUFSIZ]; + unsigned char *alias; + unsigned char *value; + unsigned char *cp; - if (fgets (buf, BUFSIZ, fp) == NULL) + if (fgets (buf, sizeof buf, fp) == NULL) /* EOF reached. */ break; + /* Possibly not the whole line fits into the buffer. Ignore + the rest of the line. */ + if (strchr (buf, '\n') == NULL) + { + char altbuf[BUFSIZ]; + do + if (fgets (altbuf, sizeof altbuf, fp) == NULL) + /* Make sure the inner loop will be left. The outer loop + will exit at the `feof' test. */ + break; + while (strchr (altbuf, '\n') == NULL); + } + cp = buf; /* Ignore leading white space. */ while (isspace (cp[0])) @@ -250,8 +293,8 @@ if (cp[0] != '\0') { - char *tp; - size_t len; + size_t alias_len; + size_t value_len; value = cp++; while (cp[0] != '\0' && !isspace (cp[0])) @@ -271,42 +314,37 @@ if (nmap >= maxmap) extend_alias_table (); - /* We cannot depend on strdup available in the libc. Sigh! */ - len = strlen (alias) + 1; - tp = (char *) malloc (len); - if (tp == NULL) - { - FREE_BLOCKS (block_list); - return added; - } - memcpy (tp, alias, len); - map[nmap].alias = tp; + alias_len = strlen (alias) + 1; + value_len = strlen (value) + 1; - len = strlen (value) + 1; - tp = (char *) malloc (len); - if (tp == NULL) + if (string_space_act + alias_len + value_len > string_space_max) { - FREE_BLOCKS (block_list); - return added; + /* Increase size of memory pool. */ + size_t new_size = (string_space_max + + (alias_len + value_len > 1024 + ? alias_len + value_len : 1024)); + char *new_pool = (char *) realloc (string_space, new_size); + if (new_pool == NULL) + { + FREE_BLOCKS (block_list); + return added; + } + string_space = new_pool; + string_space_max = new_size; } - memcpy (tp, value, len); - map[nmap].value = tp; + + map[nmap].alias = memcpy (&string_space[string_space_act], + alias, alias_len); + string_space_act += alias_len; + + map[nmap].value = memcpy (&string_space[string_space_act], + value, value_len); + string_space_act += value_len; ++nmap; ++added; } } - - /* Possibly not the whole line fits into the buffer. Ignore - the rest of the line. */ - while (strchr (cp, '\n') == NULL) - { - cp = buf; - if (fgets (buf, BUFSIZ, fp) == NULL) - /* Make sure the inner loop will be left. The outer loop - will exit at the `feof' test. */ - *cp = '\n'; - } } /* Should we test for ferror()? I think we have to silently ignore @@ -329,20 +367,28 @@ struct alias_map *new_map; new_size = maxmap == 0 ? 100 : 2 * maxmap; - new_map = (struct alias_map *) malloc (new_size - * sizeof (struct alias_map)); + new_map = (struct alias_map *) realloc (map, (new_size + * sizeof (struct alias_map))); if (new_map == NULL) /* Simply don't extend: we don't have any more core. */ return; - memcpy (new_map, map, nmap * sizeof (struct alias_map)); - - if (maxmap != 0) - free (map); - map = new_map; maxmap = new_size; } + + +#ifdef _LIBC +static void __attribute__ ((unused)) +free_mem (void) +{ + if (string_space != NULL) + free (string_space); + if (map != NULL) + free (map); +} +text_set_element (__libc_subfreeres, free_mem); +#endif static int diff -u -r --new-file ypbind-mt-1.2/intl/textdomain.c ypbind-mt-1.3/intl/textdomain.c --- ypbind-mt-1.2/intl/textdomain.c Tue Feb 10 18:06:53 1998 +++ ypbind-mt-1.3/intl/textdomain.c Thu May 7 21:13:52 1998 @@ -1,5 +1,5 @@ -/* Implementation of the textdomain(3) function - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. +/* Implementation of the textdomain(3) function. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. Written by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify @@ -54,7 +54,9 @@ prefix. So we have to make a difference here. */ #ifdef _LIBC # define TEXTDOMAIN __textdomain -# define strdup(str) __strdup (str) +# ifndef strdup +# define strdup(str) __strdup (str) +# endif #else # define TEXTDOMAIN textdomain__ #endif diff -u -r --new-file ypbind-mt-1.2/lib/Makefile.am ypbind-mt-1.3/lib/Makefile.am --- ypbind-mt-1.2/lib/Makefile.am Wed Apr 1 20:18:01 1998 +++ ypbind-mt-1.3/lib/Makefile.am Sun Apr 19 18:17:33 1998 @@ -5,7 +5,7 @@ # # Process this file with automake to produce Makefile.in. -AUTOMAKE_OPTIONS = 1.2 foreign +AUTOMAKE_OPTIONS = 1.3 gnits noinst_LIBRARIES = libcompat.a diff -u -r --new-file ypbind-mt-1.2/lib/Makefile.in ypbind-mt-1.3/lib/Makefile.in --- ypbind-mt-1.2/lib/Makefile.in Sun Apr 19 11:49:29 1998 +++ ypbind-mt-1.3/lib/Makefile.in Wed Jul 1 22:17:55 1998 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.3 from Makefile.am # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -39,6 +39,8 @@ includedir = @includedir@ oldincludedir = /usr/include +DISTDIR = + pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -94,7 +96,7 @@ WARNFLAGS = @WARNFLAGS@ l = @l@ -AUTOMAKE_OPTIONS = 1.2 foreign +AUTOMAKE_OPTIONS = 1.3 gnits noinst_LIBRARIES = libcompat.a @@ -134,14 +136,14 @@ SOURCES = $(libcompat_a_SOURCES) OBJECTS = $(libcompat_a_OBJECTS) -default: all +all: Makefile $(LIBRARIES) .SUFFIXES: .SUFFIXES: .S .c .o .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps lib/Makefile +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnits --include-deps lib/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -215,8 +217,6 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done -clnt_udp.o: clnt_udp.c ../config.h -dns_hosts.o: dns_hosts.c ../config.h info: dvi: @@ -234,8 +234,6 @@ uninstall: -all: Makefile $(LIBRARIES) - install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: @@ -271,7 +269,7 @@ @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -.PHONY: default mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ +.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile tags mostlyclean-tags distclean-tags \ diff -u -r --new-file ypbind-mt-1.2/man/Makefile.am ypbind-mt-1.3/man/Makefile.am --- ypbind-mt-1.2/man/Makefile.am Sat Apr 18 15:59:39 1998 +++ ypbind-mt-1.3/man/Makefile.am Sun Apr 19 18:17:51 1998 @@ -4,6 +4,8 @@ # Author: Thorsten Kukuk # +AUTOMAKE_OPTIONS = 1.3 gnits + CLEANFILES = *~ sedscript ypbind.8 yp.conf.5 EXTRA_DIST = sedscript.in ypbind.8.in yp.conf.5.in diff -u -r --new-file ypbind-mt-1.2/man/Makefile.in ypbind-mt-1.3/man/Makefile.in --- ypbind-mt-1.2/man/Makefile.in Sun Apr 19 11:49:33 1998 +++ ypbind-mt-1.3/man/Makefile.in Wed Jul 1 22:17:59 1998 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.3 from Makefile.am # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -38,6 +38,8 @@ includedir = @includedir@ oldincludedir = /usr/include +DISTDIR = + pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -93,6 +95,8 @@ WARNFLAGS = @WARNFLAGS@ l = @l@ +AUTOMAKE_OPTIONS = 1.3 gnits + CLEANFILES = *~ sedscript ypbind.8 yp.conf.5 EXTRA_DIST = sedscript.in ypbind.8.in yp.conf.5.in @@ -113,13 +117,13 @@ TAR = tar GZIP = --best -default: all +all: Makefile $(MANS) .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps man/Makefile +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnits --include-deps man/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -127,7 +131,7 @@ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status install-man5: - $(mkinstalldirs) $(man5dir) + $(mkinstalldirs) $(DESTDIR)$(man5dir) @list='$(man5_MANS)'; \ l2='$(man_MANS)'; for i in $$l2; do \ case "$$i" in \ @@ -140,8 +144,8 @@ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(man5dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(man5dir)/$$inst; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst; \ done uninstall-man5: @@ -155,12 +159,12 @@ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(man5dir)/$$inst"; \ - rm -f $(man5dir)/$$inst; \ + echo " rm -f $(DESTDIR)$(man5dir)/$$inst"; \ + rm -f $(DESTDIR)$(man5dir)/$$inst; \ done install-man8: - $(mkinstalldirs) $(man8dir) + $(mkinstalldirs) $(DESTDIR)$(man8dir) @list='$(man8_MANS)'; \ l2='$(man_MANS)'; for i in $$l2; do \ case "$$i" in \ @@ -173,8 +177,8 @@ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(man8dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(man8dir)/$$inst; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \ done uninstall-man8: @@ -188,8 +192,8 @@ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(man8dir)/$$inst"; \ - rm -f $(man8dir)/$$inst; \ + echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \ + rm -f $(DESTDIR)$(man8dir)/$$inst; \ done install-man: $(MANS) @$(NORMAL_INSTALL) @@ -228,12 +232,10 @@ uninstall: uninstall-man -all: Makefile $(MANS) - install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: - $(mkinstalldirs) $(mandir)/man5 $(mandir)/man8 + $(mkinstalldirs) $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8 mostlyclean-generic: @@ -261,7 +263,7 @@ @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -.PHONY: default install-man5 uninstall-man5 install-man8 uninstall-man8 \ +.PHONY: install-man5 uninstall-man5 install-man8 uninstall-man8 \ install-man uninstall-man tags distdir info dvi installcheck \ install-exec install-data install uninstall all installdirs \ mostlyclean-generic distclean-generic clean-generic \ diff -u -r --new-file ypbind-mt-1.2/man/yp.conf.5.in ypbind-mt-1.3/man/yp.conf.5.in --- ypbind-mt-1.2/man/yp.conf.5.in Sat Apr 18 16:08:23 1998 +++ ypbind-mt-1.3/man/yp.conf.5.in Sun Apr 19 17:12:48 1998 @@ -20,7 +20,7 @@ .\" write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, .\" Boston, MA 02111-1307, USA. .\" -.TH ypbind 8 "April 1998" "ypbind-mt Version @PK_VERSION@" +.TH yp.conf 5 "April 1998" "ypbind-mt Version @PK_VERSION@" .SH NAME /etc/yp.conf - NIS binding configuration file .SH DESCRIPTION diff -u -r --new-file ypbind-mt-1.2/man/ypbind.8.in ypbind-mt-1.3/man/ypbind.8.in --- ypbind-mt-1.2/man/ypbind.8.in Sat Apr 18 15:59:58 1998 +++ ypbind-mt-1.3/man/ypbind.8.in Wed Jul 1 21:50:01 1998 @@ -20,13 +20,15 @@ .\" write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, .\" Boston, MA 02111-1307, USA. .\" -.TH ypbind 8 "April 1998" "ypbind-mt Version @PK_VERSION@" +.TH ypbind 8 "July 1998" "ypbind-mt Version @PK_VERSION@" .SH NAME ypbind - NIS binding process .SH SYNOPSIS .B ypbind [ +.BR \-c +] [ .BR \-d | \-debug ] [ .B \-broadcast @@ -187,6 +189,10 @@ on the local machine is allowed to chang the binding. Such requests are only allowd from .BR loopback . +.TP +.B "\-c" +.B ypbind +only checks if the config file has syntax errors and exits. .TP .B "\-debug" starts diff -u -r --new-file ypbind-mt-1.2/missing ypbind-mt-1.3/missing --- ypbind-mt-1.2/missing Thu Feb 5 15:02:54 1998 +++ ypbind-mt-1.3/missing Sun Apr 19 18:03:59 1998 @@ -41,9 +41,11 @@ autoconf touch file \`configure' autoheader touch file \`config.h.in' automake touch all \`Makefile.in' files - bison touch file \`y.tab.c' + bison create \`y.tab.[ch]', if possible, from existing .[ch] + flex create \`lex.yy.c', if possible, from existing .c + lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - yacc touch file \`y.tab.c'" + yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) @@ -80,7 +82,15 @@ you modified \`acconfig.h' or \`configure.in'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." - touch config.h.in + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER([^):]*:\([^)]*\)).*/\1/p' configure.in` + if test -z "$files"; then + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^):]*\)).*/\1/p' configure.in` + test -z "$files" || files="$files.in" + else + files=`echo "$files" | sed -e 's/:/ /g'` + fi + test -z "$files" && files="config.h.in" + touch $files ;; automake) @@ -100,7 +110,51 @@ you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." - touch y.tab.c + rm -f y.tab.c y.tab.h + if [ $# -ne 1 ]; then + eval LASTARG="\${$#}" + case "$LASTARG" in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi + if [ ! -f y.tab.h ]; then + echo >y.tab.h + fi + if [ ! -f y.tab.c ]; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; + + lex|flex) + echo 1>&2 "\ +WARNING: \`$1' is missing on your system. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c + if [ $# -ne 1 ]; then + eval LASTARG="\${$#}" + case "$LASTARG" in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi + if [ ! -f lex.yy.c ]; then + echo 'main() { return 0; }' >lex.yy.c + fi ;; makeinfo) diff -u -r --new-file ypbind-mt-1.2/po/Makefile.in.in ypbind-mt-1.3/po/Makefile.in.in --- ypbind-mt-1.2/po/Makefile.in.in Tue Feb 10 18:07:52 1998 +++ ypbind-mt-1.3/po/Makefile.in.in Thu May 7 21:13:59 1998 @@ -85,9 +85,10 @@ $(srcdir)/$(PACKAGE).pot: $(POTFILES) $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ --add-comments --keyword=_ --keyword=N_ \ - --files-from=$(srcdir)/POTFILES.in - rm -f $(srcdir)/$(PACKAGE).pot - mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot + --files-from=$(srcdir)/POTFILES.in \ + && test ! -f $(PACKAGE).po \ + || ( rm -f $(srcdir)/$(PACKAGE).pot \ + && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot ) $(srcdir)/cat-id-tbl.c: stamp-cat-id; @: $(srcdir)/stamp-cat-id: $(PACKAGE).pot @@ -109,10 +110,10 @@ install-data: install-data-@USE_NLS@ install-data-no: all install-data-yes: all - if test -r $(MKINSTALLDIRS); then \ + if test -r "$(MKINSTALLDIRS)"; then \ $(MKINSTALLDIRS) $(datadir); \ else \ - $(top_srcdir)/mkinstalldirs $(datadir); \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \ fi @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ @@ -123,10 +124,10 @@ esac; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ dir=$$destdir/$$lang/LC_MESSAGES; \ - if test -r $(MKINSTALLDIRS); then \ + if test -r "$(MKINSTALLDIRS)"; then \ $(MKINSTALLDIRS) $$dir; \ else \ - $(top_srcdir)/mkinstalldirs $$dir; \ + $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ fi; \ if test -r $$cat; then \ $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ @@ -151,10 +152,10 @@ fi; \ done if test "$(PACKAGE)" = "gettext"; then \ - if test -r $(MKINSTALLDIRS); then \ + if test -r "$(MKINSTALLDIRS)"; then \ $(MKINSTALLDIRS) $(gettextsrcdir); \ else \ - $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \ + $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \ fi; \ $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ $(gettextsrcdir)/Makefile.in.in; \ diff -u -r --new-file ypbind-mt-1.2/po/cat-id-tbl.c ypbind-mt-1.3/po/cat-id-tbl.c --- ypbind-mt-1.2/po/cat-id-tbl.c Wed Apr 1 22:22:50 1998 +++ ypbind-mt-1.3/po/cat-id-tbl.c Wed Jul 1 22:17:05 1998 @@ -33,47 +33,51 @@ {"parsed domain '%s' server '%s'", 24}, {"parsed domain '%s' broadcast", 25}, {"parsed ypserver %s", 26}, - {"No entry found.", 27}, - {"cannot create pidfile %s", 28}, - {"fcntl error", 29}, - {"ypbind-mt already running (pid %d) - exiting", 30}, - {"cannot lock pidfile", 31}, - {"SIGCHLD arrived, what should I do ?", 32}, - {"Signal (%d) for quitting program arrived.", 33}, - {"cannot unlock pidfile", 34}, - {"SIGHUP arrived, reloading config file.", 35}, - {"Unknown signal: %d", 36}, - {"Usage:\n", 37}, + {"Entry \"%s\" is not valid, ignore it !", 27}, + {"No entry found.", 28}, + {"cannot create pidfile %s", 29}, + {"fcntl error", 30}, + {"ypbind-mt already running (pid %d) - exiting", 31}, + {"cannot lock pidfile", 32}, + {"SIGCHLD arrived, what should I do ?", 33}, + {"Signal (%d) for quitting program arrived.", 34}, + {"cannot unlock pidfile", 35}, + {"SIGHUP arrived, reloading config file.", 36}, + {"Unknown signal: %d", 37}, + {"Usage:\n", 38}, {"\ -\typbind [-broadcast | -ypset | -ypsetme] [-p port] [-f configfile] \ -[-no_ping] [-broken_server] [-debug]\n", 38}, - {"\typbind --version\n", 39}, - {"domainname not set - aborting.\n", 40}, - {"ypbind must be run as root\n", 41}, - {"Could not create %s: %s", 42}, - {"No NIS server and no -broadcast option specified.\n", 43}, - {"Add a NIS server to the %s configuration file,\n", 44}, - {"or start ypbind with the -broadcast option.\n", 45}, - {"Could not block signals.", 46}, - {"Cannot create UDP: %s", 47}, - {"Cannot bind UDP: %s", 48}, - {"Cannot create udp service.", 49}, - {"Unable to register (YPBINDPROG, YPBINDVERS, udp).", 50}, - {"Unable to register (YPBINDPROG, YPBINDOLDVERS, udp).", 51}, - {"Cannot create TCP: %s", 52}, - {"Cannot bind TCP: %s", 53}, - {"Cannot create tcp service.\n", 54}, - {"Unable to register (YPBINDPROG, YPBINDVERS, tcp).", 55}, - {"Unable to register (YPBINDPROG, YPBINDOLDVERS, tcp).", 56}, - {"svc_run returned.", 57}, - {"Domain name '%s' has embedded slash -- rejecting.", 58}, - {"Status: YPBIND_FAIL_VAL", 59}, - {"Status: YPBIND_SUCC_VAL", 60}, - {"User from '%s' try's to change the binding.", 61}, - {"Changing the binding is not allowed.", 62}, - {"SETDOM request doesn't come from reserved port.", 63}, - {"unable to free arguments", 64}, - {"unable to free results", 65}, +\typbind [-broadcast | -ypset | -ypsetme] [-p port] [-f configfile]\n\ +\t [-no_ping] [-broken_server] [-debug]\n", 39}, + {"\typbind -c [-f configfile]\n", 40}, + {"\typbind --version\n", 41}, + {"Config file %s is ok.\n", 42}, + {"domainname not set - aborting.\n", 43}, + {"ypbind must be run as root\n", 44}, + {"Could not create %s: %s\n", 45}, + {"Could not change to directory %s: %s\n", 46}, + {"No NIS server and no -broadcast option specified.\n", 47}, + {"Add a NIS server to the %s configuration file,\n", 48}, + {"or start ypbind with the -broadcast option.\n", 49}, + {"Could not block signals.", 50}, + {"Cannot create UDP: %s", 51}, + {"Cannot bind UDP: %s", 52}, + {"Cannot create udp service.", 53}, + {"Unable to register (YPBINDPROG, YPBINDVERS, udp).", 54}, + {"Unable to register (YPBINDPROG, YPBINDOLDVERS, udp).", 55}, + {"Cannot create TCP: %s", 56}, + {"Cannot bind TCP: %s", 57}, + {"Cannot create tcp service.\n", 58}, + {"Unable to register (YPBINDPROG, YPBINDVERS, tcp).", 59}, + {"Unable to register (YPBINDPROG, YPBINDOLDVERS, tcp).", 60}, + {"svc_run returned.", 61}, + {"Domain name '%s' has embedded slash -- rejecting.", 62}, + {"Status: YPBIND_FAIL_VAL", 63}, + {"Status: YPBIND_SUCC_VAL", 64}, + {"User from '%s' try's to change the binding.", 65}, + {"Changing the binding is not allowed.", 66}, + {"SETDOM request doesn't come from reserved port.", 67}, + {"unable to free arguments", 68}, + {"unable to free results", 69}, }; -int _msg_tbl_length = 65; +int _msg_tbl_length = 69; Binary files ypbind-mt-1.2/po/de.gmo and ypbind-mt-1.3/po/de.gmo differ diff -u -r --new-file ypbind-mt-1.2/po/de.po ypbind-mt-1.3/po/de.po --- ypbind-mt-1.2/po/de.po Fri Apr 17 21:22:47 1998 +++ ypbind-mt-1.3/po/de.po Wed Jul 1 19:05:33 1998 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n" +"PO-Revision-Date: 1998-07-01 19:05+02:00\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -34,8 +34,7 @@ #: src/serv_list.c:336 msgid "internal error: add_server called with NULL domain." -msgstr "" -"Interner Fehler: add_server wurde mit NULL pointer für doamin aufgerufen." +msgstr "Interner Fehler: add_server wurde mit NULL pointer für domain aufgerufen." #: src/serv_list.c:350 #, c-format diff -u -r --new-file ypbind-mt-1.2/po/ypbind-mt.pot ypbind-mt-1.3/po/ypbind-mt.pot --- ypbind-mt-1.2/po/ypbind-mt.pot Sun Apr 19 11:34:17 1998 +++ ypbind-mt-1.3/po/ypbind-mt.pot Wed Jul 1 22:17:05 1998 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1998-04-19 11:34+0200\n" +"POT-Creation-Date: 1998-07-01 22:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -62,51 +62,51 @@ msgid "gethostbyname: Unknown error" msgstr "" -#: src/serv_list.c:522 src/serv_list.c:781 +#: src/serv_list.c:524 src/serv_list.c:783 #, c-format msgid "Answer for domain '%s' from server '%s'" msgstr "" -#: src/serv_list.c:526 +#: src/serv_list.c:528 #, c-format msgid "Answer for domain '%s' from unknown server '%s'" msgstr "" -#: src/serv_list.c:532 +#: src/serv_list.c:534 #, c-format msgid "Answer for domain '%s' from '%s' on illegal port." msgstr "" -#: src/serv_list.c:695 src/serv_list.c:822 +#: src/serv_list.c:697 src/serv_list.c:824 #, c-format msgid "ping host '%s', domain '%s'" msgstr "" -#: src/serv_list.c:707 +#: src/serv_list.c:709 #, c-format msgid "host '%s' doesn't answer." msgstr "" -#: src/serv_list.c:843 +#: src/serv_list.c:845 #, c-format msgid "clnt_create for server '%s' (domain '%s') failed" msgstr "" -#: src/serv_list.c:864 +#: src/serv_list.c:866 #, c-format msgid "domain '%s' not served by '%s'" msgstr "" -#: src/serv_list.c:932 +#: src/serv_list.c:934 msgid "Pinging all active server." msgstr "" -#: src/serv_list.c:955 +#: src/serv_list.c:957 #, c-format msgid "Server for domain '%s' doesn't answer." msgstr "" -#: src/serv_list.c:961 src/serv_list.c:966 +#: src/serv_list.c:963 src/serv_list.c:968 #, c-format msgid "Server '%s' for domain '%s' doesn't answer." msgstr "" @@ -121,149 +121,168 @@ msgid "parsed domain '%s' server '%s'" msgstr "" -#: src/ypbind-mt.c:186 +#: src/ypbind-mt.c:187 #, c-format msgid "parsed domain '%s' broadcast" msgstr "" -#: src/ypbind-mt.c:202 +#: src/ypbind-mt.c:204 #, c-format msgid "parsed ypserver %s" msgstr "" -#: src/ypbind-mt.c:217 +#: src/ypbind-mt.c:211 +#, c-format +msgid "Entry \"%s\" is not valid, ignore it !" +msgstr "" + +#: src/ypbind-mt.c:221 msgid "No entry found." msgstr "" -#: src/ypbind-mt.c:238 +#: src/ypbind-mt.c:242 #, c-format msgid "cannot create pidfile %s" msgstr "" -#: src/ypbind-mt.c:263 +#: src/ypbind-mt.c:267 msgid "fcntl error" msgstr "" -#: src/ypbind-mt.c:272 +#: src/ypbind-mt.c:276 #, c-format msgid "ypbind-mt already running (pid %d) - exiting" msgstr "" -#: src/ypbind-mt.c:283 +#: src/ypbind-mt.c:287 msgid "cannot lock pidfile" msgstr "" -#: src/ypbind-mt.c:325 +#: src/ypbind-mt.c:329 msgid "SIGCHLD arrived, what should I do ?" msgstr "" -#: src/ypbind-mt.c:333 +#: src/ypbind-mt.c:337 #, c-format msgid "Signal (%d) for quitting program arrived." msgstr "" -#: src/ypbind-mt.c:344 +#: src/ypbind-mt.c:348 msgid "cannot unlock pidfile" msgstr "" -#: src/ypbind-mt.c:354 +#: src/ypbind-mt.c:358 msgid "SIGHUP arrived, reloading config file." msgstr "" -#: src/ypbind-mt.c:366 +#: src/ypbind-mt.c:370 #, c-format msgid "Unknown signal: %d" msgstr "" -#: src/ypbind-mt.c:375 +#: src/ypbind-mt.c:379 msgid "Usage:\n" msgstr "" -#: src/ypbind-mt.c:376 +#: src/ypbind-mt.c:380 msgid "" -"\typbind [-broadcast | -ypset | -ypsetme] [-p port] [-f configfile] " -"[-no_ping] [-broken_server] [-debug]\n" +"\typbind [-broadcast | -ypset | -ypsetme] [-p port] [-f configfile]\n" +"\t [-no_ping] [-broken_server] [-debug]\n" +msgstr "" + +#: src/ypbind-mt.c:381 +msgid "\typbind -c [-f configfile]\n" msgstr "" -#: src/ypbind-mt.c:377 +#: src/ypbind-mt.c:382 msgid "\typbind --version\n" msgstr "" -#: src/ypbind-mt.c:436 +#: src/ypbind-mt.c:449 +#, c-format +msgid "Config file %s is ok.\n" +msgstr "" + +#: src/ypbind-mt.c:457 msgid "domainname not set - aborting.\n" msgstr "" -#: src/ypbind-mt.c:442 +#: src/ypbind-mt.c:463 msgid "ypbind must be run as root\n" msgstr "" -#: src/ypbind-mt.c:453 +#: src/ypbind-mt.c:471 src/ypbind-mt.c:480 #, c-format -msgid "Could not create %s: %s" +msgid "Could not create %s: %s\n" msgstr "" -#: src/ypbind-mt.c:464 +#: src/ypbind-mt.c:487 +#, c-format +msgid "Could not change to directory %s: %s\n" +msgstr "" + +#: src/ypbind-mt.c:496 msgid "No NIS server and no -broadcast option specified.\n" msgstr "" -#: src/ypbind-mt.c:466 +#: src/ypbind-mt.c:498 #, c-format msgid "Add a NIS server to the %s configuration file,\n" msgstr "" -#: src/ypbind-mt.c:468 +#: src/ypbind-mt.c:500 msgid "or start ypbind with the -broadcast option.\n" msgstr "" -#: src/ypbind-mt.c:513 +#: src/ypbind-mt.c:545 msgid "Could not block signals." msgstr "" -#: src/ypbind-mt.c:527 +#: src/ypbind-mt.c:559 #, c-format msgid "Cannot create UDP: %s" msgstr "" -#: src/ypbind-mt.c:540 +#: src/ypbind-mt.c:572 #, c-format msgid "Cannot bind UDP: %s" msgstr "" -#: src/ypbind-mt.c:550 +#: src/ypbind-mt.c:582 msgid "Cannot create udp service." msgstr "" -#: src/ypbind-mt.c:558 +#: src/ypbind-mt.c:590 msgid "Unable to register (YPBINDPROG, YPBINDVERS, udp)." msgstr "" -#: src/ypbind-mt.c:566 +#: src/ypbind-mt.c:598 msgid "Unable to register (YPBINDPROG, YPBINDOLDVERS, udp)." msgstr "" -#: src/ypbind-mt.c:575 +#: src/ypbind-mt.c:607 #, c-format msgid "Cannot create TCP: %s" msgstr "" -#: src/ypbind-mt.c:588 +#: src/ypbind-mt.c:620 #, c-format msgid "Cannot bind TCP: %s" msgstr "" -#: src/ypbind-mt.c:598 +#: src/ypbind-mt.c:630 msgid "Cannot create tcp service.\n" msgstr "" -#: src/ypbind-mt.c:605 +#: src/ypbind-mt.c:637 msgid "Unable to register (YPBINDPROG, YPBINDVERS, tcp)." msgstr "" -#: src/ypbind-mt.c:613 +#: src/ypbind-mt.c:645 msgid "Unable to register (YPBINDPROG, YPBINDOLDVERS, tcp)." msgstr "" -#: src/ypbind-mt.c:620 +#: src/ypbind-mt.c:652 msgid "svc_run returned." msgstr "" diff -u -r --new-file ypbind-mt-1.2/src/Makefile.am ypbind-mt-1.3/src/Makefile.am --- ypbind-mt-1.2/src/Makefile.am Tue Mar 31 18:36:43 1998 +++ ypbind-mt-1.3/src/Makefile.am Sun Apr 19 18:18:15 1998 @@ -3,6 +3,9 @@ # # Author: Thorsten Kukuk # + +AUTOMAKE_OPTIONS = 1.3 gnits + INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s -m 555 CFLAGS = -D_REENTRANT=1 @WARNFLAGS@ @DEFS@ @CFLAGS@ \ diff -u -r --new-file ypbind-mt-1.2/src/Makefile.in ypbind-mt-1.3/src/Makefile.in --- ypbind-mt-1.2/src/Makefile.in Sun Apr 19 11:49:31 1998 +++ ypbind-mt-1.3/src/Makefile.in Wed Jul 1 22:17:57 1998 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.2f from Makefile.am +# Makefile.in generated automatically by automake 1.3 from Makefile.am # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -38,6 +38,8 @@ includedir = @includedir@ oldincludedir = /usr/include +DISTDIR = + pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -92,6 +94,8 @@ WARNFLAGS = @WARNFLAGS@ l = @l@ +AUTOMAKE_OPTIONS = 1.3 gnits + INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s -m 555 CFLAGS = -D_REENTRANT=1 @WARNFLAGS@ @DEFS@ @CFLAGS@ \ @@ -135,14 +139,14 @@ SOURCES = $(ypbind_SOURCES) OBJECTS = $(ypbind_OBJECTS) -default: all +all: Makefile $(PROGRAMS) .SUFFIXES: .SUFFIXES: .S .c .o .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnits --include-deps src/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -158,18 +162,18 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(sbindir) + $(mkinstalldirs) $(DESTDIR)$(sbindir) @list='$(sbin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(sbindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_PROGRAM) $$p $(sbindir)/`echo $$p|sed '$(transform)'`; \ + echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \ else :; fi; \ done uninstall-sbinPROGRAMS: @$(NORMAL_UNINSTALL) list='$(sbin_PROGRAMS)'; for p in $$list; do \ - rm -f $(sbindir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \ done .c.o: @@ -231,14 +235,6 @@ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file; \ done -log_msg.o: log_msg.c log_msg.h -pthread_np.o: pthread_np.c pthread_np.h -serv_list.o: serv_list.c ../config.h ypbind.h log_msg.h local.h \ - pthread_np.h -ypbind-mt.o: ypbind-mt.c ../config.h ypbind.h log_msg.h local.h -ypbind_server.o: ypbind_server.c ../config.h ypbind.h log_msg.h local.h -ypbind_svc.o: ypbind_svc.c ../config.h ypbind.h log_msg.h local.h -ypbind_xdr.o: ypbind_xdr.c ypbind.h info: dvi: @@ -256,12 +252,10 @@ uninstall: uninstall-sbinPROGRAMS -all: Makefile $(PROGRAMS) - install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: - $(mkinstalldirs) $(sbindir) + $(mkinstalldirs) $(DATADIR)$(sbindir) mostlyclean-generic: @@ -294,7 +288,7 @@ @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -.PHONY: default mostlyclean-sbinPROGRAMS distclean-sbinPROGRAMS \ +.PHONY: mostlyclean-sbinPROGRAMS distclean-sbinPROGRAMS \ clean-sbinPROGRAMS maintainer-clean-sbinPROGRAMS uninstall-sbinPROGRAMS \ install-sbinPROGRAMS mostlyclean-compile distclean-compile \ clean-compile maintainer-clean-compile tags mostlyclean-tags \ diff -u -r --new-file ypbind-mt-1.2/src/serv_list.c ypbind-mt-1.3/src/serv_list.c --- ypbind-mt-1.2/src/serv_list.c Sun Apr 19 11:34:10 1998 +++ ypbind-mt-1.3/src/serv_list.c Tue Apr 28 17:37:52 1998 @@ -422,9 +422,9 @@ /* Enlarge the buffer. */ hstbuflen *= 2; hsttmpbuf = alloca (hstbuflen); - } - else - break; + } + else + break; #else #if defined(HAVE_RES_GETHOSTBYNAME) hent = res_gethostbyname (entry->server[active].host); @@ -458,6 +458,8 @@ } return; } + if (hent->h_addr_list[0] == NULL) + return; entry->server[active].family = hent->h_addrtype; /* XXX host could have multiple interfaces */ memcpy (&entry->server[active].addr, hent->h_addr_list[0], diff -u -r --new-file ypbind-mt-1.2/src/ypbind-mt.c ypbind-mt-1.3/src/ypbind-mt.c --- ypbind-mt-1.2/src/ypbind-mt.c Wed Apr 1 22:21:56 1998 +++ ypbind-mt-1.3/src/ypbind-mt.c Wed Jul 1 22:16:56 1998 @@ -104,7 +104,7 @@ /* Load the config file (/etc/yp.conf) */ static int -load_config (void) +load_config (int do_add) { FILE *fp; char *buf = NULL; @@ -176,7 +176,8 @@ log_msg (LOG_DEBUG, _("parsed domain '%s' server '%s'"), tmpdomain, tmpserver); ++have_entries; - add_server (tmpdomain, tmpserver); + if (do_add) + add_server (tmpdomain, tmpserver); continue; } count = sscanf (cp, "domain %s broadcast", tmpdomain); @@ -185,7 +186,8 @@ if (debug_flag) log_msg (LOG_DEBUG, _("parsed domain '%s' broadcast"), tmpdomain); - add_server (tmpdomain, NULL); + if (do_add) + add_server (tmpdomain, NULL); ++have_entries; continue; } @@ -200,11 +202,13 @@ { if (debug_flag) log_msg (LOG_DEBUG, _("parsed ypserver %s"), tmpserver); - add_server (domain, tmpserver); + if (do_add) + add_server (domain, tmpserver); ++have_entries; continue; } } + log_msg (LOG_ERR, _("Entry \"%s\" is not valid, ignore it !"), cp); } fclose (fp); @@ -357,7 +361,7 @@ if (use_broadcast) add_server (domain, NULL); else - load_config (); + load_config (1); if (ping_interval < 1) do_binding (); @@ -373,7 +377,8 @@ usage (void) { fputs (_("Usage:\n"), stderr); - fputs (_("\typbind [-broadcast | -ypset | -ypsetme] [-p port] [-f configfile] [-no_ping] [-broken_server] [-debug]\n"), stderr); + fputs (_("\typbind [-broadcast | -ypset | -ypsetme] [-p port] [-f configfile]\n\t [-no_ping] [-broken_server] [-debug]\n"), stderr); + fputs (_("\typbind -c [-f configfile]\n"), stderr); fputs (_("\typbind --version\n"), stderr); exit (1); } @@ -386,6 +391,8 @@ sigset_t sigs_to_block; struct sockaddr_in socket_address; pthread_t sig_thread, ping_thread; + struct stat st; + int configcheck_only = 0; setlocale (LC_MESSAGES, ""); bindtextdomain (PACKAGE, LOCALEDIR); @@ -426,12 +433,26 @@ ++i; port = atoi (argv[i]); } + else if (strcmp ("-c", argv[i]) == 0) + configcheck_only = 1; else usage (); } - yp_get_default_domain(&domain); - if (domain == NULL || domain[0] == '\0' || strcmp(domain, "(none)") == 0) + if (configcheck_only) + { + debug_flag = 1; + if (load_config (0) != 0) + exit (1); + else + { + fprintf (stdout, _("Config file %s is ok.\n"), configfile); + exit (0); + } + } + + if (yp_get_default_domain (&domain) || domain == NULL || + domain[0] == '\0' || strcmp(domain, "(none)") == 0) { fputs (_("domainname not set - aborting.\n"), stderr); exit (1); @@ -443,23 +464,34 @@ exit (1); } + if (stat ("/var/yp", &st) == -1) + if (mkdir ("/var/yp", (S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH | + S_IXUSR | S_IXGRP | S_IXOTH )) < 0) + { + fprintf (stderr, _("Could not create %s: %s\n"), + "/var/yp", strerror (errno)); + exit (1); + } + + if (stat (BINDINGDIR, &st) == -1) + if (mkdir (BINDINGDIR, (S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH | + S_IXUSR | S_IXGRP | S_IXOTH)) < 0) + { + fprintf (stderr, _("Could not create %s: %s\n"), + BINDINGDIR, strerror (errno)); + exit (1); + } /* Change current directory to bindingdir */ if (chdir (BINDINGDIR) < 0) { - /* Bad, we have to create it first */ - if (mkdir(BINDINGDIR, (S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH | - S_IXUSR | S_IXGRP | S_IXOTH)) < 0) - { - fprintf (stderr, _("Could not create %s: %s"), - BINDINGDIR, strerror (errno)); - exit (1); - } - chdir (BINDINGDIR); + fprintf (stderr, _("Could not change to directory %s: %s\n"), + BINDINGDIR, strerror (errno)); + exit (1); } if (!use_broadcast) { - if (load_config () != 0) + if (load_config (1) != 0) { fputs (_("No NIS server and no -broadcast option specified.\n"), stderr); fprintf (stderr, diff -u -r --new-file ypbind-mt-1.2/ypbind-mt.spec ypbind-mt-1.3/ypbind-mt.spec --- ypbind-mt-1.2/ypbind-mt.spec Sun Apr 19 11:36:30 1998 +++ ypbind-mt-1.3/ypbind-mt.spec Wed Jul 1 21:47:11 1998 @@ -1,6 +1,6 @@ Summary: NIS (YP) binding process Name: ypbind-mt -Version: 1.2 +Version: 1.3 Release: 1 Copyright: GPL Group: Networking @@ -48,5 +48,10 @@ %config /etc/yp.conf %config /etc/rc.d/init.d/ypbind /usr/man/man8/ypbind.8 +/usr/man/man5/yp.conf.5 /usr/sbin/ypbind /usr/share/locale/de/LC_MESSAGES/ypbind-mt.mo + +%changelog +* Sun Apr 19 1998 Thorsten Kukuk +- Include yp.conf.5