From 3055c2ab38d504f7fa23c9f7604c413a5224a701 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 11 Aug 1996 19:06:14 +0000 Subject: [PATCH] More bug fixes --- ChangeLog | 8 +++ aclocal.in | 4 +- automake.in | 6 +- m4/AM_GNU_GETTEXT.m4 | 79 ------------------------ m4/AM_LC_MESSAGES.m4 | 12 ---- m4/AM_WITH_NLS.m4 | 142 ------------------------------------------- m4/Makefile.am | 9 ++- m4/Makefile.in | 13 ++-- 8 files changed, 24 insertions(+), 249 deletions(-) delete mode 100644 m4/AM_GNU_GETTEXT.m4 delete mode 100644 m4/AM_LC_MESSAGES.m4 delete mode 100644 m4/AM_WITH_NLS.m4 diff --git a/ChangeLog b/ChangeLog index 388e5e71..bb7644d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,15 @@ Sun Aug 11 00:20:16 1996 Tom Tromey + * aclocal.in (obsolete_macros): md_TYPE_PTRDIFF_T and + ud_PATH_LISPDIR are obsolete names. + + * m4/AM_LC_MESSAGES.m4, m4/AM_WITH_NLS.m4, m4/AM_GNU_GETTEXT.m4: + Removed. + * automake.in (handle_lib_objects): Changed interface. Now generates _DEPENDENCIES variable if appropriate. + (handle_emacs_lisp): Use AM_PATH_LISPDIR. + (scan_configure): Ditto. * Makefile.am (CLEANFILES): Removed. diff --git a/aclocal.in b/aclocal.in index 4180c347..9a47c1f6 100644 --- a/aclocal.in +++ b/aclocal.in @@ -47,12 +47,12 @@ $verbosity = 0; 'fp_WITH_REGEX', 'gm_PROG_LIBTOOL', 'jm_MAINTAINER_MODE', + 'md_TYPE_PTRDIFF_T', + 'ud_PATH_LISPDIR', # These aren't quite obsolete. # 'md_PATH_PROG', -# 'md_TYPE_PTRDIFF_T', # 'ud_GNU_GETTEXT', # 'ud_LC_MESSAGES', -# 'ud_PATH_LISPDIR', # 'ud_WITH_NLS' ); diff --git a/automake.in b/automake.in index dcddf0c1..28cb1d88 100755 --- a/automake.in +++ b/automake.in @@ -171,7 +171,7 @@ $seen_maint_mode = 0; $seen_package = 0; $seen_version = 0; -# TRUE if we've seen ud_PATH_LISPDIR. +# TRUE if we've seen AM_PATH_LISPDIR. $seen_lispdir = 0; @@ -2399,7 +2399,7 @@ sub handle_emacs_lisp if (&variable_defined ('lisp_LISP')) { $varname = 'lisp_LISP'; - &am_error ("\`lisp_LISP' defined but \`ud_PATH_LISPDIR' not in \`configure.in'") + &am_error ("\`lisp_LISP' defined but \`AM_PATH_LISPDIR' not in \`configure.in'") if ! $seen_lispdir; } else @@ -2596,7 +2596,7 @@ sub scan_configure $seen_prog_install = 1 if ! $seen_prog_install && /AC_PROG_INSTALL/; $seen_prog_install = 2 if /AM_PROG_INSTALL/; - $seen_lispdir = 1 if /ud_PATH_LISPDIR/; + $seen_lispdir = 1 if /AM_PATH_LISPDIR/; if (/AM_PROG_LIBTOOL/) { diff --git a/m4/AM_GNU_GETTEXT.m4 b/m4/AM_GNU_GETTEXT.m4 deleted file mode 100644 index ca120796..00000000 --- a/m4/AM_GNU_GETTEXT.m4 +++ /dev/null @@ -1,79 +0,0 @@ -# From Ulrich Drepper. - -AC_DEFUN(AM_GNU_GETTEXT, - [AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_ISC_POSIX])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_C_CONST])dnl - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - - AC_CHECK_HEADERS([limits.h locale.h nl_types.h malloc.h string.h unistd.h values.h]) - AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp]) - - if test "${ac_cv_func_stpcpy+set}" != "set"; then - AC_CHECK_FUNCS(stpcpy) - fi - if test "${ac_cv_func_stpcpy}" = "yes"; then - AC_DEFINE(HAVE_STPCPY) - fi - - AM_LC_MESSAGES - AM_WITH_NLS - - if test "x$CATOBJEXT" != "x"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for lang in ${LINGUAS=$ALL_LINGUAS}; do - case "$ALL_LINGUAS" in - *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; - esac - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi - - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - - dnl Determine which catalog format we have (if any is needed) - dnl For now we know about two different formats: - dnl Linux and the normal X/Open format - test -d intl || mkdir intl - if test "$CATOBJEXT" = ".cat"; then - AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) - - dnl Transform the SED scripts while copying because some dumb SEDs - dnl cannot handle comments. - sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed - fi - dnl po2tbl.sed is always needed. - sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ - $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed - - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ]) diff --git a/m4/AM_LC_MESSAGES.m4 b/m4/AM_LC_MESSAGES.m4 deleted file mode 100644 index c41e8199..00000000 --- a/m4/AM_LC_MESSAGES.m4 +++ /dev/null @@ -1,12 +0,0 @@ -dnl Check NLS options -dnl From Ulrich Drepper - -AC_DEFUN(AM_LC_MESSAGES, - [if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES) - fi - fi]) diff --git a/m4/AM_WITH_NLS.m4 b/m4/AM_WITH_NLS.m4 deleted file mode 100644 index 02a0ddc1..00000000 --- a/m4/AM_WITH_NLS.m4 +++ /dev/null @@ -1,142 +0,0 @@ -# From Ulrich Drepper. - -AC_DEFUN(AM_WITH_NLS, - [AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) - - dnl If we use NLS figure out what method - if test "$USE_NLS" = "yes"; then - AC_DEFINE(ENABLE_NLS) - AC_MSG_CHECKING([for explicitly using GNU gettext]) - AC_ARG_WITH(gnu-gettext, - [ --with-gnu-gettext use the GNU gettext library], - nls_cv_force_use_gnu_gettext=$withval, - nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) - - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - dnl User does not insist on using GNU NLS library. Figure out what - dnl to use. If gettext or catgets are available (in this order) we - dnl use this. Else we have to fall back to GNU NLS library. - dnl catgets is only used if permitted by option --with-catgets. - nls_cv_header_intl= - nls_cv_header_libgt= - CATOBJEXT=NONE - - AC_CHECK_HEADER(libintl.h, - [AC_CHECK_LIB(intl, main) - AC_CHECK_FUNC(gettext, - [AC_DEFINE(HAVE_GETTEXT) - md_PATH_PROG(MSGFMT, msgfmt, no)dnl - if test "$MSGFMT" != "no"; then - AC_CHECK_FUNCS(dcgettext) - md_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - md_PATH_PROG(XGETTEXT, xgettext, :) - CATOBJEXT=.mo - INSTOBJEXT=.mo - DATADIRNAME=lib - fi])]) - - if test "$CATOBJEXT" = "NONE"; then - AC_MSG_CHECKING([whether catgets can be used]) - AC_ARG_WITH(catgets, - [ --with-catgets use catgets functions if available], - nls_cv_use_catgets=$withval, nls_cv_use_catgets=no) - AC_MSG_RESULT($nls_cv_use_catgets) - - if test "$nls_cv_use_catgets" = "yes"; then - dnl No gettext in C library. Try catgets next. - AC_CHECK_LIB(i, main) - AC_CHECK_FUNC(catgets, - [AC_DEFINE(HAVE_CATGETS) - INTLOBJS="\$(CATOBJS)" - AC_PATH_PROG(GENCAT, gencat, no)dnl - if test "$GENCAT" != "no"; then - AC_PATH_PROGS(GMSGFMT, [gmsgfmt msgfmt], msgfmt) - md_PATH_PROG(XGETTEXT, xgettext, :) - CATOBJEXT=.cat - INSTOBJEXT=.cat - DATADIRNAME=lib - INTLDEPS="../intl/libintl.a" - INTLLIBS=$INTLDEPS - INTLSUB=intl - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h - fi]) - fi - fi - - if test "$CATOBJEXT" = "NONE"; then - dnl Neither gettext nor catgets in included in the C library. - dnl Fall back on GNU gettext library. - nls_cv_use_gnu_gettext=yes - fi - fi - - if test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Mark actions used to generate GNU NLS library. - INTLOBJS="\$(GETTOBJS)" - md_PATH_PROG(MSGFMT, msgfmt, msgfmt) - md_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - md_PATH_PROG(XGETTEXT, xgettext, :) - AC_SUBST(MSGFMT) - CATOBJEXT=.gmo - INSTOBJEXT=.mo - DATADIRNAME=share - INTLDEPS="../intl/libintl.a" - INTLLIBS=$INTLDEPS - INTLSUB=intl - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h - fi - - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is no GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext programs is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi - - # We need to process the po/ directory. - POSUB=po - else - DATADIRNAME=share - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h - fi - - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - - dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLDEPS) - AC_SUBST(INTLLIBS) - AC_SUBST(INTLOBJS) - AC_SUBST(INTLSUB) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) diff --git a/m4/Makefile.am b/m4/Makefile.am index 9d70880e..89ec65f3 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -5,8 +5,7 @@ MAINT_CHARSET = latin1 pkgdata_DATA = AM_C_PROTOTYPES.m4 AM_FEATURE_CTYPE.m4 \ AM_FEATURE_ERRNO.m4 AM_FEATURE_EXIT.m4 AM_FUNC_FNMATCH.m4 \ -AM_GNU_GETTEXT.m4 AM_LC_MESSAGES.m4 AM_MAINTAINER_MODE.m4 \ -AM_PATH_LISPDIR.m4 AM_PROG_CC_STDC.m4 AM_PROG_INSTALL.m4 \ -AM_PROG_LIBTOOL.m4 AM_SYSTEM_HEADER.m4 AM_TYPE_PTRDIFF_T.m4 \ -AM_WITH_DMALLOC.m4 AM_WITH_NLS.m4 AM_WITH_REGEX.m4 AM_FUNC_STRTOD.m4 \ -AM_INIT_AUTOMAKE.m4 +AM_MAINTAINER_MODE.m4 AM_PATH_LISPDIR.m4 AM_PROG_CC_STDC.m4 \ +AM_PROG_INSTALL.m4 AM_PROG_LIBTOOL.m4 AM_SYSTEM_HEADER.m4 \ +AM_TYPE_PTRDIFF_T.m4 AM_WITH_DMALLOC.m4 AM_WITH_REGEX.m4 \ +AM_FUNC_STRTOD.m4 AM_INIT_AUTOMAKE.m4 diff --git a/m4/Makefile.in b/m4/Makefile.in index 4f233a5e..45ca1eef 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.1b from Makefile.am +# Makefile.in generated automatically by automake 1.1c from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -43,12 +43,12 @@ MAINT_CHARSET = latin1 pkgdata_DATA = AM_C_PROTOTYPES.m4 AM_FEATURE_CTYPE.m4 \ AM_FEATURE_ERRNO.m4 AM_FEATURE_EXIT.m4 AM_FUNC_FNMATCH.m4 \ -AM_GNU_GETTEXT.m4 AM_LC_MESSAGES.m4 AM_MAINTAINER_MODE.m4 \ -AM_PATH_LISPDIR.m4 AM_PROG_CC_STDC.m4 AM_PROG_INSTALL.m4 \ -AM_PROG_LIBTOOL.m4 AM_SYSTEM_HEADER.m4 AM_TYPE_PTRDIFF_T.m4 \ -AM_WITH_DMALLOC.m4 AM_WITH_NLS.m4 AM_WITH_REGEX.m4 AM_FUNC_STRTOD.m4 \ -AM_INIT_AUTOMAKE.m4 +AM_MAINTAINER_MODE.m4 AM_PATH_LISPDIR.m4 AM_PROG_CC_STDC.m4 \ +AM_PROG_INSTALL.m4 AM_PROG_LIBTOOL.m4 AM_SYSTEM_HEADER.m4 \ +AM_TYPE_PTRDIFF_T.m4 AM_WITH_DMALLOC.m4 AM_WITH_REGEX.m4 \ +AM_FUNC_STRTOD.m4 AM_INIT_AUTOMAKE.m4 mkinstalldirs = $(top_srcdir)/mkinstalldirs +CONFIG_CLEAN_FILES = DATA = $(pkgdata_DATA) DIST_COMMON = Makefile.am Makefile.in @@ -129,6 +129,7 @@ mostlyclean-generic: clean-generic: test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) distclean-generic: rm -f Makefile $(DISTCLEANFILES) -- 2.43.5