diff options
| author | Jeff Bailey <jbailey@raspberryginger.com> | 2000-02-17 03:06:37 +0000 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2007-10-05 14:25:41 -0600 |
| commit | 4f3f490f8aa9c47dfe874dd156445ac05786fb44 (patch) | |
| tree | 68d78748693f5ef42b33504ae05d174b64381080 | |
| parent | b1dc6530fba203872ce2d5486d9bb8ef5dcd2530 (diff) | |
| download | m4-4f3f490f8aa9c47dfe874dd156445ac05786fb44.tar.gz | |
Import of m4-1.4dm4-1.4d
99 files changed, 2352 insertions, 5179 deletions
@@ -1,16 +1,16 @@ -Notes on the GNU Translation Project -************************************ +Notes on the Free Translation Project +************************************* - GNU is going international! The GNU Translation Project is a way to -get maintainers, translators, and users all together, so that GNU will -gradually become able to speak many languages. A few packages already -provide translations for their messages. + Free software is going international! The Free Translation Project +is a way to get maintainers of free software, translators, and users all +together, so that will gradually become able to speak many languages. +A few packages already provide translations for their messages. - If you found this `ABOUT-NLS' file inside a GNU distribution, you -may assume that the distributed package does use GNU `gettext' -internally, itself available at your nearest GNU archive site. But you -do *not* need to install GNU `gettext' prior to configuring, installing -or using this package with messages translated. + If you found this `ABOUT-NLS' file inside a distribution, you may +assume that the distributed package does use GNU `gettext' internally, +itself available at your nearest GNU archive site. But you do *not* +need to install GNU `gettext' prior to configuring, installing or using +this package with messages translated. Installers will find here some useful hints. These notes also explain how users should proceed for getting the programs to use the @@ -31,19 +31,23 @@ should configure it using ./configure --with-included-gettext to force usage of internationalizing routines provided within this -package, despite the existence of internationalizing capabilities in -the operating system where this package is being installed. So far, no -prior implementation provides as many useful features (such as locale -alias or message inheritance). It is also not possible to offer this -additional functionality on top of a `catgets' implementation. Future -versions of GNU `gettext' will very likely convey even more -functionality. So it might be a good idea to change to GNU `gettext' -as soon as possible. +package, despite the existence of internationalizing capabilities in the +operating system where this package is being installed. So far, only +the `gettext' implementation in the GNU C library version 2 provides as +many features (such as locale alias or message inheritance) as the +implementation here. It is also not possible to offer this additional +functionality on top of a `catgets' implementation. Future versions of +GNU `gettext' will very likely convey even more functionality. So it +might be a good idea to change to GNU `gettext' as soon as possible. + + So you need not provide this option if you are using GNU libc 2 or +you have installed a recent copy of the GNU gettext package with the +included `libintl'. INSTALL Matters =============== - Some GNU packages are "localizable" when properly installed; the + Some packages are "localizable" when properly installed; the programs they contain can be made to speak your own native language. Most such packages use GNU `gettext'. Other packages have their own ways to internationalization, predating GNU `gettext'. @@ -113,37 +117,35 @@ shell prompt, merely execute `setenv LANG de' (in `csh'), can be done from your `.login' or `.profile' file, once and for all. An operating system might already offer message localization for -many of its programs, while other programs (whether GNU or not) have -been installed locally with the full capabilities of GNU `gettext'. -Just using `gettext' extended syntax for `LANG' would break proper -localization of already available operating system programs. In this -case, users should set both `LANGUAGE' and `LANG' variables in their -environment, as programs using GNU `gettext' give preference to -`LANGUAGE'. For example, some Swedish users would rather read -translations in German than English for when Swedish is not available. -This is easily accomplished by setting `LANGUAGE' to `sv:de' while -leaving `LANG' to `sv'. +many of its programs, while other programs have been installed locally +with the full capabilities of GNU `gettext'. Just using `gettext' +extended syntax for `LANG' would break proper localization of already +available operating system programs. In this case, users should set +both `LANGUAGE' and `LANG' variables in their environment, as programs +using GNU `gettext' give preference to `LANGUAGE'. For example, some +Swedish users would rather read translations in German than English for +when Swedish is not available. This is easily accomplished by setting +`LANGUAGE' to `sv:de' while leaving `LANG' to `sv'. Translating Teams ================= - For the GNU Translation Project to be a success, we need interested + For the Free Translation Project to be a success, we need interested people who like their own language and write it well, and who are also able to synergize with other translators speaking the same language. Each translation team has its own mailing list, courtesy of Linux 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 February +in ISO 3166. The following translation teams exist, as of December 1997: - Arabic `ar', Chinese `zh', Czech `cs', Danish `da', Dutch `nl', - English `en', Esperanto `eo', Finnish `fi', French `fr', German - `de', Greek `el', Hebrew `he', Hungarian `hu', Irish `ga', Italian - `it', Indonesian `id', Japanese `ja', Korean `ko', Latin `la', - Norwegian `no', Persian `fa', Polish `pl', Portuguese `pt', - Russian `ru', Slovenian `sl', Spanish `es', Swedish `sv', Telugu - `te', Turkish `tr' and Ukrainian `uk'. + Chinese `zh', Czech `cs', Danish `da', Dutch `nl', English `en', + Esperanto `eo', Finnish `fi', French `fr', German `de', Hungarian + `hu', Irish `ga', Italian `it', Indonesian `id', Japanese `ja', + Korean `ko', Latin `la', Norwegian `no', Persian `fa', Polish + `pl', Portuguese `pt', Russian `ru', Slovenian `sl', Spanish `es', + Swedish `sv', and Turkish `tr'. For example, you may reach the Chinese translation team by writing to `zh@li.org'. @@ -160,55 +162,53 @@ message to `sv-request@li.org', having this message body: *actively* in translations, or at solving translational difficulties, rather than merely lurking around. If your team does not exist yet and you want to start one, or if you are unsure about what to do or how to -get started, please write to `gnu-translation@gnu.ai.mit.edu' to reach -the GNU coordinator for all translator teams. +get started, please write to `translation@iro.umontreal.ca' to reach the +coordinator for all translator teams. The English team is special. It works at improving and uniformizing -the terminology used in GNU. Proven linguistic skill are praised more -than programming skill, here. For the time being, please avoid -subscribing to the English team unless explicitly invited to do so. +the terminology in use. Proven linguistic skill are praised more than +programming skill, here. Available Packages ================== - Languages are not equally supported in all GNU packages. The -following matrix shows the current state of GNU internationalization, -as of February 1997. The matrix shows, in regard of each package, for -which languages PO files have been submitted to translation -coordination. - - Ready PO files cs de en es fi fr ja ko nl no pl pt sl sv - .-------------------------------------------. - bash | [] [] [] | 3 - bison | [] [] [] | 3 - clisp | [] [] [] | 3 - cpio | [] [] [] [] [] | 5 - diffutils | [] [] [] [] | 4 - enscript | [] [] [] [] [] | 5 - fileutils | [] [] [] [] [] [] [] [] | 8 - findutils | [] [] [] [] [] [] [] | 7 - flex | [] [] [] | 3 - gcal | [] [] [] | 3 - gettext | [] [] [] [] [] [] [] [] [] [] | 11 - grep | [] [] [] [] [] [] [] [] | 8 - hello | [] [] [] [] [] [] [] [] [] [] | 10 - id-utils | [] [] | 2 - indent | [] [] | 2 - libc | [] [] [] [] [] [] [] | 7 - m4 | [] [] [] [] [] | 5 - make | [] [] [] [] [] [] | 6 - music | [] | 1 - ptx | [] [] [] [] [] [] [] [] | 8 - recode | [] [] [] [] [] [] [] [] | 8 - sh-utils | [] [] [] [] [] | 5 - sharutils | [] [] [] [] [] | 5 - tar | [] [] [] [] [] [] [] [] [] | 9 - texinfo | | 0 - textutils | [] [] [] [] [] [] | 6 - wdiff | [] [] [] [] [] [] [] [] | 8 - `-------------------------------------------' - 14 languages cs de en es fi fr ja ko nl no pl pt sl sv - 27 packages 1 22 1 14 1 25 1 10 20 7 14 7 7 15 145 + Languages are not equally supported in all packages. The following +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 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 @@ -219,8 +219,8 @@ dialects. which it applies should also have been internationalized and distributed as such by its maintainer. There might be an observable lag between the mere existence a PO file and its wide availability in a -GNU distribution. +distribution. - If February 1997 seems to be old, you may fetch a more recent copy + If December 1997 seems to be old, you may fetch a more recent copy of this `ABOUT-NLS' file on most GNU archive sites. @@ -1,3 +1,28 @@ +1998-05-22 Erick Branderhorst <Erick.Branderhorst@asml.nl> + + * Prerelease 1.4d. + + * src/m4.c: #include <signal.h> not <sys/signal.h>. + + * src/Makefile.am: CFLAGS = -Wall @CFLAGS@. + + * checks/Makefile.am: explicit list tests in CHECKS. + + * configure.in, {,src,doc,lib,examples,checks}/Makefile.am, + src/{ansi2knr.{1,c}} doc/{m4.texinfo,mdate-sh}, missing, + mkinstalldirs, install-sh: Added automake (1.3) support. + + * lib/{alloca.c,error.{c,h},get{date.h,opt.{c,h},opt1.c}, + obstack.{c,h},regex.{c,h},strtol.c,xmalloc.c,xstrdup.c}: + Used libitize (0.4) to update. + + * configure.in, ABOUT-NLS, intl/*, po/*: Added gettextize + (0.10.25) support. Removed LOCALE, fr.msg, m4.cod and adjusted + README accordingly. + + * src/stackovf.c: #ifdef USE_STACKOVF ... #endif to (de-)activate + stack overflow functionality. + Sat Dec 3 20:45:31 1994 Francois Pinard (pinard@icule) * Prerelease 1.4.1. diff --git a/LOCALE b/LOCALE deleted file mode 100644 index b3ce2ee9..00000000 --- a/LOCALE +++ /dev/null @@ -1,41 +0,0 @@ -This GNU package is `localizable'. - -It can be made to speak your native language (or mother tongue). -If you are lucky, someone already did it for you. Check in the -distribution for `??.tt' files. `??' is usually one of: - - de for German - fr for French - nl for Dutch - sv for Swedish - -If your language is already supported, usage is quite simple. -Let's suppose, here, that you speak German. At the shell prompt, -merely execute `setenv LANG de' (in csh) or `export LANG; LANG=de' -(in sh). You may want to put this in your .login or .profile file. - -If your language is not supported, you have to work a bit for it. -Let's suppose again that you speak German. Eventually, when the GNU -locale package will have been published, you will follow these steps: - -1) Check with the maintainer if the work has been, or is being done. -2) Ensure that GNU locale has been installed on your site. -3) In the distribution, initialize `de.tt' by copying `fr.tt'. -4) Carefully edit `de.tt', replacing French parts by German parts. -5) Edit `Makefile.in', adding `de.msg' to the `CATALOGS =' line. -6) You do not need to reconfigure again. Execute `make install'. -7) Use `setenv LANG de', and just use the programs as usual. -8) Send `de.tt' to the maintainer, to be later distributed in GNU. - -But for the time being, GNU local package is still in alpha pretest, -so you are not completely free of me yet! Follow these steps: - -1) Check with the maintainer if the work has been, or is being done. -2) In the distribution, initialize `de.tt' by copying `fr.tt'. -3) Carefully edit `de.tt', replacing French parts by German parts. -4) Send `de.tt' to the maintainer, then wait for `de.msg' in return. -5) Install `de.msg' as `/usr/local/share/locale/de/PACKAGE.msg'. -6) Use `setenv LANG de', and just use the programs as usual. - -In step 5), of course, replace PACKAGE by the GNU package name, which -is usually the first word in the name of the distributed tar file. diff --git a/Makefile.am b/Makefile.am index 81175178..df568f39 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,4 @@ SUBDIRS=intl po doc lib src checks examples -EXTRA_DIST = LOCALE +EXTRA_DIST = c-boxes.el # Franc,ois, is this still needed? (EB) + diff --git a/Makefile.in b/Makefile.in index 03075029..1dfd4121 100644 --- a/Makefile.in +++ b/Makefile.in @@ -57,15 +57,13 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ AWK = @AWK@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ GENCAT = @GENCAT@ -GLOCALE = @GLOCALE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GT_NO = @GT_NO@ @@ -75,13 +73,9 @@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ -LD = @LD@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -NM = @NM@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ POSUB = @POSUB@ @@ -95,7 +89,7 @@ l = @l@ SUBDIRS=intl po doc lib src checks examples -EXTRA_DIST = LOCALE +EXTRA_DIST = c-boxes.el # Franc,ois, is this still needed? (EB) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h @@ -103,7 +97,7 @@ CONFIG_CLEAN_FILES = DIST_COMMON = README ABOUT-NLS AUTHORS BACKLOG COPYING ChangeLog \ INSTALL Makefile.am Makefile.in NEWS THANKS TODO acconfig.h aclocal.m4 \ config.guess config.h.in config.sub configure configure.in install-sh \ -ltconfig ltmain.sh missing mkinstalldirs stamp-h.in +missing mkinstalldirs stamp-h.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -319,7 +313,6 @@ clean: clean-recursive clean-am distclean: distclean-recursive distclean-am -rm -f config.status - -rm -f libtool maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" @@ -1,12 +1,12 @@ -GNU m4 NEWS - User visible changes. +GNU m4 NEWS - History of user-visible changes. -*-indented-text-*- Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. -Version 1.4a - October 1997, by Erick Branderhorst -* Standardized package from automake support. +Version 1.5 - June 1998, by ?? (Erick Branderhorst, Rene' Seindal) +* GNU m4 now uses gettext to support internationalization. +* GNU m4 now uses automake to control Makefile.in generation. This + should make it more consistent with the GNU standards. -Version 1.4.x - -* Implement a GNU message catalog for French. +* Implement a GNU message catalog for French (Franc,ois Pinard). Version 1.4 - October 1994, by Franc,ois Pinard @@ -18,7 +18,7 @@ use m4 seriously, you might find useful material down there. See file `BACKLOG' for a summary of pending mail and articles. See file `COPYING' for copying conditions. See file `INSTALL' for compilation and installation instructions. -See file `LOCALE' for how to customize this program to your language. +See file `ABOUT-NLS' for how to customize this program to your language. See file `NEWS' for a list of major changes in the current release. See file `THANKS' for a list of contributors. @@ -23,6 +23,7 @@ Eric Allman eric@cs.berkeley.edu Eric Backus ericb@lsid.hp.com Franc,ois Pinard pinard@iro.umontreal.ca Geoff Russell grussell@guest.adelaide.edu.au +Greg A. Woods woods@web.apc.org Hal Peterson hrp@pecan.cray.com Hoang Uong hoang@ornews.intel.com Ian Taylor ian@cygnus.com @@ -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 @@ -135,248 +135,11 @@ fi AC_SUBST($1)]) -# serial 24 AM_PROG_LIBTOOL -AC_DEFUN(AM_PROG_LIBTOOL, -[AC_REQUIRE([AM_ENABLE_SHARED])dnl -AC_REQUIRE([AM_ENABLE_STATIC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_PROG_RANLIB])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AM_PROG_LD])dnl -AC_REQUIRE([AM_PROG_NM])dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -dnl -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -# Check for any special flags to pass to ltconfig. -libtool_flags= -test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" -test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" -test "$silent" = yes && libtool_flags="$libtool_flags --silent" -test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" -test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case "$host" in -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case "`/usr/bin/file conftest.o`" in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - CFLAGS="$CFLAGS -belf" - ;; -esac - -# Actually configure libtool. ac_aux_dir is where install-sh is found. -CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ -LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ -$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ -|| AC_MSG_ERROR([libtool configure failed]) -]) - -# AM_ENABLE_SHARED - implement the --enable-shared flag -# Usage: AM_ENABLE_SHARED[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. -AC_DEFUN(AM_ENABLE_SHARED, -[define([AM_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(shared, -changequote(<<, >>)dnl -<< --enable-shared build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT] -changequote([, ])dnl -[ --enable-shared=PKGS only build shared libraries if the current package - appears as an element in the PKGS list], -[p=${PACKAGE-default} -case "$enableval" in -yes) enable_shared=yes ;; -no) enable_shared=no ;; -*) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_shared=AM_ENABLE_SHARED_DEFAULT)dnl -]) - -# AM_DISABLE_SHARED - set the default shared flag to --disable-shared -AC_DEFUN(AM_DISABLE_SHARED, -[AM_ENABLE_SHARED(no)]) - -# AM_DISABLE_STATIC - set the default static flag to --disable-static -AC_DEFUN(AM_DISABLE_STATIC, -[AM_ENABLE_STATIC(no)]) - -# AM_ENABLE_STATIC - implement the --enable-static flag -# Usage: AM_ENABLE_STATIC[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. -AC_DEFUN(AM_ENABLE_STATIC, -[define([AM_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(static, -changequote(<<, >>)dnl -<< --enable-static build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT] -changequote([, ])dnl -[ --enable-static=PKGS only build shared libraries if the current package - appears as an element in the PKGS list], -[p=${PACKAGE-default} -case "$enableval" in -yes) enable_static=yes ;; -no) enable_static=no ;; -*) - enable_static=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_static=AM_ENABLE_STATIC_DEFAULT)dnl -]) - - -# AM_PROG_LD - find the path to the GNU or non-GNU linker -AC_DEFUN(AM_PROG_LD, -[AC_ARG_WITH(gnu-ld, -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) -AC_REQUIRE([AC_PROG_CC]) -ac_prog=ld -if test "$ac_cv_prog_gcc" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) - ac_prog=`($CC -print-prog-name=ld) 2>&5` - case "$ac_prog" in - # Accept absolute paths. - /* | [A-Za-z]:\\*) - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(ac_cv_path_LD, -[if test -z "$LD"; then - 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_prog"; then - ac_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then - test "$with_gnu_ld" != no && break - else - test "$with_gnu_ld" != yes && break - fi - fi - done - IFS="$ac_save_ifs" -else - ac_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$ac_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT($LD) -else - AC_MSG_RESULT(no) -fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_SUBST(LD) -AM_PROG_LD_GNU -]) - -AC_DEFUN(AM_PROG_LD_GNU, -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then - ac_cv_prog_gnu_ld=yes -else - ac_cv_prog_gnu_ld=no -fi]) -]) - -# AM_PROG_NM - find the path to a BSD-compatible name lister -AC_DEFUN(AM_PROG_NM, -[AC_MSG_CHECKING([for BSD-compatible nm]) -AC_CACHE_VAL(ac_cv_path_NM, -[case "$NM" in -/* | [A-Za-z]:\\*) - ac_cv_path_NM="$NM" # Let the user override the test with a path. - ;; -*) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/nm; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - ac_cv_path_NM="$ac_dir/nm -B" - elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - ac_cv_path_NM="$ac_dir/nm -p" - else - ac_cv_path_NM="$ac_dir/nm" - fi - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm - ;; -esac]) -NM="$ac_cv_path_NM" -AC_MSG_RESULT([$NM]) -AC_SUBST(NM) -]) - - # serial 1 AC_DEFUN(AM_C_PROTOTYPES, [AC_REQUIRE([AM_PROG_CC_STDC]) +AC_REQUIRE([AC_PROG_CPP]) AC_MSG_CHECKING([for function prototypes]) if test "$am_cv_prog_cc_stdc" != no; then AC_MSG_RESULT(yes) @@ -502,12 +265,12 @@ fi], [AC_MSG_RESULT(no)]) # Macro to add for using GNU gettext. # Ulrich Drepper <drepper@cygnus.com>, 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]) @@ -549,9 +312,10 @@ AC_DEFUN(AM_WITH_NLS, 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" \ @@ -645,7 +409,7 @@ AC_DEFUN(AM_WITH_NLS, : ; 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 @@ -657,6 +421,12 @@ AC_DEFUN(AM_WITH_NLS, 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. @@ -701,9 +471,9 @@ AC_DEFUN(AM_GNU_GETTEXT, 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) @@ -811,7 +581,7 @@ __argz_count __argz_stringify __argz_next]) # Search path for a program which passes the given test. # Ulrich Drepper <drepper@cygnus.com>, 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. @@ -859,7 +629,7 @@ AC_SUBST($1)dnl # Check whether LC_MESSAGES is available in <locale.h>. # Ulrich Drepper <drepper@cygnus.com>, 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 --git a/c-boxes.el b/c-boxes.el new file mode 100644 index 00000000..c1b80e33 --- /dev/null +++ b/c-boxes.el @@ -0,0 +1,406 @@ +;;; Boxed comments for C mode. +;;; Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc. +;;; Francois Pinard <pinard@iro.umontreal.ca>, April 1991. +;;; +;;; I often refill paragraphs inside C comments, while stretching or +;;; shrinking the surrounding box as needed. This is a real pain to +;;; do by hand. Here is the code I made to ease my life on this, +;;; usable from within GNU Emacs. It would not be fair giving all +;;; sources for a product without also giving the means for nicely +;;; modifying them. +;;; +;;; The function rebox-c-comment adjust comment boxes without +;;; refilling comment paragraphs, while reindent-c-comment adjust +;;; comment boxes after refilling. Numeric prefixes are used to add, +;;; remove, or change the style of the box surrounding the comment. +;;; Since refilling paragraphs in C mode does make sense only for +;;; comments, this code redefines the M-q command in C mode. I use +;;; this hack by putting, in my .emacs file: +;;; +;;; (setq c-mode-hook +;;; '(lambda () +;;; (define-key c-mode-map "\M-q" 'reindent-c-comment))) +;;; (autoload 'rebox-c-comment "c-boxes" nil t) +;;; (autoload 'reindent-c-comment "c-boxes" nil t) +;;; +;;; The cursor should be within a comment before any of these +;;; commands, or else it should be between two comments, in which case +;;; the command applies to the next comment. When the command is +;;; given without prefix, the current comment box type is recognized +;;; and preserved. Given 0 as a prefix, the comment box disappears +;;; and the comment stays between a single opening `/*' and a single +;;; closing `*/'. Given 1 or 2 as a prefix, a single or doubled lined +;;; comment box is forced. Given 3 as a prefix, a Taarna style box is +;;; forced, but you do not even want to hear about those. When a +;;; negative prefix is given, the absolute value is used, but the +;;; default style is changed. Any other value (like C-u alone) forces +;;; the default box style. +;;; +;;; I observed rounded corners first in some code from Warren Tucker +;;; <wht@n4hgf.mt-park.ga.us>. + +(defvar c-box-default-style 'single "*Preferred style for box comments.") +(defvar c-mode-taarna-style nil "*Non-nil for Taarna team C-style.") + +;;; Set or reset the Taarna team's own way for a C style. + +(defun taarna-mode () + (interactive) + (if c-mode-taarna-style + (progn + + (setq c-mode-taarna-style nil) + (setq c-indent-level 2) + (setq c-continued-statement-offset 2) + (setq c-brace-offset 0) + (setq c-argdecl-indent 5) + (setq c-label-offset -2) + (setq c-tab-always-indent t) + (setq c-box-default-style 'single) + (message "C mode: GNU style")) + + (setq c-mode-taarna-style t) + (setq c-indent-level 4) + (setq c-continued-statement-offset 4) + (setq c-brace-offset -4) + (setq c-argdecl-indent 4) + (setq c-label-offset -4) + (setq c-tab-always-indent t) + (setq c-box-default-style 'taarna) + (message "C mode: Taarna style"))) + +;;; Return the minimum value of the left margin of all lines, or -1 if +;;; all lines are empty. + +(defun buffer-left-margin () + (let ((margin -1)) + (goto-char (point-min)) + (while (not (eobp)) + (skip-chars-forward " \t") + (if (not (looking-at "\n")) + (setq margin + (if (< margin 0) + (current-column) + (min margin (current-column))))) + (forward-line 1)) + margin)) + +;;; Return the maximum value of the right margin of all lines. Any +;;; sentence ending a line has a space guaranteed before the margin. + +(defun buffer-right-margin () + (let ((margin 0) period) + (goto-char (point-min)) + (while (not (eobp)) + (end-of-line) + (if (bobp) + (setq period 0) + (backward-char 1) + (setq period (if (looking-at "[.?!]") 1 0)) + (forward-char 1)) + (setq margin (max margin (+ (current-column) period))) + (forward-char 1)) + margin)) + +;;; Add, delete or adjust a C comment box. If FLAG is nil, the +;;; current boxing style is recognized and preserved. When 0, the box +;;; is removed; when 1, a single lined box is forced; when 2, a double +;;; lined box is forced; when 3, a Taarna style box is forced. If +;;; negative, the absolute value is used, but the default style is +;;; changed. For any other value (like C-u), the default style is +;;; forced. If REFILL is not nil, refill the comment paragraphs prior +;;; to reboxing. + +(defun rebox-c-comment-engine (flag refill) + (save-restriction + (let ((undo-list buffer-undo-list) + (marked-point (point-marker)) + (saved-point (point)) + box-style left-margin right-margin) + + ;; First, find the limits of the block of comments following or + ;; enclosing the cursor, or return an error if the cursor is not + ;; within such a block of comments, narrow the buffer, and + ;; untabify it. + + ;; - insure the point is into the following comment, if any + + (skip-chars-forward " \t\n") + (if (looking-at "/\\*") + (forward-char 2)) + + (let ((here (point)) start end temp) + + ;; - identify a minimal comment block + + (search-backward "/*") + (setq temp (point)) + (beginning-of-line) + (setq start (point)) + (skip-chars-forward " \t") + (if (< (point) temp) + (progn + (goto-char saved-point) + (error "text before comment's start"))) + (search-forward "*/") + (setq temp (point)) + (end-of-line) + (if (looking-at "\n") + (forward-char 1)) + (setq end (point)) + (skip-chars-backward " \t\n") + (if (> (point) temp) + (progn + (goto-char saved-point) + (error "text after comment's end"))) + (if (< end here) + (progn + (goto-char saved-point) + (error "outside any comment block"))) + + ;; - try to extend the comment block backwards + + (goto-char start) + (while (and (not (bobp)) + (progn (previous-line 1) + (beginning-of-line) + (looking-at "[ \t]*/\\*.*\\*/[ \t]*$"))) + (setq start (point))) + + ;; - try to extend the comment block forward + + (goto-char end) + (while (looking-at "[ \t]*/\\*.*\\*/[ \t]*$") + (forward-line 1) + (beginning-of-line) + (setq end (point))) + + ;; - narrow to the whole block of comments + + (narrow-to-region start end)) + + ;; Second, remove all the comment marks, and move all the text + ;; rigidly to the left to insure the left margin stays at the + ;; same place. At the same time, recognize and save the box + ;; style in BOX-STYLE. + + (let ((previous-margin (buffer-left-margin)) + actual-margin) + + ;; - remove all comment marks + + (goto-char (point-min)) + (replace-regexp "^\\([ \t]*\\)/\\*" "\\1 ") + (goto-char (point-min)) + (replace-regexp "^\\([ \t]*\\)|" "\\1 ") + (goto-char (point-min)) + (replace-regexp "\\(\\*/\\||\\)[ \t]*" "") + (goto-char (point-min)) + (replace-regexp "\\*/[ \t]*/\\*" " ") + + ;; - remove the first and last dashed lines + + (setq box-style 'plain) + (goto-char (point-min)) + (if (looking-at "^[ \t]*-*[.\+\\]?[ \t]*\n") + (progn + (setq box-style 'single) + (replace-match "")) + (if (looking-at "^[ \t]*=*[.\+\\]?[ \t]*\n") + (progn + (setq box-style 'double) + (replace-match "")))) + (goto-char (point-max)) + (previous-line 1) + (beginning-of-line) + (if (looking-at "^[ \t]*[`\+\\]?*[-=]+[ \t]*\n") + (progn + (if (eq box-style 'plain) + (setq box-style 'taarna)) + (replace-match ""))) + + ;; - remove all spurious whitespace + + (goto-char (point-min)) + (replace-regexp "[ \t]+$" "") + (goto-char (point-min)) + (if (looking-at "\n+") + (replace-match "")) + (goto-char (point-max)) + (skip-chars-backward "\n") + (if (looking-at "\n\n+") + (replace-match "\n")) + (goto-char (point-min)) + (replace-regexp "\n\n\n+" "\n\n") + + ;; - move the text left is adequate + + (setq actual-margin (buffer-left-margin)) + (if (not (= previous-margin actual-margin)) + (indent-rigidly (point-min) (point-max) + (- previous-margin actual-margin)))) + + ;; Third, select the new box style from the old box style and + ;; the argument, choose the margins for this style and refill + ;; each paragraph. + + ;; - modify box-style only if flag is defined + + (if flag + (setq box-style + (cond ((eq flag 0) 'plain) + ((eq flag 1) 'single) + ((eq flag 2) 'double) + ((eq flag 3) 'taarna) + ((eq flag '-) (setq c-box-default-style 'plain) 'plain) + ((eq flag -1) (setq c-box-default-style 'single) 'single) + ((eq flag -2) (setq c-box-default-style 'double) 'double) + ((eq flag -3) (setq c-box-default-style 'taarna) 'taarna) + (t c-box-default-style)))) + + ;; - compute the left margin + + (setq left-margin (buffer-left-margin)) + + ;; - temporarily set the fill prefix and column, then refill + + (untabify (point-min) (point-max)) + + (if refill + (let ((fill-prefix (make-string left-margin ? )) + (fill-column (- fill-column + (if (memq box-style '(single double)) 4 6)))) + (fill-region (point-min) (point-max)))) + + ;; - compute the right margin after refill + + (setq right-margin (buffer-right-margin)) + + ;; Fourth, put the narrowed buffer back into a comment box, + ;; according to the value of box-style. Values may be: + ;; plain: insert between a single pair of comment delimiters + ;; single: complete box, overline and underline with dashes + ;; double: complete box, overline and underline with equal signs + ;; taarna: comment delimiters on each line, underline with dashes + + ;; - move the right margin to account for left inserts + + (setq right-margin (+ right-margin + (if (memq box-style '(single double)) + 2 + 3))) + + ;; - construct the box comment, from top to bottom + + (goto-char (point-min)) + (cond ((eq box-style 'plain) + + ;; - construct a plain style comment + + (skip-chars-forward " " (+ (point) left-margin)) + (insert (make-string (- left-margin (current-column)) ? ) + "/* ") + (end-of-line) + (forward-char 1) + (while (not (eobp)) + (skip-chars-forward " " (+ (point) left-margin)) + (insert (make-string (- left-margin (current-column)) ? ) + " ") + (end-of-line) + (forward-char 1)) + (backward-char 1) + (insert " */")) + ((eq box-style 'single) + + ;; - construct a single line style comment + + (indent-to left-margin) + (insert "/*") + (insert (make-string (- right-margin (current-column)) ?-) + "-.\n") + (while (not (eobp)) + (skip-chars-forward " " (+ (point) left-margin)) + (insert (make-string (- left-margin (current-column)) ? ) + "| ") + (end-of-line) + (indent-to right-margin) + (insert " |") + (forward-char 1)) + (indent-to left-margin) + (insert "`") + (insert (make-string (- right-margin (current-column)) ?-) + "*/\n")) + ((eq box-style 'double) + + ;; - construct a double line style comment + + (indent-to left-margin) + (insert "/*") + (insert (make-string (- right-margin (current-column)) ?=) + "=\\\n") + (while (not (eobp)) + (skip-chars-forward " " (+ (point) left-margin)) + (insert (make-string (- left-margin (current-column)) ? ) + "| ") + (end-of-line) + (indent-to right-margin) + (insert " |") + (forward-char 1)) + (indent-to left-margin) + (insert "\\") + (insert (make-string (- right-margin (current-column)) ?=) + "*/\n")) + ((eq box-style 'taarna) + + ;; - construct a Taarna style comment + + (while (not (eobp)) + (skip-chars-forward " " (+ (point) left-margin)) + (insert (make-string (- left-margin (current-column)) ? ) + "/* ") + (end-of-line) + (indent-to right-margin) + (insert " */") + (forward-char 1)) + (indent-to left-margin) + (insert "/* ") + (insert (make-string (- right-margin (current-column)) ?-) + " */\n")) + (t (error "unknown box style"))) + + ;; Fifth, retabify, restore the point position, then cleanup the + ;; undo list of any boundary since we started. + + ;; - retabify before left margin only (adapted from tabify.el) + + (goto-char (point-min)) + (while (re-search-forward "^[ \t][ \t][ \t]*" nil t) + (let ((column (current-column)) + (indent-tabs-mode t)) + (delete-region (match-beginning 0) (point)) + (indent-to column))) + + ;; - restore the point position + + (goto-char (marker-position marked-point)) + + ;; - remove all intermediate boundaries from the undo list + + (if (not (eq buffer-undo-list undo-list)) + (let ((cursor buffer-undo-list)) + (while (not (eq (cdr cursor) undo-list)) + (if (car (cdr cursor)) + (setq cursor (cdr cursor)) + (rplacd cursor (cdr (cdr cursor)))))))))) + +;;; Rebox a C comment without refilling it. + +(defun rebox-c-comment (flag) + (interactive "P") + (rebox-c-comment-engine flag nil)) + +;;; Rebox a C comment after refilling. + +(defun reindent-c-comment (flag) + (interactive "P") + (rebox-c-comment-engine flag t)) diff --git a/checks/01.define b/checks/01.define index 206c0c3a..823c2087 100644 --- a/checks/01.define +++ b/checks/01.define @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:938: Origin of test +dnl ../doc/m4.texinfo:937: Origin of test define(`foo', `Hello world.') dnl @result{} foo diff --git a/checks/02.arguments b/checks/02.arguments index c8f820c7..d605ffe7 100644 --- a/checks/02.arguments +++ b/checks/02.arguments @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:962: Origin of test +dnl ../doc/m4.texinfo:961: Origin of test define(`exch', `$2, $1') dnl @result{} exch(arg1, arg2) diff --git a/checks/03.arguments b/checks/03.arguments index 358a4cfe..f29aa4da 100644 --- a/checks/03.arguments +++ b/checks/03.arguments @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:972: Origin of test +dnl ../doc/m4.texinfo:971: Origin of test define(`exch', `$2, $1') dnl @result{} define(exch(``expansion text'', ``macro'')) diff --git a/checks/04.arguments b/checks/04.arguments index 6d4f10ac..324c1668 100644 --- a/checks/04.arguments +++ b/checks/04.arguments @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:992: Origin of test +dnl ../doc/m4.texinfo:991: Origin of test define(`test', ``Macro name: $0'') dnl @result{} test diff --git a/checks/05.arguments b/checks/05.arguments index d7ebbb3f..b0fba85c 100644 --- a/checks/05.arguments +++ b/checks/05.arguments @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1002: Origin of test +dnl ../doc/m4.texinfo:1001: Origin of test define(`foo', `This is macro `foo'.') dnl @result{} foo diff --git a/checks/06.pseudo_argu b/checks/06.pseudo_argu index 42b76444..cd6b6ea3 100644 --- a/checks/06.pseudo_argu +++ b/checks/06.pseudo_argu @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1026: Origin of test +dnl ../doc/m4.texinfo:1025: Origin of test define(`nargs', `$#') dnl @result{} nargs diff --git a/checks/07.pseudo_argu b/checks/07.pseudo_argu index 88ecaf9f..557b01ac 100644 --- a/checks/07.pseudo_argu +++ b/checks/07.pseudo_argu @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1040: Origin of test +dnl ../doc/m4.texinfo:1039: Origin of test define(`echo', `$*') dnl @result{} echo(arg1, arg2, arg3 , arg4) diff --git a/checks/08.pseudo_argu b/checks/08.pseudo_argu index 69054410..c887d610 100644 --- a/checks/08.pseudo_argu +++ b/checks/08.pseudo_argu @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1051: Origin of test +dnl ../doc/m4.texinfo:1050: Origin of test define(`echo', `$@') dnl @result{} echo(arg1, arg2, arg3 , arg4) diff --git a/checks/09.pseudo_argu b/checks/09.pseudo_argu index 2b83c3aa..566b2531 100644 --- a/checks/09.pseudo_argu +++ b/checks/09.pseudo_argu @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1061: Origin of test +dnl ../doc/m4.texinfo:1060: Origin of test define(`echo1', `$*') dnl @result{} define(`echo2', `$@') diff --git a/checks/10.pseudo_argu b/checks/10.pseudo_argu index a623244f..1da4c30d 100644 --- a/checks/10.pseudo_argu +++ b/checks/10.pseudo_argu @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1081: Origin of test +dnl ../doc/m4.texinfo:1080: Origin of test define(`foo', `$$$ hello $$$') dnl @result{} foo diff --git a/checks/11.undefine b/checks/11.undefine index 254890d0..65daa4df 100644 --- a/checks/11.undefine +++ b/checks/11.undefine @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1112: Origin of test +dnl ../doc/m4.texinfo:1111: Origin of test foo dnl @result{}foo define(`foo', `expansion text') diff --git a/checks/12.defn b/checks/12.defn index bc6e67f7..8526c40b 100644 --- a/checks/12.defn +++ b/checks/12.defn @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1157: Origin of test +dnl ../doc/m4.texinfo:1156: Origin of test define(`zap', defn(`undefine')) dnl @result{} zap(`undefine') diff --git a/checks/13.pushdef b/checks/13.pushdef index a1269ec6..e01a40c0 100644 --- a/checks/13.pushdef +++ b/checks/13.pushdef @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1203: Origin of test +dnl ../doc/m4.texinfo:1202: Origin of test define(`foo', `Expansion one.') dnl @result{} foo diff --git a/checks/14.pushdef b/checks/14.pushdef index fe781ce9..4158768c 100644 --- a/checks/14.pushdef +++ b/checks/14.pushdef @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1227: Origin of test +dnl ../doc/m4.texinfo:1226: Origin of test define(`foo', `Expansion one.') dnl @result{} foo diff --git a/checks/15.indir b/checks/15.indir index 4545df5b..19fe37db 100644 --- a/checks/15.indir +++ b/checks/15.indir @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1271: Origin of test +dnl ../doc/m4.texinfo:1270: Origin of test define(`$$internal$macro', `Internal macro (name `$0')') dnl @result{} $$internal$macro diff --git a/checks/16.ifdef b/checks/16.ifdef index ae9bf780..371723e3 100644 --- a/checks/16.ifdef +++ b/checks/16.ifdef @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1342: Origin of test +dnl ../doc/m4.texinfo:1341: Origin of test ifdef(`foo', ``foo' is defined', ``foo' is not defined') dnl @result{}foo is not defined define(`foo', `') diff --git a/checks/17.ifelse b/checks/17.ifelse index 5d1883f8..e763723d 100644 --- a/checks/17.ifelse +++ b/checks/17.ifelse @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1380: Origin of test +dnl ../doc/m4.texinfo:1379: Origin of test ifelse(foo, bar, `true') dnl @result{} ifelse(foo, foo, `true') diff --git a/checks/18.ifelse b/checks/18.ifelse index 5d389288..18d56760 100644 --- a/checks/18.ifelse +++ b/checks/18.ifelse @@ -1,3 +1,3 @@ -dnl ../doc/m4.texinfo:1399: Origin of test +dnl ../doc/m4.texinfo:1398: Origin of test ifelse(foo, bar, `third', gnu, gnats, `sixth', `seventh') dnl @result{}seventh diff --git a/checks/19.loops b/checks/19.loops index 673a1bda..3f22906c 100644 --- a/checks/19.loops +++ b/checks/19.loops @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1436: Origin of test +dnl ../doc/m4.texinfo:1435: Origin of test shift(bar) dnl @result{} shift(foo, bar, baz) diff --git a/checks/20.loops b/checks/20.loops index cb6a09ef..b52aaea0 100644 --- a/checks/20.loops +++ b/checks/20.loops @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1446: Origin of test +dnl ../doc/m4.texinfo:1445: Origin of test define(`reverse', `ifelse($#, 0, , $#, 1, ``$1'', `reverse(shift($@)), `$1'')') dnl @result{} diff --git a/checks/21.dumpdef b/checks/21.dumpdef index 16c31313..df0c0021 100644 --- a/checks/21.dumpdef +++ b/checks/21.dumpdef @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1560: Origin of test +dnl ../doc/m4.texinfo:1559: Origin of test define(`foo', `Hello world.') dnl @result{} dumpdef(`foo') diff --git a/checks/22.trace b/checks/22.trace index 58096168..467f9690 100644 --- a/checks/22.trace +++ b/checks/22.trace @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1605: Origin of test +dnl ../doc/m4.texinfo:1604: Origin of test define(`foo', `Hello World.') dnl @result{} define(`echo', `$@') diff --git a/checks/23.dnl b/checks/23.dnl index 2ae11585..ecdb9b24 100644 --- a/checks/23.dnl +++ b/checks/23.dnl @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1756: Origin of test +dnl ../doc/m4.texinfo:1755: Origin of test define(`foo', `Macro `foo'.')dnl A very simple macro, indeed. foo dnl @result{}Macro foo. diff --git a/checks/24.changequote b/checks/24.changequote index a5a667a5..a523f2e9 100644 --- a/checks/24.changequote +++ b/checks/24.changequote @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1794: Origin of test +dnl ../doc/m4.texinfo:1793: Origin of test changequote([, ]) dnl @result{} define([foo], [Macro [foo].]) diff --git a/checks/25.changequote b/checks/25.changequote index dadb258c..bd71cb96 100644 --- a/checks/25.changequote +++ b/checks/25.changequote @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1806: Origin of test +dnl ../doc/m4.texinfo:1805: Origin of test changequote([[, ]]) dnl @result{} define([[foo]], [[Macro [[[foo]]].]]) diff --git a/checks/26.changequote b/checks/26.changequote index 954d9382..ed067f50 100644 --- a/checks/26.changequote +++ b/checks/26.changequote @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1818: Origin of test +dnl ../doc/m4.texinfo:1817: Origin of test define(`foo', `Macro `FOO'.') dnl @result{} changequote(, ) diff --git a/checks/27.changecom b/checks/27.changecom index 042f9ea1..7a1dfa60 100644 --- a/checks/27.changecom +++ b/checks/27.changecom @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1858: Origin of test +dnl ../doc/m4.texinfo:1857: Origin of test define(`comment', `COMMENT') dnl @result{} # A normal comment diff --git a/checks/28.changecom b/checks/28.changecom index 9a981960..fce2579c 100644 --- a/checks/28.changecom +++ b/checks/28.changecom @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:1879: Origin of test +dnl ../doc/m4.texinfo:1878: Origin of test define(`comment', `COMMENT') dnl @result{} changecom diff --git a/checks/29.m4wrap b/checks/29.m4wrap index f981d47c..39d6682e 100644 --- a/checks/29.m4wrap +++ b/checks/29.m4wrap @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2018: Origin of test +dnl ../doc/m4.texinfo:2017: Origin of test define(`cleanup', `This is the `cleanup' actions. ') dnl @result{} diff --git a/checks/30.include b/checks/30.include index 2428ff75..9a2052ea 100644 --- a/checks/30.include +++ b/checks/30.include @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2077: Origin of test +dnl ../doc/m4.texinfo:2076: Origin of test include(`no-such-file') dnl @result{} dnl @error{}30.include:2: m4: Cannot open no-such-file: No such file or directory diff --git a/checks/31.include b/checks/31.include index b8c69e84..4f6b5d3e 100644 --- a/checks/31.include +++ b/checks/31.include @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2097: Origin of test +dnl ../doc/m4.texinfo:2096: Origin of test define(`foo', `FOO') dnl @result{} include(`incl.m4') diff --git a/checks/32.include b/checks/32.include index eb6e6e50..d76a1c82 100644 --- a/checks/32.include +++ b/checks/32.include @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2112: Origin of test +dnl ../doc/m4.texinfo:2111: Origin of test define(`bar', include(`incl.m4')) dnl @result{} This is `bar': >>>bar<<< diff --git a/checks/33.divert b/checks/33.divert index c4c51dfa..79d7c688 100644 --- a/checks/33.divert +++ b/checks/33.divert @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2200: Origin of test +dnl ../doc/m4.texinfo:2199: Origin of test divert(1) This text is diverted. divert diff --git a/checks/34.divert b/checks/34.divert index 2802accd..e7d403f2 100644 --- a/checks/34.divert +++ b/checks/34.divert @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2220: Origin of test +dnl ../doc/m4.texinfo:2219: Origin of test divert(-1) define(`foo', `Macro `foo'.') define(`bar', `Macro `bar'.') diff --git a/checks/35.undivert b/checks/35.undivert index ee362526..84acc9c3 100644 --- a/checks/35.undivert +++ b/checks/35.undivert @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2251: Origin of test +dnl ../doc/m4.texinfo:2250: Origin of test divert(1) This text is diverted. divert diff --git a/checks/36.undivert b/checks/36.undivert index f9b88584..81976413 100644 --- a/checks/36.undivert +++ b/checks/36.undivert @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2275: Origin of test +dnl ../doc/m4.texinfo:2274: Origin of test divert(1) This text is diverted first. divert(0)undivert(1)dnl diff --git a/checks/37.undivert b/checks/37.undivert index 94404752..f3a92875 100644 --- a/checks/37.undivert +++ b/checks/37.undivert @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2301: Origin of test +dnl ../doc/m4.texinfo:2300: Origin of test define(`bar', `BAR') dnl @result{} undivert(`foo') diff --git a/checks/38.divnum b/checks/38.divnum index 7ea8c682..ed2a0fee 100644 --- a/checks/38.divnum +++ b/checks/38.divnum @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2327: Origin of test +dnl ../doc/m4.texinfo:2326: Origin of test Initial divnum dnl @result{}Initial 0 divert(1) diff --git a/checks/39.cleardiv b/checks/39.cleardiv index d4d7fc45..eac813db 100644 --- a/checks/39.cleardiv +++ b/checks/39.cleardiv @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2358: Origin of test +dnl ../doc/m4.texinfo:2357: Origin of test divert(1) Diversion one: divnum divert(2) diff --git a/checks/40.cleardiv b/checks/40.cleardiv index 8f00b9b7..6e04cec9 100644 --- a/checks/40.cleardiv +++ b/checks/40.cleardiv @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2373: Origin of test +dnl ../doc/m4.texinfo:2372: Origin of test define(`cleardivert', `pushdef(`_num', divnum)divert(-1)undivert($@)divert(_num)popdef(`_num')') dnl @result{} diff --git a/checks/41.len b/checks/41.len index 601a5e30..0575a98e 100644 --- a/checks/41.len +++ b/checks/41.len @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2415: Origin of test +dnl ../doc/m4.texinfo:2414: Origin of test len() dnl @result{}0 len(`abcdef') diff --git a/checks/42.index b/checks/42.index index 48be4827..cbff9c35 100644 --- a/checks/42.index +++ b/checks/42.index @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2441: Origin of test +dnl ../doc/m4.texinfo:2440: Origin of test index(`gnus, gnats, and armadillos', `nat') dnl @result{}7 index(`gnus, gnats, and armadillos', `dag') diff --git a/checks/43.regexp b/checks/43.regexp index 2aed6eae..1291f4e2 100644 --- a/checks/43.regexp +++ b/checks/43.regexp @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2473: Origin of test +dnl ../doc/m4.texinfo:2472: Origin of test regexp(`GNUs not Unix', `\<[a-z]\w+') dnl @result{}5 regexp(`GNUs not Unix', `\<Q\w*') diff --git a/checks/44.regexp b/checks/44.regexp index 5c9ef4db..58594f5e 100644 --- a/checks/44.regexp +++ b/checks/44.regexp @@ -1,3 +1,3 @@ -dnl ../doc/m4.texinfo:2485: Origin of test +dnl ../doc/m4.texinfo:2484: Origin of test regexp(`GNUs not Unix', `\w\(\w+\)$', `*** \& *** \1 ***') dnl @result{}*** Unix *** nix *** diff --git a/checks/45.substr b/checks/45.substr index 3e22f035..6b2d6577 100644 --- a/checks/45.substr +++ b/checks/45.substr @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2511: Origin of test +dnl ../doc/m4.texinfo:2510: Origin of test substr(`gnus, gnats, and armadillos', 6) dnl @result{}gnats, and armadillos substr(`gnus, gnats, and armadillos', 6, 5) diff --git a/checks/46.translit b/checks/46.translit index 25c29c35..38084917 100644 --- a/checks/46.translit +++ b/checks/46.translit @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2552: Origin of test +dnl ../doc/m4.texinfo:2551: Origin of test translit(`GNUs not Unix', `A-Z') dnl @result{}s not nix translit(`GNUs not Unix', `a-z', `A-Z') diff --git a/checks/47.patsubst b/checks/47.patsubst index 5d0aea98..fd9f9458 100644 --- a/checks/47.patsubst +++ b/checks/47.patsubst @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2603: Origin of test +dnl ../doc/m4.texinfo:2602: Origin of test patsubst(`GNUs not Unix', `^', `OBS: ') dnl @result{}OBS: GNUs not Unix patsubst(`GNUs not Unix', `\<', `OBS: ') diff --git a/checks/48.patsubst b/checks/48.patsubst index 6810b702..51a3494a 100644 --- a/checks/48.patsubst +++ b/checks/48.patsubst @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2620: Origin of test +dnl ../doc/m4.texinfo:2619: Origin of test define(`upcase', `translit(`$*', `a-z', `A-Z')')dnl define(`downcase', `translit(`$*', `A-Z', `a-z')')dnl define(`capitalize1', diff --git a/checks/49.format b/checks/49.format index b2666d95..e4b8a981 100644 --- a/checks/49.format +++ b/checks/49.format @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2655: Origin of test +dnl ../doc/m4.texinfo:2654: Origin of test define(`foo', `The brown fox jumped over the lazy dog') dnl @result{} format(`The string "%s" is %d characters long', foo, len(foo)) diff --git a/checks/50.incr b/checks/50.incr index b3ab5ce3..6371806e 100644 --- a/checks/50.incr +++ b/checks/50.incr @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2725: Origin of test +dnl ../doc/m4.texinfo:2724: Origin of test incr(4) dnl @result{}5 decr(7) diff --git a/checks/51.eval b/checks/51.eval index a3d5083a..2b544493 100644 --- a/checks/51.eval +++ b/checks/51.eval @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2807: Origin of test +dnl ../doc/m4.texinfo:2806: Origin of test eval(-3 * 5) dnl @result{}-15 eval(index(`Hello world', `llo') >= 0) diff --git a/checks/52.eval b/checks/52.eval index 1d6e7189..71f15b42 100644 --- a/checks/52.eval +++ b/checks/52.eval @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2838: Origin of test +dnl ../doc/m4.texinfo:2837: Origin of test eval(666, 10) dnl @result{}666 eval(666, 11) diff --git a/checks/53.esyscmd b/checks/53.esyscmd index e91ae21c..23d2b30f 100644 --- a/checks/53.esyscmd +++ b/checks/53.esyscmd @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2923: Origin of test +dnl ../doc/m4.texinfo:2922: Origin of test define(`vice', `esyscmd(grep Vice ../COPYING)') dnl @result{} vice diff --git a/checks/54.sysval b/checks/54.sysval index 3aa654b4..09a981a5 100644 --- a/checks/54.sysval +++ b/checks/54.sysval @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:2954: Origin of test +dnl ../doc/m4.texinfo:2953: Origin of test syscmd(`false') dnl @result{} ifelse(sysval, 0, zero, non-zero) diff --git a/checks/55.errprint b/checks/55.errprint index c8c28001..4917106c 100644 --- a/checks/55.errprint +++ b/checks/55.errprint @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:3033: Origin of test +dnl ../doc/m4.texinfo:3032: Origin of test errprint(`Illegal arguments to forloop ') dnl @error{}Illegal arguments to forloop diff --git a/checks/56.errprint b/checks/56.errprint index f1ed9b88..551a7844 100644 --- a/checks/56.errprint +++ b/checks/56.errprint @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:3058: Origin of test +dnl ../doc/m4.texinfo:3057: Origin of test errprint(`m4:'__file__:__line__: `Input error ') dnl @error{}m4:56.errprint:2: Input error diff --git a/checks/57.m4exit b/checks/57.m4exit index e69bd8a7..311ef914 100644 --- a/checks/57.m4exit +++ b/checks/57.m4exit @@ -1,4 +1,4 @@ -dnl ../doc/m4.texinfo:3081: Origin of test +dnl ../doc/m4.texinfo:3080: Origin of test define(`fatal_error', `errprint(`m4: '__file__: __line__`: fatal error: $* ')m4exit(1)') dnl @result{} diff --git a/checks/Makefile.am b/checks/Makefile.am index 65d0de77..81549ea5 100644 --- a/checks/Makefile.am +++ b/checks/Makefile.am @@ -1,6 +1,15 @@ EXTRA_DIST = check-them foo get-them incl.m4 stamp-checks $(CHECKS) -CHECKS = ??.* +CHECKS = 01.define 02.arguments 03.arguments 04.arguments 05.arguments \ + 06.pseudo_argu 07.pseudo_argu 08.pseudo_argu 09.pseudo_argu \ + 10.pseudo_argu 11.undefine 12.defn 13.pushdef 14.pushdef 15.indir \ + 16.ifdef 17.ifelse 18.ifelse 19.loops 20.loops 21.dumpdef 22.trace \ + 23.dnl 24.changequote 25.changequote 26.changequote 27.changecom \ + 28.changecom 29.m4wrap 30.include 31.include 32.include 33.divert \ + 34.divert 35.undivert 36.undivert 37.undivert 38.divnum 39.cleardiv \ + 40.cleardiv 41.len 42.index 43.regexp 44.regexp 45.substr 46.translit \ + 47.patsubst 48.patsubst 49.format 50.incr 51.eval 52.eval 53.esyscmd \ + 54.sysval 55.errprint 56.errprint 57.m4exit all: stamp-checks diff --git a/checks/Makefile.in b/checks/Makefile.in index 4c9c9c49..f7101a52 100644 --- a/checks/Makefile.in +++ b/checks/Makefile.in @@ -57,15 +57,13 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ AWK = @AWK@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ GENCAT = @GENCAT@ -GLOCALE = @GLOCALE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GT_NO = @GT_NO@ @@ -75,13 +73,9 @@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ -LD = @LD@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -NM = @NM@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ POSUB = @POSUB@ @@ -95,7 +89,16 @@ l = @l@ EXTRA_DIST = check-them foo get-them incl.m4 stamp-checks $(CHECKS) -CHECKS = ??.* +CHECKS = 01.define 02.arguments 03.arguments 04.arguments 05.arguments \ + 06.pseudo_argu 07.pseudo_argu 08.pseudo_argu 09.pseudo_argu \ + 10.pseudo_argu 11.undefine 12.defn 13.pushdef 14.pushdef 15.indir \ + 16.ifdef 17.ifelse 18.ifelse 19.loops 20.loops 21.dumpdef 22.trace \ + 23.dnl 24.changequote 25.changequote 26.changequote 27.changecom \ + 28.changecom 29.m4wrap 30.include 31.include 32.include 33.divert \ + 34.divert 35.undivert 36.undivert 37.undivert 38.divnum 39.cleardiv \ + 40.cleardiv 41.len 42.index 43.regexp 44.regexp 45.substr 46.translit \ + 47.patsubst 48.patsubst 49.format 50.incr 51.eval 52.eval 53.esyscmd \ + 54.sysval 55.errprint 56.errprint 57.m4exit mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -172,7 +175,6 @@ clean: clean-generic mostlyclean distclean: distclean-generic clean -rm -f config.status - -rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" diff --git a/config.guess b/config.guess index 413ed41c..30230b3d 100755 --- a/config.guess +++ b/config.guess @@ -1,6 +1,6 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc. +# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -478,10 +478,10 @@ EOF echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` exit 0 ;; i*:CYGWIN*:*) - echo i386-pc-cygwin32 + echo ${UNAME_MACHINE}-pc-cygwin32 exit 0 ;; i*:MINGW*:*) - echo i386-pc-mingw32 + echo ${UNAME_MACHINE}-pc-mingw32 exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin32 @@ -493,6 +493,12 @@ EOF echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; *:Linux:*:*) + # uname on the ARM produces all sorts of strangeness, and we need to + # filter it out. + case "$UNAME_MACHINE" in + arm* | sa110*) UNAME_MACHINE="arm" ;; + esac + # The BFD linker knows what the default object file format is, so # first see if it will tell us. ld_help_string=`ld --help 2>&1` @@ -506,6 +512,7 @@ EOF i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;; i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;; sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; + armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;; esac diff --git a/config.h.in b/config.h.in index 0efd4cbd..9cb73a59 100644 --- a/config.h.in +++ b/config.h.in @@ -176,6 +176,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 strerror function. */ #undef HAVE_STRERROR @@ -215,8 +218,5 @@ /* Define if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define if you have the <values.h> header file. */ -#undef HAVE_VALUES_H - /* Define if you have the i library (-li). */ #undef HAVE_LIBI @@ -1,6 +1,6 @@ #! /bin/sh # Configuration validation subroutine script, version 1.1. -# Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc. +# Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc. # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. @@ -162,7 +162,7 @@ case $basic_machine in # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. - i[3456]86) + i[34567]86) basic_machine=$basic_machine-pc ;; # Object if more than one company name word. @@ -171,7 +171,7 @@ case $basic_machine in exit 1 ;; # Recognize the basic CPU types with company name. - vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \ + vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \ | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \ @@ -350,19 +350,19 @@ case $basic_machine in os=-mvs ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? - i[3456]86v32) + i[34567]86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; - i[3456]86v4*) + i[34567]86v4*) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; - i[3456]86v) + i[34567]86v) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv ;; - i[3456]86sol2) + i[34567]86sol2) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; @@ -469,25 +469,23 @@ case $basic_machine in pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5) - basic_machine=i586-intel + pentium | p5 | k5 | nexen) + basic_machine=i586-pc ;; - pentiumpro | p6) - basic_machine=i686-intel + pentiumpro | p6 | k6 | 6x86) + basic_machine=i686-pc ;; - pentium-* | p5-*) + pentiumii | pentium2) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | nexen-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumpro-* | p6-*) + pentiumpro-* | p6-* | k6-* | 6x86-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - k5) - # We don't have specific support for AMD's K5 yet, so just call it a Pentium - basic_machine=i586-amd - ;; - nexen) - # We don't have specific support for Nexgen yet, so just call it a Pentium - basic_machine=i586-nexgen + pentiumii-* | pentium2-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould @@ -12,16 +12,6 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help - --enable-shared build shared libraries [default=yes] - --enable-shared=PKGS only build shared libraries if the current package - appears as an element in the PKGS list" -ac_help="$ac_help - --enable-static build static libraries [default=yes] - --enable-static=PKGS only build shared libraries if the current package - appears as an element in the PKGS list" -ac_help="$ac_help - --with-gnu-ld assume the C compiler uses GNU ld [default=no]" -ac_help="$ac_help --enable-changeword enable -W and changeword() builtin" ac_help="$ac_help --with-gmp use gmp for extended and fractional arithmetic" @@ -594,7 +584,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # 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:598: checking for a BSD compatible install" >&5 +echo "configure:588: 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 @@ -647,7 +637,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:651: checking whether build environment is sane" >&5 +echo "configure:641: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -685,7 +675,7 @@ fi rm -f conftest* echo "$ac_t""yes" 1>&6 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:689: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:679: 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 @@ -714,7 +704,7 @@ fi PACKAGE=m4 -VERSION=1.4c +VERSION=1.4d 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; } @@ -731,7 +721,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:735: checking for working aclocal" >&5 +echo "configure:725: 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. @@ -744,7 +734,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:748: checking for working autoconf" >&5 +echo "configure:738: 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. @@ -757,7 +747,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:761: checking for working automake" >&5 +echo "configure:751: 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. @@ -770,7 +760,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:774: checking for working autoheader" >&5 +echo "configure:764: 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. @@ -783,7 +773,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:787: checking for working makeinfo" >&5 +echo "configure:777: 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. @@ -796,42 +786,14 @@ else fi - -# Extract the first word of "extract-msgs", so it can be a program name with args. -set dummy extract-msgs; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:804: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_GLOCALE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$GLOCALE"; then - ac_cv_prog_GLOCALE="$GLOCALE" # 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_GLOCALE="yes" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_GLOCALE" && ac_cv_prog_GLOCALE="no" -fi -fi -GLOCALE="$ac_cv_prog_GLOCALE" -if test -n "$GLOCALE"; then - echo "$ac_t""$GLOCALE" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi +ALL_LINGUAS="fr nl" for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:835: checking for $ac_word" >&5 +echo "configure:797: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -862,7 +824,7 @@ done # 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:866: 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 @@ -891,7 +853,7 @@ if test -z "$CC"; then # 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:895: 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 @@ -939,7 +901,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:943: 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. @@ -949,11 +911,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 953 "configure" +#line 915 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:957: \"$ac_link\") 1>&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 @@ -973,12 +935,12 @@ if test $ac_cv_prog_cc_works = no; then { 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:977: 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:982: 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 @@ -987,7 +949,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:991: \"$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 @@ -1002,7 +964,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1006: 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 @@ -1040,7 +1002,7 @@ fi # 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:1044: checking for a BSD compatible install" >&5 +echo "configure:1006: 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 @@ -1090,7 +1052,7 @@ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1094: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1056: 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 @@ -1116,83 +1078,10 @@ else SET_MAKE="MAKE=${MAKE-make}" fi -# Check whether --enable-shared or --disable-shared was given. -if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - p=${PACKAGE-default} -case "$enableval" in -yes) enable_shared=yes ;; -no) enable_shared=no ;; -*) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac -else - enable_shared=yes -fi - -# Check whether --enable-static or --disable-static was given. -if test "${enable_static+set}" = set; then - enableval="$enable_static" - p=${PACKAGE-default} -case "$enableval" in -yes) enable_static=yes ;; -no) enable_static=no ;; -*) - enable_static=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac -else - enable_static=yes -fi - - -# Make sure we can run config.sub. -if $ac_config_sub sun4 >/dev/null 2>&1; then : -else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } -fi - -echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1173: checking host system type" >&5 - -host_alias=$host -case "$host_alias" in -NONE) - case $nonopt in - NONE) - if host_alias=`$ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; -esac - -host=`$ac_config_sub $host_alias` -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$host" 1>&6 - # 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:1196: checking for $ac_word" >&5 +echo "configure:1085: 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 @@ -1218,198 +1107,9 @@ else echo "$ac_t""no" 1>&6 fi -# Check whether --with-gnu-ld or --without-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi - - -ac_prog=ld -if test "$ac_cv_prog_gcc" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1235: checking for ld used by GCC" >&5 - ac_prog=`($CC -print-prog-name=ld) 2>&5` - case "$ac_prog" in - # Accept absolute paths. - /* | A-Za-z:\\*) - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1253: checking for GNU ld" >&5 -else - echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1256: checking for non-GNU ld" >&5 -fi -if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -z "$LD"; then - 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_prog"; then - ac_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then - test "$with_gnu_ld" != no && break - else - test "$with_gnu_ld" != yes && break - fi - fi - done - IFS="$ac_save_ifs" -else - ac_cv_path_LD="$LD" # Let the user override the test with a path. -fi -fi - -LD="$ac_cv_path_LD" -if test -n "$LD"; then - echo "$ac_t""$LD" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi -test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } - -echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1292: checking if the linker ($LD) is GNU ld" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. -if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then - ac_cv_prog_gnu_ld=yes -else - ac_cv_prog_gnu_ld=no -fi -fi - -echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 - - -echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1308: checking for BSD-compatible nm" >&5 -if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$NM" in -/* | A-Za-z:\\*) - ac_cv_path_NM="$NM" # Let the user override the test with a path. - ;; -*) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/nm; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - ac_cv_path_NM="$ac_dir/nm -B" - elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - ac_cv_path_NM="$ac_dir/nm -p" - else - ac_cv_path_NM="$ac_dir/nm" - fi - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm - ;; -esac -fi - -NM="$ac_cv_path_NM" -echo "$ac_t""$NM" 1>&6 - - -echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1345: checking whether ln -s works" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - rm -f conftestdata -if ln -s X conftestdata 2>/dev/null -then - rm -f conftestdata - ac_cv_prog_LN_S="ln -s" -else - ac_cv_prog_LN_S=ln -fi -fi -LN_S="$ac_cv_prog_LN_S" -if test "$ac_cv_prog_LN_S" = "ln -s"; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' - -# Check for any special flags to pass to ltconfig. -libtool_flags= -test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" -test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" -test "$silent" = yes && libtool_flags="$libtool_flags --silent" -test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" -test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case "$host" in -*-*-irix6*) - # Find out which ABI we are using. - echo '#line 1381 "configure"' > conftest.$ac_ext - if { (eval echo configure:1382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - case "`/usr/bin/file conftest.o`" in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - CFLAGS="$CFLAGS -belf" - ;; -esac - -# Actually configure libtool. ac_aux_dir is where install-sh is found. -CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ -LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ -$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ -|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; } - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1413: checking how to run the C preprocessor" >&5 +echo "configure:1113: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1424,13 +1124,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1428 "configure" +#line 1128 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1441,13 +1141,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1445 "configure" +#line 1145 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1470,9 +1170,9 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1474: checking for AIX" >&5 +echo "configure:1174: checking for AIX" >&5 cat > conftest.$ac_ext <<EOF -#line 1476 "configure" +#line 1176 "configure" #include "confdefs.h" #ifdef _AIX yes @@ -1494,7 +1194,7 @@ rm -f conftest* echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1498: checking for POSIXized ISC" >&5 +echo "configure:1198: 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 @@ -1516,17 +1216,17 @@ fi ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 -echo "configure:1520: checking for minix/config.h" >&5 +echo "configure:1220: checking for minix/config.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 -#line 1525 "configure" +#line 1225 "configure" #include "confdefs.h" #include <minix/config.h> 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:1230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1567,7 +1267,7 @@ fi echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1571: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:1271: checking for ${CC-cc} option to accept ANSI C" >&5 if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1583,7 +1283,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__ do CC="$ac_save_CC $ac_arg" cat > conftest.$ac_ext <<EOF -#line 1587 "configure" +#line 1287 "configure" #include "confdefs.h" #include <stdarg.h> #include <stdio.h> @@ -1620,7 +1320,7 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ; return 0; } EOF -if { (eval echo configure:1624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_prog_cc_stdc="$ac_arg"; break else @@ -1644,8 +1344,9 @@ case "x$am_cv_prog_cc_stdc" in esac + echo $ac_n "checking for function prototypes""... $ac_c" 1>&6 -echo "configure:1649: checking for function prototypes" >&5 +echo "configure:1350: checking for function prototypes" >&5 if test "$am_cv_prog_cc_stdc" != no; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -1658,12 +1359,12 @@ else U=_ ANSI2KNR=./ansi2knr # Ensure some checks needed by ansi2knr itself. echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1662: checking for ANSI C header files" >&5 +echo "configure:1363: 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 <<EOF -#line 1667 "configure" +#line 1368 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1671,7 +1372,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1688,7 +1389,7 @@ rm -f conftest* 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 -#line 1692 "configure" +#line 1393 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1706,7 +1407,7 @@ fi 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 -#line 1710 "configure" +#line 1411 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1727,7 +1428,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1731 "configure" +#line 1432 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1738,7 +1439,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1765,17 +1466,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1769: checking for $ac_hdr" >&5 +echo "configure:1470: 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 -#line 1774 "configure" +#line 1475 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1804,12 +1505,12 @@ done fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1808: checking for working const" >&5 +echo "configure:1509: 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 <<EOF -#line 1813 "configure" +#line 1514 "configure" #include "confdefs.h" int main() { @@ -1858,7 +1559,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:1862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1883,17 +1584,17 @@ for ac_hdr in limits.h locale.h memory.h siginfo.h string.h unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1887: checking for $ac_hdr" >&5 +echo "configure:1588: 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 -#line 1892 "configure" +#line 1593 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1920,12 +1621,12 @@ fi done echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1924: checking for ANSI C header files" >&5 +echo "configure:1625: 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 <<EOF -#line 1929 "configure" +#line 1630 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1933,7 +1634,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1950,7 +1651,7 @@ rm -f conftest* 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 -#line 1954 "configure" +#line 1655 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1968,7 +1669,7 @@ fi 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 -#line 1972 "configure" +#line 1673 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1989,7 +1690,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1993 "configure" +#line 1694 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2000,7 +1701,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -2024,12 +1725,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2028: checking return type of signal handlers" >&5 +echo "configure:1729: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2033 "configure" +#line 1734 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -2046,7 +1747,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2065,12 +1766,12 @@ EOF echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2069: checking for size_t" >&5 +echo "configure:1770: 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 <<EOF -#line 2074 "configure" +#line 1775 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2101,12 +1802,12 @@ fi for ac_func in mkstemp sigaction sigaltstack sigstack sigvec strerror tmpfile do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2105: checking for $ac_func" >&5 +echo "configure:1806: 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 <<EOF -#line 2110 "configure" +#line 1811 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2129,7 +1830,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2156,19 +1857,19 @@ done # 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:2160: checking for working alloca.h" >&5 +echo "configure:1861: 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 <<EOF -#line 2165 "configure" +#line 1866 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -2189,12 +1890,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2193: checking for alloca" >&5 +echo "configure:1894: 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 <<EOF -#line 2198 "configure" +#line 1899 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -2217,7 +1918,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:2221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -2249,12 +1950,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2253: checking whether alloca needs Cray hooks" >&5 +echo "configure:1954: 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 <<EOF -#line 2258 "configure" +#line 1959 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -2279,12 +1980,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2283: checking for $ac_func" >&5 +echo "configure:1984: 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 <<EOF -#line 2288 "configure" +#line 1989 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2307,7 +2008,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2334,7 +2035,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2338: checking stack direction for C alloca" >&5 +echo "configure:2039: 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 @@ -2342,7 +2043,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 2346 "configure" +#line 2047 "configure" #include "confdefs.h" find_stack_direction () { @@ -2361,7 +2062,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:2365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2066: \"$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 @@ -2383,12 +2084,12 @@ EOF fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2387: checking for vprintf" >&5 +echo "configure:2088: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2392 "configure" +#line 2093 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vprintf(); below. */ @@ -2411,7 +2112,7 @@ vprintf(); ; return 0; } EOF -if { (eval echo configure:2415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -2435,12 +2136,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:2439: checking for _doprnt" >&5 +echo "configure:2140: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2444 "configure" +#line 2145 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char _doprnt(); below. */ @@ -2463,7 +2164,7 @@ _doprnt(); ; return 0; } EOF -if { (eval echo configure:2467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -2490,12 +2191,12 @@ fi for ac_func in strtol do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2494: checking for $ac_func" >&5 +echo "configure:2195: 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 <<EOF -#line 2499 "configure" +#line 2200 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2518,7 +2219,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2545,9 +2246,9 @@ done echo $ac_n "checking ecvt declaration""... $ac_c" 1>&6 -echo "configure:2549: checking ecvt declaration" >&5 +echo "configure:2250: checking ecvt declaration" >&5 cat > conftest.$ac_ext <<EOF -#line 2551 "configure" +#line 2252 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -2563,12 +2264,12 @@ else echo "$ac_t""no" 1>&6; for ac_func in ecvt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2567: checking for $ac_func" >&5 +echo "configure:2268: 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 <<EOF -#line 2572 "configure" +#line 2273 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2591,7 +2292,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2620,7 +2321,7 @@ rm -f conftest* echo $ac_n "checking if stack overflow is detectable""... $ac_c" 1>&6 -echo "configure:2624: checking if stack overflow is detectable" >&5 +echo "configure:2325: checking if stack overflow is detectable" >&5 # Code from Jim Avera <jima@netcom.com>. # stackovf.c requires: # 1. Either sigaction with SA_ONSTACK, or sigvec with SV_ONSTACK @@ -2630,7 +2331,7 @@ use_stackovf=no if test "$ac_cv_func_sigaction" = yes || test "$ac_cv_func_sigvec" = yes; then if test "$ac_cv_func_sigaltstack" = yes || test "$ac_cv_func_sigstack" = yes; then cat > conftest.$ac_ext <<EOF -#line 2634 "configure" +#line 2335 "configure" #include "confdefs.h" #include <sys/time.h> #include <sys/resource.h> @@ -2643,7 +2344,7 @@ choke me /* SA_ONSTACK and/or SV_ONSTACK are not defined */ #endif ; return 0; } EOF -if { (eval echo configure:2647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* use_stackovf=yes else @@ -2662,7 +2363,7 @@ EOF STACKOVF=stackovf.${U}o cat > conftest.$ac_ext <<EOF -#line 2666 "configure" +#line 2367 "configure" #include "confdefs.h" #include <sys/resource.h> EOF @@ -2679,7 +2380,7 @@ fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 2683 "configure" +#line 2384 "configure" #include "confdefs.h" #include <signal.h> EOF @@ -2696,7 +2397,7 @@ fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 2700 "configure" +#line 2401 "configure" #include "confdefs.h" #include <signal.h> EOF @@ -2713,7 +2414,7 @@ rm -f conftest* fi echo $ac_n "checking if changeword is wanted""... $ac_c" 1>&6 -echo "configure:2717: checking if changeword is wanted" >&5 +echo "configure:2418: checking if changeword is wanted" >&5 # Check whether --enable-changeword or --disable-changeword was given. if test "${enable_changeword+set}" = set; then enableval="$enable_changeword" @@ -2732,7 +2433,7 @@ fi echo $ac_n "checking if extended and fractional arithmetic is wanted""... $ac_c" 1>&6 -echo "configure:2736: checking if extended and fractional arithmetic is wanted" >&5 +echo "configure:2437: checking if extended and fractional arithmetic is wanted" >&5 # Check whether --with-gmp or --without-gmp was given. if test "${with_gmp+set}" = set; then withval="$with_gmp" @@ -2752,7 +2453,7 @@ fi echo $ac_n "checking if malloc debugging is wanted""... $ac_c" 1>&6 -echo "configure:2756: checking if malloc debugging is wanted" >&5 +echo "configure:2457: 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" @@ -2773,21 +2474,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2777: checking for inline" >&5 +echo "configure:2478: 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 <<EOF -#line 2784 "configure" +#line 2485 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:2791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -2813,12 +2514,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2817: checking for off_t" >&5 +echo "configure:2518: 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 <<EOF -#line 2822 "configure" +#line 2523 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2849,17 +2550,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2853: checking for $ac_hdr" >&5 +echo "configure:2554: 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 -#line 2858 "configure" +#line 2559 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2888,12 +2589,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2892: checking for $ac_func" >&5 +echo "configure:2593: 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 <<EOF -#line 2897 "configure" +#line 2598 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2916,7 +2617,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2941,7 +2642,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2945: checking for working mmap" >&5 +echo "configure:2646: 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 @@ -2949,7 +2650,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <<EOF -#line 2953 "configure" +#line 2654 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. @@ -3089,7 +2790,7 @@ main() } EOF -if { (eval echo configure:3093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2794: \"$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 @@ -3113,21 +2814,21 @@ fi 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:3121: checking for $ac_hdr" >&5 +echo "configure:2822: 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 -#line 3126 "configure" +#line 2827 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3154,15 +2855,15 @@ fi 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:3161: checking for $ac_func" >&5 +echo "configure:2862: 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 <<EOF -#line 3166 "configure" +#line 2867 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3185,7 +2886,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3214,12 +2915,12 @@ done for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3218: checking for $ac_func" >&5 +echo "configure:2919: 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 <<EOF -#line 3223 "configure" +#line 2924 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3242,7 +2943,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3246: \"$ac_link\") 1>&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* eval "ac_cv_func_$ac_func=yes" else @@ -3276,19 +2977,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:3280: checking for LC_MESSAGES" >&5 +echo "configure:2981: 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 <<EOF -#line 3285 "configure" +#line 2986 "configure" #include "confdefs.h" #include <locale.h> int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:3292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -3309,7 +3010,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:3313: checking whether NLS is requested" >&5 +echo "configure:3014: 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" @@ -3329,7 +3030,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:3333: checking whether included gettext is requested" >&5 +echo "configure:3034: 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" @@ -3348,17 +3049,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:3352: checking for libintl.h" >&5 +echo "configure:3053: 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 -#line 3357 "configure" +#line 3058 "configure" #include "confdefs.h" #include <libintl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3375,19 +3076,19 @@ fi 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:3379: checking for gettext in libc" >&5 +echo "configure:3080: 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 <<EOF -#line 3384 "configure" +#line 3085 "configure" #include "confdefs.h" #include <libintl.h> int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:3391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -3403,7 +3104,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6 if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:3407: checking for bindtextdomain in -lintl" >&5 +echo "configure:3108: 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 @@ -3411,7 +3112,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3415 "configure" +#line 3116 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3422,7 +3123,7 @@ int main() { bindtextdomain() ; return 0; } EOF -if { (eval echo configure:3426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3127: \"$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 @@ -3438,28 +3139,51 @@ fi 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:3442: checking for gettext in libintl" >&5 +echo "configure:3143: 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 <<EOF -#line 3447 "configure" + echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 +echo "configure:3148: 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 <<EOF +#line 3156 "configure" #include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gettext(); int main() { -return (int) gettext ("") +gettext() ; return 0; } EOF -if { (eval echo configure:3454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3167: \"$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 @@ -3478,7 +3202,7 @@ EOF # 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:3482: checking for $ac_word" >&5 +echo "configure:3206: 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 @@ -3512,12 +3236,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3516: checking for $ac_func" >&5 +echo "configure:3240: 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 <<EOF -#line 3521 "configure" +#line 3245 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3540,7 +3264,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3567,7 +3291,7 @@ done # 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:3571: checking for $ac_word" >&5 +echo "configure:3295: 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 @@ -3599,7 +3323,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3603: checking for $ac_word" >&5 +echo "configure:3327: 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 @@ -3631,7 +3355,7 @@ else fi cat > conftest.$ac_ext <<EOF -#line 3635 "configure" +#line 3359 "configure" #include "confdefs.h" int main() { @@ -3639,7 +3363,7 @@ extern int _nl_msg_cat_cntr; return _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:3643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -3662,7 +3386,7 @@ fi if test "$CATOBJEXT" = "NONE"; then echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:3666: checking whether catgets can be used" >&5 +echo "configure:3390: 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" @@ -3675,7 +3399,7 @@ fi if test "$nls_cv_use_catgets" = "yes"; then echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:3679: checking for main in -li" >&5 +echo "configure:3403: 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 @@ -3683,14 +3407,14 @@ else ac_save_LIBS="$LIBS" LIBS="-li $LIBS" cat > conftest.$ac_ext <<EOF -#line 3687 "configure" +#line 3411 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3418: \"$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 @@ -3718,12 +3442,12 @@ else fi echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:3722: checking for catgets" >&5 +echo "configure:3446: 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 <<EOF -#line 3727 "configure" +#line 3451 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char catgets(); below. */ @@ -3746,7 +3470,7 @@ catgets(); ; return 0; } EOF -if { (eval echo configure:3750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_catgets=yes" else @@ -3768,7 +3492,7 @@ EOF # 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:3772: checking for $ac_word" >&5 +echo "configure:3496: 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 @@ -3800,7 +3524,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3804: checking for $ac_word" >&5 +echo "configure:3528: 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 @@ -3833,7 +3557,7 @@ fi # 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:3837: checking for $ac_word" >&5 +echo "configure:3561: 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 @@ -3868,7 +3592,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3872: checking for $ac_word" >&5 +echo "configure:3596: 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 @@ -3926,7 +3650,7 @@ fi # 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:3930: checking for $ac_word" >&5 +echo "configure:3654: 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 @@ -3960,7 +3684,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3964: checking for $ac_word" >&5 +echo "configure:3688: 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 @@ -3992,7 +3716,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3996: checking for $ac_word" >&5 +echo "configure:3720: 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 @@ -4039,7 +3763,7 @@ fi 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 @@ -4051,6 +3775,9 @@ fi 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. @@ -4082,7 +3809,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:4086: checking for catalogs to be installed" >&5 +echo "configure:3813: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -4110,17 +3837,17 @@ echo "configure:4086: checking for catalogs to be installed" >&5 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:4114: checking for linux/version.h" >&5 +echo "configure:3841: 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 -#line 4119 "configure" +#line 3846 "configure" #include "confdefs.h" #include <linux/version.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4184,8 +3911,6 @@ fi sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ < $srcdir/po/POTFILES.in > po/POTFILES -ALL_LINGUAS="" - trap '' 1 2 15 cat > confcache <<\EOF @@ -4288,8 +4013,8 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Makefile intl/Makefile po/Makefile.in doc/Makefile lib/Makefile src/Makefile \ -checks/Makefile examples/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile intl/Makefile po/Makefile.in doc/Makefile lib/Makefile \ +src/Makefile checks/Makefile examples/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF @@ -4330,19 +4055,9 @@ s%@AUTOMAKE@%$AUTOMAKE%g s%@AUTOHEADER@%$AUTOHEADER%g s%@MAKEINFO@%$MAKEINFO%g s%@SET_MAKE@%$SET_MAKE%g -s%@GLOCALE@%$GLOCALE%g s%@AWK@%$AWK%g s%@CC@%$CC%g -s%@host@%$host%g -s%@host_alias@%$host_alias%g -s%@host_cpu@%$host_cpu%g -s%@host_vendor@%$host_vendor%g -s%@host_os@%$host_os%g s%@RANLIB@%$RANLIB%g -s%@LD@%$LD%g -s%@NM@%$NM%g -s%@LN_S@%$LN_S%g -s%@LIBTOOL@%$LIBTOOL%g s%@CPP@%$CPP%g s%@U@%$U%g s%@ANSI2KNR@%$ANSI2KNR%g @@ -4411,8 +4126,8 @@ EOF cat >> $CONFIG_STATUS <<EOF -CONFIG_FILES=\${CONFIG_FILES-"Makefile intl/Makefile po/Makefile.in doc/Makefile lib/Makefile src/Makefile \ -checks/Makefile examples/Makefile"} +CONFIG_FILES=\${CONFIG_FILES-"Makefile intl/Makefile po/Makefile.in doc/Makefile lib/Makefile \ +src/Makefile checks/Makefile examples/Makefile"} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then @@ -4627,9 +4342,14 @@ EOF cat >> $CONFIG_STATUS <<EOF + EOF cat >> $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 +\ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile; \ test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h exit 0 @@ -4638,4 +4358,3 @@ chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - diff --git a/configure.in b/configure.in index 23a96713..cba9344a 100644 --- a/configure.in +++ b/configure.in @@ -8,14 +8,15 @@ AC_INIT(src/m4.c) AM_CONFIG_HEADER(config.h) AC_ARG_PROGRAM -AM_INIT_AUTOMAKE(m4,1.4c) +AM_INIT_AUTOMAKE(m4,1.4d) +ALL_LINGUAS="fr nl" -AC_CHECK_PROG(GLOCALE, extract-msgs, yes, no) AC_PROG_AWK AC_PROG_CC AC_PROG_INSTALL AC_PROG_MAKE_SET -AM_PROG_LIBTOOL +AC_PROG_RANLIB +dnl AM_PROG_LIBTOOL AC_AIX AC_ISC_POSIX @@ -90,11 +91,9 @@ fi], [AC_MSG_RESULT(no)]) AM_WITH_DMALLOC AM_GNU_GETTEXT -ALL_LINGUAS="" -AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) +dnl AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) -AC_OUTPUT(Makefile intl/Makefile po/Makefile.in doc/Makefile lib/Makefile src/Makefile \ -checks/Makefile examples/Makefile, +AC_OUTPUT(Makefile intl/Makefile po/Makefile.in doc/Makefile lib/Makefile \ +src/Makefile checks/Makefile examples/Makefile, \ [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile; \ test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h]) - diff --git a/doc/Makefile.in b/doc/Makefile.in index b55440f5..875d01d3 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -57,15 +57,13 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ AWK = @AWK@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ GENCAT = @GENCAT@ -GLOCALE = @GLOCALE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GT_NO = @GT_NO@ @@ -75,13 +73,9 @@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ -LD = @LD@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -NM = @NM@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ POSUB = @POSUB@ @@ -313,7 +307,6 @@ clean: clean-vti clean-aminfo clean-generic mostlyclean distclean: distclean-vti distclean-aminfo distclean-generic clean -rm -f config.status - -rm -f libtool maintainer-clean: maintainer-clean-vti maintainer-clean-aminfo \ maintainer-clean-generic distclean diff --git a/doc/m4.info-1 b/doc/m4.info-1 index 75d7e52c..0e908728 100644 --- a/doc/m4.info-1 +++ b/doc/m4.info-1 @@ -42,7 +42,7 @@ changes by Franc,ois Pinard and other volunteers on the Internet. All names and email addresses can be found in the file `THANKS' from the GNU `m4' distribution. - This is release 1.4c. It is now to be considered stable, future + This is release 1.4d. It is now to be considered stable, future releases are only meant to fix bugs, increase speed, or improve documentation. However... diff --git a/doc/m4.info-3 b/doc/m4.info-3 index bd0258a2..9fdd01aa 100644 --- a/doc/m4.info-3 +++ b/doc/m4.info-3 @@ -32,8 +32,8 @@ Concept index * Menu: -* arguments to macros: Macro Arguments. * Arguments to macros: Arguments. +* arguments to macros: Macro Arguments. * arguments to macros, special: Pseudo Arguments. * arguments, quoted macro: Quoting Arguments. * arithmetic: Arithmetic. @@ -87,22 +87,22 @@ Concept index * forloops: Loops. * formatted output: Format. * frozen files for fast loading: Frozen files. -* GNU extensions <1>: Undivert. -* GNU extensions <2>: Indir. -* GNU extensions <3>: Regexp. -* GNU extensions <4>: Search Path. -* GNU extensions <5>: Esyscmd. -* GNU extensions <6>: Builtin. -* GNU extensions <7>: Arguments. -* GNU extensions <8>: Extensions. -* GNU extensions <9>: Patsubst. -* GNU extensions <10>: Format. -* GNU extensions <11>: Frozen files. -* GNU extensions <12>: Debug Output. -* GNU extensions: Debug Levels. +* GNU extensions <1>: Extensions. +* GNU extensions <2>: Frozen files. +* GNU extensions <3>: Esyscmd. +* GNU extensions <4>: Format. +* GNU extensions <5>: Patsubst. +* GNU extensions <6>: Regexp. +* GNU extensions <7>: Undivert. +* GNU extensions <8>: Search Path. +* GNU extensions <9>: Debug Output. +* GNU extensions <10>: Debug Levels. +* GNU extensions <11>: Builtin. +* GNU extensions <12>: Indir. +* GNU extensions: Arguments. * included files, search path for: Search Path. -* inclusion, of files <1>: File Inclusion. -* inclusion, of files: Undivert. +* inclusion, of files <1>: Undivert. +* inclusion, of files: File Inclusion. * increment operator: Incr. * indirect call of builtins: Builtin. * indirect call of macros: Indir. @@ -144,8 +144,8 @@ Concept index * quoted string: Quoted strings. * recursive macros: Loops. * redefinition of macros, temporary: Pushdef. -* regular expressions <1>: Regexp. -* regular expressions: Patsubst. +* regular expressions <1>: Patsubst. +* regular expressions: Regexp. * reloading a frozen file: Frozen files. * renaming macros: Defn. * running UNIX commands: UNIX commands. diff --git a/doc/m4.texinfo b/doc/m4.texinfo index 8184174a..1a791538 100644 --- a/doc/m4.texinfo +++ b/doc/m4.texinfo @@ -6,7 +6,6 @@ @c %**end of header @include version.texi - @ifinfo @set Francois Franc,ois @end ifinfo diff --git a/doc/stamp-vti b/doc/stamp-vti index 49d6518e..fa74ec21 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,3 +1,3 @@ -@set UPDATED 6 October 1997 -@set EDITION 1.4c -@set VERSION 1.4c +@set UPDATED 22 May 1998 +@set EDITION 1.4d +@set VERSION 1.4d diff --git a/doc/version.texi b/doc/version.texi index 49d6518e..fa74ec21 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,3 +1,3 @@ -@set UPDATED 6 October 1997 -@set EDITION 1.4c -@set VERSION 1.4c +@set UPDATED 22 May 1998 +@set EDITION 1.4d +@set VERSION 1.4d diff --git a/examples/Makefile.am b/examples/Makefile.am index 8b96545b..71566618 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,5 +1,7 @@ -EXTRA_DIST = capitalize.m4 comments.m4 ddivert.m4 \ -debug.m4 esyscmd.m4 exp.m4 file.m4 foreach.m4 forloop.m4 fstab.m4 \ -hanoi.m4 incl-test.m4 include.m4 indir.m4 misc.m4 multiquotes.m4 \ -patsubst.m4 pushpop.m4 regexp.m4 reverse.m4 stackovf.sh sync-lines.m4 \ -sysv-args.m4 trace.m4 translit.m4 undivert.incl undivert.m4 wrap.m4 +EXTRA_DIST = $(pkgdata_DATA) + +pkgdata_DATA = capitalize.m4 comments.m4 ddivert.m4 debug.m4 esyscmd.m4 \ + exp.m4 file.m4 foreach.m4 forloop.m4 fstab.m4 hanoi.m4 incl-test.m4 \ + include.m4 indir.m4 misc.m4 multiquotes.m4 patsubst.m4 pushpop.m4 \ + regexp.m4 reverse.m4 stackovf.sh sync-lines.m4 sysv-args.m4 trace.m4 \ + translit.m4 undivert.incl undivert.m4 wrap.m4 diff --git a/examples/Makefile.in b/examples/Makefile.in index 919914a1..5b789272 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -57,15 +57,13 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ AWK = @AWK@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ GENCAT = @GENCAT@ -GLOCALE = @GLOCALE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GT_NO = @GT_NO@ @@ -75,13 +73,9 @@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ -LD = @LD@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -NM = @NM@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ POSUB = @POSUB@ @@ -93,14 +87,18 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ l = @l@ -EXTRA_DIST = capitalize.m4 comments.m4 ddivert.m4 \ -debug.m4 esyscmd.m4 exp.m4 file.m4 foreach.m4 forloop.m4 fstab.m4 \ -hanoi.m4 incl-test.m4 include.m4 indir.m4 misc.m4 multiquotes.m4 \ -patsubst.m4 pushpop.m4 regexp.m4 reverse.m4 stackovf.sh sync-lines.m4 \ -sysv-args.m4 trace.m4 translit.m4 undivert.incl undivert.m4 wrap.m4 +EXTRA_DIST = $(pkgdata_DATA) + +pkgdata_DATA = capitalize.m4 comments.m4 ddivert.m4 debug.m4 esyscmd.m4 \ + exp.m4 file.m4 foreach.m4 forloop.m4 fstab.m4 hanoi.m4 incl-test.m4 \ + include.m4 indir.m4 misc.m4 multiquotes.m4 patsubst.m4 pushpop.m4 \ + regexp.m4 reverse.m4 stackovf.sh sync-lines.m4 sysv-args.m4 trace.m4 \ + translit.m4 undivert.incl undivert.m4 wrap.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = +DATA = $(pkgdata_DATA) + DIST_COMMON = Makefile.am Makefile.in @@ -108,7 +106,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = gtar GZIP = --best -all: Makefile +all: Makefile $(DATA) .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) @@ -118,6 +116,25 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +install-pkgdataDATA: $(pkgdata_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) + @list='$(pkgdata_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \ + else if test -f $$p; then \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \ + fi; fi; \ + done + +uninstall-pkgdataDATA: + @$(NORMAL_UNINSTALL) + list='$(pkgdata_DATA)'; for p in $$list; do \ + rm -f $(DESTDIR)$(pkgdatadir)/$$p; \ + done tags: TAGS TAGS: @@ -141,17 +158,18 @@ installcheck: install-exec: @$(NORMAL_INSTALL) -install-data: +install-data: install-pkgdataDATA @$(NORMAL_INSTALL) install: install-exec install-data all @: -uninstall: +uninstall: uninstall-pkgdataDATA install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: + $(mkinstalldirs) $(DATADIR)$(pkgdatadir) mostlyclean-generic: @@ -174,16 +192,15 @@ clean: clean-generic mostlyclean distclean: distclean-generic clean -rm -f config.status - -rm -f libtool maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -.PHONY: tags distdir info dvi installcheck install-exec install-data \ -install uninstall all installdirs mostlyclean-generic distclean-generic \ -clean-generic maintainer-clean-generic clean mostlyclean distclean \ -maintainer-clean +.PHONY: uninstall-pkgdataDATA install-pkgdataDATA tags distdir info dvi \ +installcheck install-exec install-data install uninstall all \ +installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib/Makefile.am b/lib/Makefile.am index c7c06190..93945a7a 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -7,6 +7,6 @@ libm4_a_SOURCES = getopt.h obstack.h regex.h regex.c getopt.c \ noinst_HEADERS = getopt.h error.h getdate.h -libm4_a_LIBADD = -libm4_a_DEPENDENCIES = # $(libfu_a_LIBADD) +# libm4_a_LIBADD = +# libm4_a_DEPENDENCIES = # $(libfu_a_LIBADD) diff --git a/lib/Makefile.in b/lib/Makefile.in index e32f0b95..e7ee31fb 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -57,15 +57,13 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ AWK = @AWK@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ GENCAT = @GENCAT@ -GLOCALE = @GLOCALE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GT_NO = @GT_NO@ @@ -75,13 +73,9 @@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ -LD = @LD@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -NM = @NM@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ POSUB = @POSUB@ @@ -100,9 +94,6 @@ libm4_a_SOURCES = getopt.h obstack.h regex.h regex.c getopt.c \ xstrdup.c alloca.c strtol.c noinst_HEADERS = getopt.h error.h getdate.h - -libm4_a_LIBADD = -libm4_a_DEPENDENCIES = # $(libfu_a_LIBADD) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -113,13 +104,13 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.. CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ +libm4_a_LIBADD = libm4_a_OBJECTS = regex.o getopt.o getopt1.o error.o obstack.o \ xmalloc.o xstrdup.o alloca.o strtol.o AR = ar CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ HEADERS = $(noinst_HEADERS) DIST_COMMON = COPYING.LIB Makefile.am Makefile.in @@ -135,7 +126,7 @@ OBJECTS = $(libm4_a_OBJECTS) all: Makefile $(LIBRARIES) $(HEADERS) .SUFFIXES: -.SUFFIXES: .S .c .lo .o .s +.SUFFIXES: .S .c .o .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/Makefile @@ -172,25 +163,6 @@ distclean-compile: maintainer-clean-compile: -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.S.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -maintainer-clean-libtool: - libm4.a: $(libm4_a_OBJECTS) $(libm4_a_DEPENDENCIES) -rm -f libm4.a $(AR) cru libm4.a $(libm4_a_OBJECTS) $(libm4_a_LIBADD) @@ -278,36 +250,34 @@ maintainer-clean-generic: -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-noinstLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ - mostlyclean-generic + mostlyclean-tags mostlyclean-generic -clean: clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +clean: clean-noinstLIBRARIES clean-compile clean-tags clean-generic \ + mostlyclean -distclean: distclean-noinstLIBRARIES distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean +distclean: distclean-noinstLIBRARIES distclean-compile distclean-tags \ + distclean-generic clean -rm -f config.status - -rm -f libtool maintainer-clean: maintainer-clean-noinstLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean + maintainer-clean-compile maintainer-clean-tags \ + maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." .PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile mostlyclean-libtool distclean-libtool \ -clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-compile tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir info dvi installcheck \ +install-exec install-data install uninstall all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean +# libm4_a_LIBADD = +# libm4_a_DEPENDENCIES = # $(libfu_a_LIBADD) + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/ltconfig b/ltconfig deleted file mode 100755 index 2347e694..00000000 --- a/ltconfig +++ /dev/null @@ -1,1512 +0,0 @@ -#! /bin/sh - -# ltconfig - Create a system-specific libtool. -# Copyright (C) 1996-1998 Free Software Foundation, Inc. -# Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 -# -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# 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. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# A lot of this script is taken from autoconf-2.10. - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -if test "${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi - -echo=echo -if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then : -else - # The Solaris and AIX default echo program unquotes backslashes. - # This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # So, we emulate echo with printf '%s\n' - echo="printf %s\\n" - if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then : - else - # Oops. We have no working printf. Try to find a not-so-buggy echo. - echo=echo - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" - for dir in $PATH /usr/ucb; do - if test -f $dir/echo && test "X`$dir/echo '\t'`" = 'X\t'; then - echo="$dir/echo" - break - fi - done - IFS="$save_ifs" - fi -fi - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' -sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' - -# The name of this program. -progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'` - -# Constants: -PROGRAM=ltconfig -PACKAGE=libtool -VERSION=1.2 -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5' -rm="rm -f" - -help="Try \`$progname --help' for more information." - -# Global variables: -can_build_shared=yes -enable_shared=yes -# All known linkers require a `.a' archive for static linking. -enable_static=yes -ltmain= -silent= -srcdir= -ac_config_guess= -ac_config_sub= -host= -nonopt= -verify_host=yes -with_gcc=no -with_gnu_ld=no - -old_AR="$AR" -old_CC="$CC" -old_CFLAGS="$CFLAGS" -old_CPPFLAGS="$CPPFLAGS" -old_LD="$LD" -old_LN_S="$LN_S" -old_NM="$NM" -old_RANLIB="$RANLIB" - -# Parse the command line options. -args= -prev= -for option -do - case "$option" in - -*=*) optarg=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - eval "$prev=\$option" - prev= - continue - fi - - case "$option" in - --help) cat <<EOM -Usage: $progname [OPTION]... LTMAIN [HOST] - -Generate a system-specific libtool script. - - --disable-shared do not build shared libraries - --disable-static do not build static libraries - --help display this help and exit - --no-verify do not verify that HOST is a valid host type - --quiet same as \`--silent' - --silent do not print informational messages - --srcdir=DIR find \`config.guess' in DIR - --version output version information and exit - --with-gcc assume that the GNU C compiler will be used - --with-gnu-ld assume that the C compiler uses the GNU linker - -LTMAIN is the \`ltmain.sh' shell script fragment that provides basic libtool -functionality. - -HOST is the canonical host system name [default=guessed]. -EOM - exit 0 - ;; - - --disable-shared) enable_shared=no ;; - - --disable-static) enable_static=no ;; - - --quiet | --silent) silent=yes ;; - - --srcdir) prev=srcdir ;; - --srcdir=*) srcdir="$optarg" ;; - - --no-verify) verify_host=no ;; - - --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION"; exit 0 ;; - - --with-gcc) with_gcc=yes ;; - --with-gnu-ld) with_gnu_ld=yes ;; - - -*) - echo "$progname: unrecognized option \`$option'" 1>&2 - echo "$help" 1>&2 - exit 1 - ;; - - *) - if test -z "$ltmain"; then - ltmain="$option" - elif test -z "$host"; then -# This generates an unnecessary warning for sparc-sun-solaris4.1.3_U1 -# if test -n "`echo $option| sed 's/[-a-z0-9.]//g'`"; then -# echo "$progname: warning \`$option' is not a valid host type" 1>&2 -# fi - host="$option" - else - echo "$progname: too many arguments" 1>&2 - echo "$help" 1>&2 - exit 1 - fi ;; - esac -done - -if test -z "$ltmain"; then - echo "$progname: you must specify a LTMAIN file" 1>&2 - echo "$help" 1>&2 - exit 1 -fi - -if test -f "$ltmain"; then : -else - echo "$progname: \`$ltmain' does not exist" 1>&2 - echo "$help" 1>&2 - exit 1 -fi - -# Quote any args containing shell metacharacters. -ltconfig_args= -for arg -do - case "$arg" in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) - ltconfig_args="$ltconfig_args '$arg'" ;; - *) ltconfig_args="$ltconfig_args $arg" ;; - esac -done - -# A relevant subset of AC_INIT. - -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 5 compiler messages saved in config.log -# 6 checking for... messages and results -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 -fi -exec 5>>./config.log - -# NLS nuisances. -# Only set LANG and LC_ALL to C if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LANG+set}" = set; then LANG=C; export LANG; fi - -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi -else - ac_n= ac_c='\c' ac_t= -fi - -if test -z "$srcdir"; then - # Assume the source directory is the same one as the path to ltmain.sh. - srcdir=`$echo "$ltmain" | $Xsed -e 's%/[^/]*$%%'` - test "$srcdir" = "$ltmain" && srcdir=. -fi - -trap "$rm conftest*; exit 1" 1 2 15 -if test "$verify_host" = yes; then - # Check for config.guess and config.sub. - ac_aux_dir= - for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/config.guess; then - ac_aux_dir=$ac_dir - break - fi - done - if test -z "$ac_aux_dir"; then - echo "$progname: cannot find config.guess in $srcdir $srcdir/.. $srcdir/../.." 1>&2 - echo "$help" 1>&2 - exit 1 - fi - ac_config_guess=$ac_aux_dir/config.guess - ac_config_sub=$ac_aux_dir/config.sub - - # Make sure we can run config.sub. - if $ac_config_sub sun4 >/dev/null 2>&1; then : - else - echo "$progname: cannot run $ac_config_sub" 1>&2 - echo "$help" 1>&2 - exit 1 - fi - - echo $ac_n "checking host system type""... $ac_c" 1>&6 - - host_alias=$host - case "$host_alias" in - "") - if host_alias=`$ac_config_guess`; then : - else - echo "$progname: cannot guess host type; you must specify one" 1>&2 - echo "$help" 1>&2 - exit 1 - fi ;; - esac - host=`$ac_config_sub $host_alias` - echo "$ac_t$host" 1>&6 - - # Make sure the host verified. - test -z "$host" && exit 1 - -elif test -z "$host"; then - echo "$progname: you must specify a host type if you use \`--no-verify'" 1>&2 - echo "$help" 1>&2 - exit 1 -else - host_alias=$host -fi - -# Transform linux* to *-*-linux-gnu*, to support old configure scripts. -case "$host_os" in -linux-gnu*) ;; -linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` -esac - -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - -case "$host_os" in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "${COLLECT_NAMES+set}" != set; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR cru $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -# Set a sane default for `AR'. -test -z "$AR" && AR=ar - -# If RANLIB is not set, then run the test. -if test "${RANLIB+set}" != "set"; then - result=no - - echo $ac_n "checking for ranlib... $ac_c" 1>&6 - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" - for dir in $PATH; do - test -z "$dir" && dir=. - if test -f $dir/ranlib; then - RANLIB="ranlib" - result="ranlib" - break - fi - done - IFS="$save_ifs" - - echo "$ac_t$result" 1>&6 -fi - -if test -n "$RANLIB"; then - old_archive_cmds="$old_archive_cmds;\$RANLIB \$oldlib" - old_postinstall_cmds="\$RANLIB \$oldlib;$old_postinstall_cmds" -fi - -# Check to see if we are using GCC. -if test "$with_gcc" != yes || test -z "$CC"; then - # If CC is not set, then try to find GCC or a usable CC. - if test -z "$CC"; then - echo $ac_n "checking for gcc... $ac_c" 1>&6 - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" - for dir in $PATH; do - IFS="$save_ifs" - test -z "$dir" && dir=. - if test -f $dir/gcc; then - CC="gcc" - break - fi - done - IFS="$save_ifs" - - if test -n "$CC"; then - echo "$ac_t$CC" 1>&6 - else - echo "$ac_t"no 1>&6 - fi - fi - - # Not "gcc", so try "cc", rejecting "/usr/ucb/cc". - if test -z "$CC"; then - echo $ac_n "checking for cc... $ac_c" 1>&6 - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" - cc_rejected=no - for dir in $PATH; do - test -z "$dir" && dir=. - if test -f $dir/cc; then - if test "$dir/cc" = "/usr/ucb/cc"; then - cc_rejected=yes - continue - fi - CC="cc" - break - fi - done - IFS="$save_ifs" - if test $cc_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $CC - shift - if test $# -gt 0; then - # We chose a different compiler from the bogus one. - # However, it has the same name, so the bogon will be chosen - # first if we set CC to just the name; use the full file name. - shift - set dummy "$dir/cc" "$@" - shift - CC="$@" - fi - fi - - if test -n "$CC"; then - echo "$ac_t$CC" 1>&6 - else - echo "$ac_t"no 1>&6 - fi - - if test -z "$CC"; then - echo "$progname: error: no acceptable cc found in \$PATH" 1>&2 - exit 1 - fi - fi - - # Now see if the compiler is really GCC. - with_gcc=no - echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6 - echo "$progname:424: checking whether we are using GNU C" >&5 - - $rm conftest.c - cat > conftest.c <<EOF -#ifdef __GNUC__ - yes; -#endif -EOF - if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:432: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - with_gcc=yes - fi - $rm conftest.c - echo "$ac_t$with_gcc" 1>&6 -fi - -# Allow CC to be a program name with arguments. -set dummy $CC -compiler="$2" - -echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6 -pic_flag= -special_shlib_compile_flags= -wl= -link_static_flag= -no_builtin_flag= - -if test "$with_gcc" = yes; then - wl='-Wl,' - link_static_flag='-static' - no_builtin_flag=' -fno-builtin' - - case "$host_os" in - aix3* | aix4* | irix5* | irix6* | osf3* | osf4*) - # PIC is the default for these OSes. - ;; - os2*) - # We can build DLLs from non-PIC. - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - pic_flag='-m68020 -resident32 -malways-restore-a4' - ;; - *) - pic_flag='-fPIC' - ;; - esac -else - # PORTME Check for PIC flags for the system compiler. - case "$host_os" in - aix3* | aix4*) - # All AIX code is PIC. - link_static_flag='-bnso -bI:/lib/syscalls.exp' - ;; - - hpux9* | hpux10*) - # Is there a better link_static_flag that works with the bundled CC? - wl='-Wl,' - link_static_flag="${wl}-a ${wl}archive" - pic_flag='+Z' - ;; - - irix5* | irix6*) - wl='-Wl,' - link_static_flag='-non_shared' - # PIC (with -KPIC) is the default. - ;; - - os2*) - # We can build DLLs from non-PIC. - ;; - - osf3* | osf4*) - # All OSF/1 code is PIC. - wl='-Wl,' - link_static_flag='-non_shared' - ;; - - sco3.2v5*) - pic_flag='-Kpic' - link_static_flag='-dn' - special_shlib_compile_flags='-belf' - ;; - - solaris2*) - pic_flag='-KPIC' - link_static_flag='-Bstatic' - wl='-Wl,' - ;; - - sunos4*) - pic_flag='-PIC' - link_static_flag='-Bstatic' - wl='-Qoption ld ' - ;; - - sysv4.2uw2*) - pic_flag='-KPIC' - link_static_flag='-Bstatic' - wl='-Wl,' - ;; - - uts4*) - pic_flag='-pic' - link_static_flag='-Bstatic' - ;; - - *) - can_build_shared=no - ;; - esac -fi - -if test -n "$pic_flag"; then - echo "$ac_t$pic_flag" 1>&6 - - # Check to make sure the pic_flag actually works. - echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6 - $rm conftest* - echo > conftest.c - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $pic_flag -DPIC" - echo "$progname:547: checking if $compiler PIC flag $pic_flag works" >&5 - if { (eval echo $progname:548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then - # Append any warnings to the config.log. - cat conftest.err 1>&5 - - # On HP-UX, both CC and GCC only warn that PIC is supported... then they - # create non-PIC objects. So, if there were any warnings, we assume that - # PIC is not supported. - if test -s conftest.err; then - echo "$ac_t"no 1>&6 - can_build_shared=no - pic_flag= - else - echo "$ac_t"yes 1>&6 - pic_flag=" $pic_flag" - fi - else - # Append any errors to the config.log. - cat conftest.err 1>&5 - can_build_shared=no - pic_flag= - echo "$ac_t"no 1>&6 - fi - CFLAGS="$save_CFLAGS" - $rm conftest* -else - echo "$ac_t"none 1>&6 -fi - -# Check for any special shared library compilation flags. -if test -n "$special_shlib_compile_flags"; then - echo "$progname: warning: \`$CC' requires \`$special_shlib_compile_flags' to build shared libraries" 1>&2 - if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$special_shlib_compile_flags[ ]" >/dev/null; then : - else - echo "$progname: add \`$special_shlib_compile_flags' to the CC or CFLAGS env variable and reconfigure" 1>&2 - can_build_shared=no - fi -fi - -echo $ac_n "checking if $compiler static flag $link_static_flag works... $ac_c" 1>&6 -$rm conftest* -echo 'main(){return(0);}' > conftest.c -save_LDFLAGS="$LDFLAGS" -LDFLAGS="$LDFLAGS $link_static_flag" -echo "$progname:591: checking if $compiler static flag $link_static_flag works" >&5 -if { (eval echo $progname:592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - echo "$ac_t$link_static_flag" 1>&6 -else - echo "$ac_t"none 1>&6 - link_static_flag= -fi -LDFLAGS="$save_LDFLAGS" -$rm conftest* - -if test -z "$LN_S"; then - # Check to see if we can use ln -s, or we need hard links. - echo $ac_n "checking whether ln -s works... $ac_c" 1>&6 - $rm conftestdata - if ln -s X conftestdata 2>/dev/null; then - $rm conftestdata - LN_S="ln -s" - else - LN_S=ln - fi - if test "$LN_S" = "ln -s"; then - echo "$ac_t"yes 1>&6 - else - echo "$ac_t"no 1>&6 - fi -fi - -# Make sure LD is an absolute path. -if test -z "$LD"; then - ac_prog=ld - if test "$with_gcc" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6 - echo "$progname:624: checking for ld used by GCC" >&5 - ac_prog=`($CC -print-prog-name=ld) 2>&5` - case "$ac_prog" in - # Accept absolute paths. - /* | [A-Za-z]:\\*) - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we are not using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac - elif test "$with_gnu_ld" = yes; then - echo $ac_n "checking for GNU ld... $ac_c" 1>&6 - echo "$progname:642: checking for GNU ld" >&5 - else - echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 - echo "$progname:645: checking for non-GNU ld" >&5 - fi - - if test -z "$LD"; then - 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_prog"; then - LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - if "$LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then - test "$with_gnu_ld" != no && break - else - test "$with_gnu_ld" != yes && break - fi - fi - done - IFS="$ac_save_ifs" - fi - - if test -n "$LD"; then - echo "$ac_t$LD" 1>&6 - else - echo "$ac_t"no 1>&6 - fi - - if test -z "$LD"; then - echo "$progname: error: no acceptable ld found in \$PATH" 1>&2 - exit 1 - fi -fi - -# Check to see if it really is or is not GNU ld. -echo $ac_n "checking if the linker ($LD) is GNU ld... $ac_c" 1>&6 -# I'd rather use --version here, but apparently some GNU ld's only accept -v. -if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then - with_gnu_ld=yes -else - with_gnu_ld=no -fi -echo "$ac_t$with_gnu_ld" 1>&6 - -# See if the linker supports building shared libraries. -echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6 - -allow_undefined_flag= -no_undefined_flag= -archive_cmds= -old_archive_from_new_cmds= -export_dynamic_flag_spec= -hardcode_libdir_flag_spec= -hardcode_libdir_separator= -hardcode_direct=no -hardcode_minus_L=no -hardcode_shlibpath_var=unsupported -runpath_var= - -case "$host_os" in -amigaos* | sunos4*) - # On these operating systems, we should treat GNU ld like the system ld. - gnu_ld_acts_native=yes - ;; -*) - gnu_ld_acts_native=no - ;; -esac - -ld_shlibs=yes -if test "$with_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then - - # See if GNU ld supports shared libraries. - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs' - runpath_var=LD_RUN_PATH - ld_shlibs=yes - else - ld_shlibs=no - fi - - if test "$ld_shlibs" = yes; then - hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - fi -else - # PORTME fill in a description of your system's linker (not GNU ld) - case "$host_os" in - aix3*) - allow_undefined_flag=unsupported - archive_cmds='$NM$libobjs | $global_symbol_pipe | sed '\''s/.* //'\'' > $lib.exp;$LD -o $objdir/$soname$libobjs -bE:$lib.exp -T512 -H512 -bM:SRE;$AR cru $lib $objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$with_gcc" = yes && test -z "$link_static_flag"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - - aix4*) - allow_undefined_flag=unsupported - archive_cmds='$NM$libobjs | $global_symbol_pipe | sed '\''s/.* //'\'' > $lib.exp;$CC -o $objdir/$soname$libobjs ${wl}-bE:$lib.exp ${wl}-bM:SRE ${wl}-bnoentry;$AR cru $lib $objdir/$soname' - hardcode_direct=yes - hardcode_minus_L=yes - ;; - - amigaos*) - archive_cmds='$rm $objdir/a2ixlibrary.data;$echo "#define NAME $libname" > $objdir/a2ixlibrary.data;$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data;$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data;$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data;$AR cru $lib$libobjs;$RANLIB $lib;(cd $objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds='$LD -Bshareable -o $lib$libobjs /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds='$LD -Bshareable -o $lib$libobjs' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - # FreeBSD 3, at last, uses gcc -shared to do shared libraries. - freebsd3*) - archive_cmds='$CC -shared -o $lib$libobjs' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - hpux9*) - archive_cmds='$rm $objdir/$soname;$LD -b +s +b $install_libdir -o $objdir/$soname$libobjs;mv $objdir/$soname $lib' - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' - ;; - - hpux10*) - archive_cmds='$LD -b +h $soname +s +b $install_libdir -o $lib$libobjs' - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' - ;; - - irix5* | irix6*) - archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring$libobjs' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - ;; - - netbsd*) - # Tested with NetBSD 1.2 ld - archive_cmds='$LD -Bshareable -o $lib$libobjs' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - openbsd*) - archive_cmds='$LD -Bshareable -o $lib$libobjs' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported - archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def;$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def;$echo DATA >> $objdir/$libname.def;$echo " SINGLE NONSHARED" >> $objdir/$libname.def;$echo EXPORTS >> $objdir/$libname.def;emxexp$libobjs >> $objdir/$libname.def;$CC -Zdll -Zcrtdll -o $lib$libobjs $objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def' - ;; - - osf3* | osf4*) - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} -o $lib -soname $soname -set_version $verstring$libobjs$deplibs' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - sco3.2v5*) - archive_cmds='$LD -G -o $lib$libobjs' - hardcode_direct=yes - ;; - - solaris2*) - no_undefined_flag=' -z text' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib$libobjs' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=no - - # Solaris 2 before 2.5 hardcodes -L paths. - case "$host_os" in - solaris2.[0-4]*) - hardcode_minus_L=yes - ;; - esac - ;; - - sunos4*) - if test "$with_gcc" = yes; then - archive_cmds='$CC -shared -o $lib$libobjs' - else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs' - fi - - if test "$with_gnu_ld" = yes; then - export_dynamic_flag_spec='${wl}-export-dynamic' - fi - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - uts4*) - archive_cmds='$LD -G -h $soname -o $lib$libobjs' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=no - hardcode_minus_L=no - hardcode_shlibpath_var=no - ;; - - *) - ld_shlibs=no - can_build_shared=no - ;; - esac -fi -echo "$ac_t$ld_shlibs" 1>&6 - -if test -z "$NM"; then - echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6 - case "$NM" in - /* | [A-Za-z]:\\*) ;; # Let the user override the test with a path. - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/nm; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - NM="$ac_dir/nm -B" - elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - NM="$ac_dir/nm -p" - else - NM="$ac_dir/nm" - fi - break - fi - done - IFS="$ac_save_ifs" - test -z "$NM" && NM=nm - ;; - esac - echo "$ac_t$NM" 1>&6 -fi - -# Check for command to grab the raw symbol name followed by C symbol from nm. -echo $ac_n "checking command to parse $NM output... $ac_c" 1>&6 - -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[BCDEGRSTU]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([_A-Za-z][_A-Za-z0-9]*\)' - -# Transform the above into a raw symbol and a C symbol. -symxfrm='\1 \1' - -# Define system-specific variables. -case "$host_os" in -aix*) - symcode='[BCDTU]' - ;; -irix*) - # Cannot use undefined symbols on IRIX because inlined functions mess us up. - symcode='[BCDEGRST]' - ;; -solaris2*) - symcode='[BDTU]' - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then - symcode='[ABCDGISTUW]' -fi - -# Write the raw and C identifiers. -global_symbol_pipe="sed -n -e 's/^.* $symcode $sympat$/$symxfrm/p'" - -# Check to see that the pipe works correctly. -pipe_works=no -$rm conftest* -cat > conftest.c <<EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(){} -#ifdef __cplusplus -} -#endif -main(){nm_test_var='a';nm_test_func();return(0);} -EOF - -echo "$progname:971: checking if global_symbol_pipe works" >&5 -if { (eval echo $progname:972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then - # Now try to grab the symbols. - nlist=conftest.nm - if { echo "$progname:975: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then - - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - wcout=`wc "$nlist" 2>/dev/null` - count=`$echo "X$wcout" | $Xsed -e 's/^[ ]*\([0-9][0-9]*\).*$/\1/'` - (test "$count" -ge 0) 2>/dev/null || count=-1 - else - rm -f "$nlist"T - count=-1 - fi - - # Make sure that we snagged all the symbols we need. - if egrep ' nm_test_var$' "$nlist" >/dev/null; then - if egrep ' nm_test_func$' "$nlist" >/dev/null; then - cat <<EOF > conftest.c -#ifdef __cplusplus -extern "C" { -#endif - -EOF - # Now generate the symbol file. - sed 's/^.* \(.*\)$/extern char \1;/' < "$nlist" >> conftest.c - - cat <<EOF >> conftest.c -#if defined (__STDC__) && __STDC__ -# define __ptr_t void * -#else -# define __ptr_t char * -#endif - -/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */ -int dld_preloaded_symbol_count = $count; - -/* The mapping between symbol names and symbols. */ -struct { - char *name; - __ptr_t address; -} -dld_preloaded_symbols[] = -{ -EOF - sed 's/^\(.*\) \(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$nlist" >> conftest.c - cat <<\EOF >> conftest.c - {0, (__ptr_t) 0} -}; - -#ifdef __cplusplus -} -#endif -EOF - # Now try linking the two files. - mv conftest.o conftestm.o - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS='conftestm.o' - CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo $progname:1033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - pipe_works=yes - else - echo "$progname: failed program was:" >&5 - cat conftest.c >&5 - fi - LIBS="$save_LIBS" - else - echo "cannot find nm_test_func in $nlist" >&5 - fi - else - echo "cannot find nm_test_var in $nlist" >&5 - fi - else - echo "cannot run $global_symbol_pipe" >&5 - fi -else - echo "$progname: failed program was:" >&5 - cat conftest.c >&5 -fi -$rm conftest* - -# Do not use the global_symbol_pipe unless it works. -echo "$ac_t$pipe_works" 1>&6 -test "$pipe_works" = yes || global_symbol_pipe= - -# Check hardcoding attributes. -echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6 -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var"; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct" != no && \ - test "$hardcode_minus_L" != no && \ - test "$hardcode_shlibpath_var" != no; then - - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi -elif test "$hardcode_direct" != yes && \ - test "$hardcode_minus_L" != yes && \ - test "$hardcode_shlibpath_var" != yes; then - # We cannot hardcode anything. - hardcode_action=unsupported -else - # We can only hardcode existing directories. - hardcode_action=relink -fi -echo "$ac_t$hardcode_action" 1>&6 -test "$hardcode_action" = unsupported && can_build_shared=no - - -reload_flag= -reload_cmds='$LD$reload_flag -o $output$reload_objs' -echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6 -# PORTME Some linker may need a different reload flag. -reload_flag='-r' -echo "$ac_t$reload_flag" -test -n "$reload_flag" && reload_flag=" $reload_flag" - -# PORTME Fill in your ld.so characteristics -library_names_spec= -libname_spec='lib$name' -soname_spec= -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -version_type=none -dynamic_linker="$host_os ld.so" - -echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6 -case "$host_os" in -aix3* | aix4*) - version_type=linux - library_names_spec='${libname}${release}.so.$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}.so.$major' - ;; - -amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' - ;; - -freebsd2* | freebsd3*) - version_type=sunos - library_names_spec='${libname}${release}.so.$versuffix $libname.so' - finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - ;; - -gnu*) - version_type=sunos - library_names_spec='${libname}${release}.so.$versuffix' - shlibpath_var=LD_LIBRARY_PATH - ;; - -hpux9* | hpux10*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - dynamic_linker="$host_os dld.sl" - version_type=sunos - shlibpath_var=SHLIB_PATH - library_names_spec='${libname}${release}.sl.$versuffix ${libname}${release}.sl.$major $libname.sl' - soname_spec='${libname}${release}.sl.$major' - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -irix5* | irix6*) - version_type=osf - soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so.$versuffix $libname.so' - shlibpath_var=LD_LIBRARY_PATH - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux-gnu*) - version_type=linux - library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' - soname_spec='${libname}${release}.so.$major' - finish_cmds='PATH="$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - - if test -f /lib/ld.so.1; then - dynamic_linker='GNU ld.so' - else - # Only the GNU ld.so supports shared libraries on MkLinux. - case "$host_cpu" in - powerpc*) dynamic_linker=no ;; - *) dynamic_linker='Linux ld.so' ;; - esac - fi - ;; - -netbsd* | openbsd*) - version_type=sunos - library_names_spec='${libname}${release}.so.$versuffix' - finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - ;; - -os2*) - libname_spec='$name' - library_names_spec='$libname.dll $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4*) - version_type=osf - soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so.$versuffix $libname.so' - shlibpath_var=LD_LIBRARY_PATH - ;; - -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}.so.$major' - library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' - shlibpath_var=LD_LIBRARY_PATH - ;; - -solaris2*) - version_type=linux - library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' - soname_spec='${libname}${release}.so.$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}.so.$versuffix' - finish_cmds='PATH="$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - ;; - -sysv4.2uw2*) - version_type=linux - library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' - soname_spec='${libname}${release}.so.$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -uts4*) - version_type=linux - library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' - soname_spec='${libname}${release}.so.$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -echo "$ac_t$dynamic_linker" -test "$dynamic_linker" = no && can_build_shared=no - -# Report the final consequences. -echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6 - -echo $ac_n "checking whether to build shared libraries... $ac_c" 1>&6 -test "$can_build_shared" = "no" && enable_shared=no - -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case "$host_os" in -aix*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds;\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; -esac - -echo "$ac_t$enable_shared" 1>&6 - -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes - -echo "checking whether to build static libraries... $enable_static" 1>&6 - -echo $ac_n "checking for objdir... $ac_c" 1>&6 -rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - objdir=_libs -fi -rmdir .libs 2>/dev/null -echo "$ac_t$objdir" 1>&6 - -# Copy echo and quote the copy, instead of the original, because it is -# used later. -ltecho="$echo" - -# Now quote all the things that may contain metacharacters. -for var in ltecho old_CC old_CFLAGS old_CPPFLAGS old_LD old_NM old_RANLIB \ - old_LN_S AR CC LD LN_S NM reload_flag reload_cmds wl pic_flag \ - link_static_flag no_builtin_flag export_dynamic_flag_spec \ - libname_spec library_names_spec soname_spec RANLIB \ - old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ - old_postuninstall_cmds archive_cmds postinstall_cmds postuninstall_cmds \ - allow_undefined_flag no_undefined_flag \ - finish_cmds finish_eval global_symbol_pipe \ - hardcode_libdir_flag_spec hardcode_libdir_separator; do - - case "$var" in - reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | archive_cmds | \ - postinstall_cmds | postuninstall_cmds | finish_cmds) - # Double-quote double-evaled strings. - eval "$var=\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\"\`" - ;; - *) - eval "$var=\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`" - ;; - esac -done - -ofile=libtool -trap "$rm $ofile; exit 1" 1 2 15 -echo creating $ofile -$rm $ofile -cat <<EOF > $ofile -#! /bin/sh - -# libtool - Provide generalized library-building support services. -# Generated automatically by $PROGRAM - GNU $PACKAGE $VERSION -# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh. -# -# Copyright (C) 1996-1998 Free Software Foundation, Inc. -# Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 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 of the License, 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. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This program was configured as follows, -# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# -# CC="$old_CC" CFLAGS="$old_CFLAGS" CPPFLAGS="$old_CPPFLAGS" \\ -# LD="$old_LD" NM="$old_NM" RANLIB="$old_RANLIB" LN_S="$old_LN_S" \\ -# $0$ltconfig_args -# -# Compiler and other test output produced by $progname, useful for -# debugging $progname, is in ./config.log if it exists. - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="sed -e s/^X//" - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -if test "\${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi - -# An echo program that does not interpret backslashes. -echo="$ltecho" - -# The version of $progname that generated this script. -LTCONFIG_VERSION="$VERSION" - -# Shell to use when invoking shell scripts. -SHELL=${CONFIG_SHELL-/bin/sh} - -# Whether or not to build libtool libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build old-style libraries. -build_old_libs=$enable_static - -# The host system. -host_alias="$host_alias" -host="$host" - -# The archiver. -AR="$AR" - -# The default C compiler. -CC="$CC" - -# The linker used to build libraries. -LD="$LD" - -# Whether we need hard or soft links. -LN_S="$LN_S" - -# A BSD-compatible nm program. -NM="$NM" - -# The name of the directory that contains temporary libtool files. -objdir="$objdir" - -# How to create reloadable object files. -reload_flag="$reload_flag" -reload_cmds="$reload_cmds" - -# How to pass a linker flag through the compiler. -wl="$wl" - -# Additional compiler flags for building library objects. -pic_flag="$pic_flag" - -# Compiler flag to prevent dynamic linking. -link_static_flag="$link_static_flag" - -# Compiler flag to turn off builtin functions. -no_builtin_flag="$no_builtin_flag" - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="$export_dynamic_flag_spec" - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec="$libname_spec" - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec="$library_names_spec" - -# The coded name of the library, if different from the real name. -soname_spec="$soname_spec" - -# Commands used to build and install an old-style archive. -RANLIB="$RANLIB" -old_archive_cmds="$old_archive_cmds" -old_postinstall_cmds="$old_postinstall_cmds" -old_postuninstall_cmds="$old_postuninstall_cmds" - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds="$old_archive_from_new_cmds" - -# Commands used to build and install a shared archive. -archive_cmds="$archive_cmds" -postinstall_cmds="$postinstall_cmds" -postuninstall_cmds="$postuninstall_cmds" - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag="$allow_undefined_flag" - -# Flag that forces no undefined symbols. -no_undefined_flag="$no_undefined_flag" - -# Commands used to finish a libtool library installation in a directory. -finish_cmds="$finish_cmds" - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval="$finish_eval" - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="$global_symbol_pipe" - -# This is the shared library runtime path variable. -runpath_var=$runpath_var - -# This is the shared library path variable. -shlibpath_var=$shlibpath_var - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec="$hardcode_libdir_flag_spec" - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="$hardcode_libdir_separator" - -# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var - -EOF - -case "$host_os" in -aix3*) - cat <<\EOF >> $ofile -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "${COLLECT_NAMES+set}" != set; then - COLLECT_NAMES= - export COLLECT_NAMES -fi - -EOF - ;; -esac - -# Append the ltmain.sh script. -cat "$ltmain" >> $ofile || (rm -f $ofile; exit 1) - -chmod +x $ofile -exit 0 - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: diff --git a/ltmain.sh b/ltmain.sh deleted file mode 100644 index e9350b3f..00000000 --- a/ltmain.sh +++ /dev/null @@ -1,2453 +0,0 @@ -# ltmain.sh - Provide generalized library-building support services. -# NOTE: Changing this file will not affect anything until you rerun ltconfig. -# -# Copyright (C) 1996-1998 Free Software Foundation, Inc. -# Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 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 of the License, 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. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# The name of this program. -progname=`$echo "$0" | sed 's%^.*/%%'` -modename="$progname" - -# Constants. -PROGRAM=ltmain.sh -PACKAGE=libtool -VERSION=1.2 - -default_mode= -help="Try \`$progname --help' for more information." -magic="%%%MAGIC variable%%%" -mkdir="mkdir" -mv="mv -f" -rm="rm -f" - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' -sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' - -# NLS nuisances. -# Only set LANG and LC_ALL to C if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LANG+set}" = set; then LANG=C; export LANG; fi - -if test "$LTCONFIG_VERSION" != "$VERSION"; then - echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2 - echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit 1 -fi - -if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - echo "$modename: not configured to build any kind of library" 1>&2 - echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit 1 -fi - -# Global variables. -mode=$default_mode -nonopt= -prev= -prevopt= -run= -show="$echo" -show_help= -execute_dlfiles= - -# Parse our command line options once, thoroughly. -while test $# -gt 0 -do - arg="$1" - shift - - case "$arg" in - -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case "$prev" in - execute_dlfiles) - eval "$prev=\"\$$prev \$arg\"" - ;; - *) - eval "$prev=\$arg" - ;; - esac - - prev= - prevopt= - continue - fi - - # Have we seen a non-optional argument yet? - case "$arg" in - --help) - show_help=yes - ;; - - --version) - echo "$PROGRAM (GNU $PACKAGE) $VERSION" - exit 0 - ;; - - --dry-run | -n) - run=: - ;; - - --features) - echo "host: $host" - if test "$build_libtool_libs" = yes; then - echo "enable shared libraries" - else - echo "disable shared libraries" - fi - if test "$build_old_libs" = yes; then - echo "enable static libraries" - else - echo "disable static libraries" - fi - exit 0 - ;; - - --finish) mode="finish" ;; - - --mode) prevopt="--mode" prev=mode ;; - --mode=*) mode="$optarg" ;; - - --quiet | --silent) - show=: - ;; - - -dlopen) - prevopt="-dlopen" - prev=execute_dlfiles - ;; - - -*) - $echo "$modename: unrecognized option \`$arg'" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; - - *) - nonopt="$arg" - break - ;; - esac -done - -if test -n "$prevopt"; then - $echo "$modename: option \`$prevopt' requires an argument" 1>&2 - $echo "$help" 1>&2 - exit 1 -fi - -if test -z "$show_help"; then - - # Infer the operation mode. - if test -z "$mode"; then - case "$nonopt" in - *cc | *++ | gcc* | *-gcc*) - mode=link - for arg - do - case "$arg" in - -c) - mode=compile - break - ;; - esac - done - ;; - *db | *dbx) - mode=execute - ;; - *install*|cp|mv) - mode=install - ;; - *rm) - mode=uninstall - ;; - *) - # If we have no mode, but dlfiles were specified, then do execute mode. - test -n "$execute_dlfiles" && mode=execute - - # Just use the default operation mode. - if test -z "$mode"; then - if test -n "$nonopt"; then - $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 - else - $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 - fi - fi - ;; - esac - fi - - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$mode" != execute; then - $echo "$modename: unrecognized option \`-dlopen'" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$modename --help --mode=$mode' for more information." - - # These modes are in order of execution frequency so that they run quickly. - case "$mode" in - # libtool compile mode - compile) - modename="$modename: compile" - # Get the compilation command and the source file. - base_compile= - lastarg= - srcfile="$nonopt" - suppress_output= - - for arg - do - # Accept any command-line options. - case "$arg" in - -o) - $echo "$modename: you cannot specify the output filename with \`-o'" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; - - -static) - build_libtool_libs=no - build_old_libs=yes - continue - ;; - esac - - # Accept the current argument as the source file. - lastarg="$srcfile" - srcfile="$arg" - - # Aesthetically quote the previous argument. - - # Backslashify any backslashes, double quotes, and dollar signs. - # These are the only characters that are still specially - # interpreted inside of double-quoted scrings. - lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` - - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly in scan - # sets, so we specify it separately. - case "$lastarg" in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) - lastarg="\"$lastarg\"" - ;; - esac - - # Add the previous argument to base_compile. - if test -z "$base_compile"; then - base_compile="$lastarg" - else - base_compile="$base_compile $lastarg" - fi - done - - # Get the name of the library object. - libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` - - # Recognize several different file suffixes. - xform='[cCFSfms]' - case "$libobj" in - *.ada) xform=ada ;; - *.adb) xform=adb ;; - *.ads) xform=ads ;; - *.asm) xform=asm ;; - *.c++) xform=c++ ;; - *.cc) xform=cc ;; - *.cpp) xform=cpp ;; - *.cxx) xform=cxx ;; - *.f90) xform=f90 ;; - *.for) xform=for ;; - esac - - libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` - - case "$libobj" in - *.lo) obj=`$echo "X$libobj" | $Xsed -e 's/\.lo$/.o/'` ;; - *) - $echo "$modename: cannot determine name of library object from \`$srcfile'" 1>&2 - exit 1 - ;; - esac - - if test -z "$base_compile"; then - $echo "$modename: you must specify a compilation command" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - # Delete any leftover library objects. - if test "$build_old_libs" = yes; then - $run $rm $obj $libobj - trap "$run $rm $obj $libobj; exit 1" 1 2 15 - else - $run $rm $libobj - trap "$run $rm $libobj; exit 1" 1 2 15 - fi - - # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then - # Without this assignment, base_compile gets emptied. - fbsd_hideous_sh_bug=$base_compile - - # All platforms use -DPIC, to notify preprocessed assembler code. - $show "$base_compile$pic_flag -DPIC $srcfile" - if $run eval "$base_compile\$pic_flag -DPIC \$srcfile"; then : - else - test -n "$obj" && $run $rm $obj - exit 1 - fi - - # If we have no pic_flag, then copy the object into place and finish. - if test -z "$pic_flag"; then - $show "$LN_S $obj $libobj" - $run $LN_S $obj $libobj - exit $? - fi - - # Just move the object, then go on to compile the next one - $show "$mv $obj $libobj" - $run $mv $obj $libobj || exit 1 - - # Allow error messages only from the first compilation. - suppress_output=' >/dev/null 2>&1' - fi - - # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - # Suppress compiler output if we already did a PIC compilation. - $show "$base_compile $srcfile$suppress_output" - if $run eval "$base_compile \$srcfile$suppress_output"; then : - else - $run $rm $obj $libobj - exit 1 - fi - fi - - # Create an invalid libtool object if no PIC, so that we do not - # accidentally link it into a program. - if test "$build_libtool_libs" != yes; then - $show "echo timestamp > $libobj" - $run eval "echo timestamp > \$libobj" || exit $? - fi - - exit 0 - ;; - - # libtool link mode - link) - modename="$modename: link" - CC="$nonopt" - allow_undefined=yes - compile_command="$CC" - finalize_command="$CC" - - compile_shlibpath= - finalize_shlibpath= - deplibs= - dlfiles= - dlprefiles= - export_dynamic=no - hardcode_libdirs= - libobjs= - link_against_libtool_libs= - ltlibs= - objs= - prev= - prevarg= - release= - rpath= - perm_rpath= - temp_rpath= - vinfo= - - # We need to know -static, to get the right output filenames. - for arg - do - case "$arg" in - -all-static | -static) - if test "X$arg" = "X-all-static" && test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then - $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 - fi - build_libtool_libs=no - build_old_libs=yes - break - ;; - esac - done - - # See if our shared archives depend on static archives. - test -n "$old_archive_from_new_cmds" && build_old_libs=yes - - # Go through the arguments, transforming them on the way. - for arg - do - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case "$prev" in - output) - compile_command="$compile_command @OUTPUT@" - finalize_command="$finalize_command @OUTPUT@" - ;; - esac - - case "$prev" in - dlfiles|dlprefiles) - case "$arg" in - *.la | *.lo) ;; # We handle these cases below. - *) - dlprefiles="$dlprefiles $arg" - test "$prev" = dlfiles && dlfiles="$dlfiles $arg" - prev= - ;; - esac - ;; - release) - release="-$arg" - prev= - continue - ;; - rpath) - rpath="$rpath $arg" - prev= - continue - ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac - fi - - prevarg="$arg" - - case "$arg" in - -all-static) - if test -n "$link_static_flag"; then - compile_command="$compile_command $link_static_flag" - finalize_command="$finalize_command $link_static_flag" - fi - continue - ;; - - -allow-undefined) - # FIXME: remove this flag sometime in the future. - $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 - continue - ;; - - -dlopen) - prev=dlfiles - continue - ;; - - -dlpreopen) - prev=dlprefiles - continue - ;; - - -export-dynamic) - if test "$export_dynamic" != yes; then - export_dynamic=yes - if test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - else - arg= - fi - - # Add the symbol object into the linking commands. - compile_command="$compile_command @SYMFILE@" - finalize_command="$finalize_command @SYMFILE@" - fi - ;; - - -L*) - dir=`$echo "X$arg" | $Xsed -e 's%^-L\(.*\)$%\1%'` - case "$dir" in - /* | [A-Za-z]:\\*) - # Add the corresponding hardcode_libdir_flag, if it is not identical. - ;; - *) - $echo "$modename: \`-L$dir' cannot specify a relative directory" 1>&2 - exit 1 - ;; - esac - deplibs="$deplibs $arg" - ;; - - -l*) deplibs="$deplibs $arg" ;; - - -no-undefined) - allow_undefined=no - continue - ;; - - -o) prev=output ;; - - -release) - prev=release - continue - ;; - - -rpath) - prev=rpath - continue - ;; - - -static) - # If we have no pic_flag, then this is the same as -all-static. - if test -z "$pic_flag" && test -n "$link_static_flag"; then - compile_command="$compile_command $link_static_flag" - finalize_command="$finalize_command $link_static_flag" - fi - continue - ;; - - -version-info) - prev=vinfo - continue - ;; - - # Some other compiler flag. - -* | +*) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case "$arg" in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) - arg="\"$arg\"" - ;; - esac - ;; - - *.o | *.a) - # A standard object. - objs="$objs $arg" - ;; - - *.lo) - # A library object. - if test "$prev" = dlfiles; then - dlfiles="$dlfiles $arg" - if test "$build_libtool_libs" = yes; then - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e 's/\.lo$/\.o/'` - prev= - fi - libobjs="$libobjs $arg" - ;; - - *.la) - # A libtool-controlled library. - - dlname= - libdir= - library_names= - old_library= - - # Check to see that this really is a libtool archive. - if (sed -e '2q' $arg | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then : - else - $echo "$modename: \`$arg' is not a valid libtool archive" 1>&2 - exit 1 - fi - - # If there is no directory component, then add one. - case "$arg" in - */* | *\\*) . $arg ;; - *) . ./$arg ;; - esac - - if test -z "$libdir"; then - $echo "$modename: \`$arg' contains no -rpath information" 1>&2 - exit 1 - fi - - # Get the name of the library we link against. - linklib= - for l in $old_library $library_names; do - linklib="$l" - done - - if test -z "$linklib"; then - $echo "$modename: cannot find name of link library for \`$arg'" 1>&2 - exit 1 - fi - - # Find the relevant object directory and library name. - name=`$echo "X$arg" | $Xsed -e 's%^.*/%%' -e 's/\.la$//' -e 's/^lib//'` - dir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$dir" = "X$arg"; then - dir="$objdir" - else - dir="$dir/$objdir" - fi - - # This library was specified with -dlopen. - if test "$prev" = dlfiles; then - dlfiles="$dlfiles $arg" - if test -z "$dlname"; then - # If there is no dlname, we need to preload. - prev=dlprefiles - else - # We should not create a dependency on this library, but we - # may need any libraries it requires. - compile_command="$compile_command$dependency_libs" - finalize_command="$finalize_command$dependency_libs" - prev= - continue - fi - fi - - # The library was specified with -dlpreopen. - if test "$prev" = dlprefiles; then - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - dlprefiles="$dlprefiles $dir/$old_library" - else - dlprefiles="$dlprefiles $dir/$linklib" - fi - prev= - fi - - if test "$build_libtool_libs" = yes && test -n "$library_names"; then - link_against_libtool_libs="$link_against_libtool_libs $arg" - if test -n "$shlibpath_var"; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath " in - *" $dir "*) ;; - *) temp_rpath="$temp_rpath $dir" ;; - esac - fi - - # This is the magic to use -rpath. - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - # Put the magic libdir with the hardcode flag. - hardcode_libdirs="$libdir" - libdir="@HARDCODE_LIBDIRS@" - else - # Just accumulate the unique libdirs. - case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - libdir= - fi - fi - - if test -n "$libdir"; then - eval flag=\"$hardcode_libdir_flag_spec\" - - compile_command="$compile_command $flag" - finalize_command="$finalize_command $flag" - fi - elif test -n "$runpath_var"; then - # Do the same for the permanent run path. - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - - - case "$hardcode_action" in - immediate) - if test "$hardcode_direct" = no; then - compile_command="$compile_command $dir/$linklib" - elif test "$hardcode_minus_L" = no; then - compile_command="$compile_command -L$dir -l$name" - elif test "$hardcode_shlibpath_var" = no; then - compile_shlibpath="$compile_shlibpath$dir:" - compile_command="$compile_command -l$name" - fi - ;; - - relink) - # We need an absolute path. - case "$dir" in - /* | [A-Za-z]:\\*) ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit 1 - fi - dir="$absdir" - ;; - esac - - if test "$hardcode_direct" = yes; then - compile_command="$compile_command $dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - compile_command="$compile_command -L$dir -l$name" - elif test "$hardcode_shlibpath_var" = yes; then - compile_shlibpath="$compile_shlibpath$dir:" - compile_command="$compile_command -l$name" - fi - ;; - - *) - $echo "$modename: \`$hardcode_action' is an unknown hardcode action" 1>&2 - exit 1 - ;; - esac - - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes; then - finalize_command="$finalize_command $libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - finalize_command="$finalize_command -L$libdir -l$name" - elif test "$hardcode_shlibpath_var" = yes; then - finalize_shlibpath="$finalize_shlibpath$libdir:" - finalize_command="$finalize_command -l$name" - else - # We cannot seem to hardcode it, guess we'll fake it. - finalize_command="$finalize_command -L$libdir -l$name" - fi - else - # Transform directly to old archives if we don't build new libraries. - if test -n "$pic_flag" && test -z "$old_library"; then - $echo "$modename: cannot find static library for \`$arg'" 1>&2 - exit 1 - fi - - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" - compile_command="$compile_command $dir/$linklib" - finalize_command="$finalize_command $dir/$linklib" - else - compile_command="$compile_command -L$dir -l$name" - finalize_command="$finalize_command -L$dir -l$name" - fi - fi - - # Add in any libraries that this one depends upon. - compile_command="$compile_command$dependency_libs" - finalize_command="$finalize_command$dependency_libs" - continue - ;; - - # Some other compiler argument. - *) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case "$arg" in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) - arg="\"$arg\"" - ;; - esac - ;; - esac - - # Now actually substitute the argument into the commands. - if test -n "$arg"; then - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - fi - done - - if test -n "$prev"; then - $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - if test -n "$vinfo" && test -n "$release"; then - $echo "$modename: you cannot specify both \`-version-info' and \`-release'" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - oldlib= - oldobjs= - case "$output" in - "") - $echo "$modename: you must specify an output file" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; - - */* | *\\*) - $echo "$modename: output file \`$output' must have no directory components" 1>&2 - exit 1 - ;; - - *.a) - # Now set the variables for building old libraries. - build_libtool_libs=no - build_old_libs=yes - oldlib="$output" - $show "$rm $oldlib" - $run $rm $oldlib - ;; - - *.la) - # Make sure we only generate libraries of the form `libNAME.la'. - case "$output" in - lib*) ;; - *) - $echo "$modename: libtool library \`$arg' must begin with \`lib'" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; - esac - - name=`$echo "X$output" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - eval libname=\"$libname_spec\" - - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - dlname= - current=0 - revision=0 - age=0 - - if test -n "$objs"; then - $echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1 - exit 1 - fi - - # How the heck are we supposed to write a wrapper for a shared library? - if test -n "$link_against_libtool_libs"; then - $echo "$modename: libtool library \`$output' may not depend on uninstalled libraries:$link_against_libtool_libs" 1>&2 - exit 1 - fi - - if test -n "$dlfiles$dlprefiles"; then - $echo "$modename: warning: \`-dlopen' is ignored while creating libtool libraries" 1>&2 - # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` - fi - - if test -z "$rpath"; then - $echo "$modename: you must specify an installation directory with \`-rpath'" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - set dummy $rpath - if test $# -gt 2; then - $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 - fi - install_libdir="$2" - - # Parse the version information argument. - IFS="${IFS= }"; save_ifs="$IFS"; IFS=':' - set dummy $vinfo - IFS="$save_ifs" - - if test -n "$5"; then - $echo "$modename: too many parameters to \`-version-info'" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - test -n "$2" && current="$2" - test -n "$3" && revision="$3" - test -n "$4" && age="$4" - - # Check that each of the things are valid numbers. - case "$current" in - 0 | [1-9] | [1-9][0-9]*) ;; - *) - $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 - ;; - esac - - case "$revision" in - 0 | [1-9] | [1-9][0-9]*) ;; - *) - $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 - ;; - esac - - case "$age" in - 0 | [1-9] | [1-9][0-9]*) ;; - *) - $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 - ;; - esac - - if test $age -gt $current; then - $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 - fi - - # Calculate the version variables. - version_vars="version_type current age revision" - case "$version_type" in - none) ;; - - linux) - version_vars="$version_vars major versuffix" - major=`expr $current - $age` - versuffix="$major.$age.$revision" - ;; - - osf) - version_vars="$version_vars versuffix verstring" - major=`expr $current - $age` - versuffix="$current.$age.$revision" - verstring="$versuffix" - - # Add in all the interfaces that we are compatible with. - loop=$age - while test $loop != 0; do - iface=`expr $current - $loop` - loop=`expr $loop - 1` - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - verstring="$verstring:${current}.0" - ;; - - sunos) - version_vars="$version_vars major versuffix" - major="$current" - versuffix="$current.$revision" - ;; - - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit 1 - ;; - esac - - # Create the output directory, or remove our outputs if we need to. - if test -d $objdir; then - $show "$rm $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.*" - $run $rm $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.* - else - $show "$mkdir $objdir" - $run $mkdir $objdir - status=$? - if test $status -eq 0 || test -d $objdir; then : - else - exit $status - fi - fi - - # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 - build_libtool_libs=no - build_old_libs=yes - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi - - # Add libc to deplibs on all systems. - dependency_libs="$deplibs" - deplibs="$deplibs -lc" - - if test "$build_libtool_libs" = yes; then - # Get the real and link names of the library. - eval library_names=\"$library_names_spec\" - set dummy $library_names - realname="$2" - shift; shift - - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - - lib="$objdir/$realname" - for link - do - linknames="$linknames $link" - done - - # Use standard objects if they are PIC. - test -z "$pic_flag" && libobjs=`$echo "X$libobjs " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//g'` - - # Do each of the archive commands. - eval cmds=\"$archive_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - - # Create links to the real library. - for linkname in $linknames; do - $show "(cd $objdir && $LN_S $realname $linkname)" - $run eval '(cd $objdir && $LN_S $realname $linkname)' || exit $? - done - - # If -export-dynamic was specified, set the dlname. - if test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" - fi - fi - - # Now set the variables for building old libraries. - oldlib="$objdir/$libname.a" - ;; - - *.lo | *.o) - if test -n "$link_against_libtool_libs"; then - $echo "$modename: error: cannot link libtool libraries into reloadable objects" 1>&2 - exit 1 - fi - - if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored while creating objects" 1>&2 - fi - - if test -n "$dlfiles$dlprefiles"; then - $echo "$modename: warning: \`-dlopen' is ignored while creating objects" 1>&2 - # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` - fi - - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored while creating objects" 1>&2 - fi - - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored while creating objects" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored while creating objects" 1>&2 - fi - - case "$output" in - *.lo) - if test -n "$objs"; then - $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 - exit 1 - fi - libobj="$output" - obj=`$echo "X$output" | $Xsed -e 's/\.lo$/.o/'` - ;; - *) - libobj= - obj="$output" - ;; - esac - - # Delete the old objects. - $run $rm $obj $libobj - - # Create the old-style object. - reload_objs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^ ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'` - - output="$obj" - eval cmds=\"$reload_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - - # Exit if we aren't doing a library object file. - test -z "$libobj" && exit 0 - - if test "$build_libtool_libs" != yes; then - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - $show "echo timestamp > $libobj" - $run eval "echo timestamp > $libobj" || exit $? - exit 0 - fi - - if test -n "$pic_flag"; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs" - output="$libobj" - eval cmds=\"$reload_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - else - # Just create a symlink. - $show "$LN_S $obj $libobj" - $run $LN_S $obj $libobj || exit 1 - fi - - exit 0 - ;; - - *) - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored while linking programs" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored while creating objects" 1>&2 - fi - - if test -n "$rpath"; then - # If the user specified any rpath flags, then add them. - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - # Put the magic libdir with the hardcode flag. - hardcode_libdirs="$libdir" - libdir="@HARDCODE_LIBDIRS@" - else - # Just accumulate the unique libdirs. - case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - libdir= - fi - fi - - if test -n "$libdir"; then - eval flag=\"$hardcode_libdir_flag_spec\" - - compile_command="$compile_command $flag" - finalize_command="$finalize_command $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - done - fi - - # Substitute the hardcoded libdirs into the compile commands. - if test -n "$hardcode_libdir_separator"; then - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"` - fi - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. - compile_command=`$echo "X$compile_command " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//'` - finalize_command=`$echo "X$finalize_command " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//'` - fi - - if test "$export_dynamic" = yes && test -n "$NM" && test -n "$global_symbol_pipe"; then - dlsyms="${output}S.c" - else - dlsyms= - fi - - if test -n "$dlsyms"; then - # Add our own program objects to the preloaded list. - dlprefiles=`$echo "X$objs$dlprefiles " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//'` - - # Discover the nlist of each of the dlfiles. - nlist="$objdir/${output}.nm" - - if test -d $objdir; then - $show "$rm $nlist ${nlist}T" - $run $rm "$nlist" "${nlist}T" - else - $show "$mkdir $objdir" - $run $mkdir $objdir - status=$? - if test $status -eq 0 || test -d $objdir; then : - else - exit $status - fi - fi - - for arg in $dlprefiles; do - $show "extracting global C symbols from \`$arg'" - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done - - # Parse the name list into a source file. - $show "creating $objdir/$dlsyms" - if test -z "$run"; then - # Make sure we at least have an empty file. - test -f "$nlist" || : > "$nlist" - - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - wcout=`wc "$nlist" 2>/dev/null` - count=`echo "X$wcout" | $Xsed -e 's/^[ ]*\([0-9][0-9]*\).*$/\1/'` - (test "$count" -ge 0) 2>/dev/null || count=-1 - else - $rm "$nlist"T - count=-1 - fi - - case "$dlsyms" in - "") ;; - *.c) - $echo > "$objdir/$dlsyms" "\ -/* $dlsyms - symbol resolution table for \`$output' dlsym emulation. */ -/* Generated by $PROGRAM - GNU $PACKAGE $VERSION */ - -#ifdef __cplusplus -extern \"C\" { -#endif - -/* Prevent the only kind of declaration conflicts we can make. */ -#define dld_preloaded_symbol_count some_other_symbol -#define dld_preloaded_symbols some_other_symbol - -/* External symbol declarations for the compiler. */\ -" - - if test -f "$nlist"; then - sed -e 's/^.* \(.*\)$/extern char \1;/' < "$nlist" >> "$objdir/$dlsyms" - else - echo '/* NONE */' >> "$objdir/$dlsyms" - fi - - $echo >> "$objdir/$dlsyms" "\ - -#undef dld_preloaded_symbol_count -#undef dld_preloaded_symbols - -#if defined (__STDC__) && __STDC__ -# define __ptr_t void * -#else -# define __ptr_t char * -#endif - -/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */ -int dld_preloaded_symbol_count = $count; - -/* The mapping between symbol names and symbols. */ -struct { - char *name; - __ptr_t address; -} -dld_preloaded_symbols[] = -{\ -" - - if test -f "$nlist"; then - sed 's/^\(.*\) \(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$nlist" >> "$objdir/$dlsyms" - fi - - $echo >> "$objdir/$dlsyms" "\ - {0, (__ptr_t) 0} -}; - -#ifdef __cplusplus -} -#endif\ -" - ;; - - *) - $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 - exit 1 - ;; - esac - fi - - # Now compile the dynamic symbol file. - $show "(cd $objdir && $CC -c$no_builtin_flag \"$dlsyms\")" - $run eval '(cd $objdir && $CC -c$no_builtin_flag "$dlsyms")' || exit $? - - # Transform the symbol file into the correct name. - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.o%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.o%"` - elif test "$export_dynamic" != yes; then - test -n "$dlfiles$dlprefiles" && $echo "$modename: warning: \`-dlopen' and \`-dlpreopen' are ignored without \`-export-dynamic'" 1>&2 - else - # We keep going just in case the user didn't refer to - # dld_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was required. - $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 - - # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` - fi - - if test -z "$link_against_libtool_libs" || test "$build_libtool_libs" != yes; then - # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - - # We have no uninstalled library dependencies, so finalize right now. - $show "$compile_command" - $run eval "$compile_command" - exit $? - fi - - # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$objdir/$output"'%g'` - finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$objdir/$output"'T%g'` - - # Create the binary in the object directory, then wrap it. - if test -d $objdir; then : - else - $show "$mkdir $objdir" - $run $mkdir $objdir - status=$? - if test $status -eq 0 || test -d $objdir; then : - else - exit $status - fi - fi - - if test -n "$shlibpath_var"; then - # We should set the shlibpath_var - rpath= - for dir in $temp_rpath; do - case "$dir" in - /* | [A-Za-z]:\\*) - # Absolute path. - rpath="$rpath$dir:" - ;; - *) - # Relative path: add a thisdir entry. - rpath="$rpath\$thisdir/$dir:" - ;; - esac - done - temp_rpath="$rpath" - fi - - # Delete the old output file. - $run $rm $output - - if test -n "$compile_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath\$$shlibpath_var\" $compile_command" - fi - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi - - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - compile_command="$runpath_var=\"$rpath\$$runpath_var\" $compile_command" - finalize_command="$runpath_var=\"$rpath\$$runpath_var\" $finalize_command" - fi - - case "$hardcode_action" in - relink) - # AGH! Flame the AIX and HP-UX people for me, will ya? - $echo "$modename: warning: using a buggy system linker" 1>&2 - $echo "$modename: relinking will be required before \`$output' can be installed" 1>&2 - ;; - esac - - $show "$compile_command" - $run eval "$compile_command" || exit $? - - # Now create the wrapper script. - $show "creating $output" - - # Quote the finalize command for shipping. - finalize_command=`$echo "X$finalize_command" | $Xsed -e "$sed_quote_subst"` - - # Quote $echo for shipping. - qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` - - # Only actually do things if our run command is non-null. - if test -z "$run"; then - $rm $output - trap "$rm $output; exit 1" 1 2 15 - - $echo > $output "\ -#! /bin/sh - -# $output - temporary wrapper script for $objdir/$output -# Generated by ltmain.sh - GNU $PACKAGE $VERSION -# -# The $output program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of \``pwd`'. -# If it is, it will not operate correctly. - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' -sed_quote_subst='$sed_quote_subst' - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -if test \"\${CDPATH+set}\" = set; then CDPATH=; export CDPATH; fi - -# This environment variable determines our operation mode. -if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variables: - link_against_libtool_libs='$link_against_libtool_libs' - finalize_command=\"$finalize_command\" -else - # When we are sourced in execute mode, \$file and \$echo are already set. - if test \"\$libtool_execute_magic\" = \"$magic\"; then : - else - echo=\"$qecho\" - file=\"\$0\" - fi\ -" - $echo >> $output "\ - - # Find the directory that this script lives in. - thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` - - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in - /* | [A-Za-z]:\\*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; - esac - fi - - file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\` - done - - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" - - progdir=\"\$thisdir/$objdir\" - program='$output' - - if test -f \"\$progdir/\$program\"; then" - - # Export our shlibpath_var if we have one. - if test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $echo >> $output "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" - - # Some systems cannot cope with colon-terminated $shlibpath_var - $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/:*\$//'\` - - export $shlibpath_var -" - fi - - $echo >> $output "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. - - # Export the path to the program. - PATH=\"\$progdir:\$PATH\" - export PATH - - exec \$program \${1+\"\$@\"} - - \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" - exit 1 - fi - else - # The program doesn't exist. - \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 - \$echo \"This script is just a wrapper for \$program.\" 1>&2 - echo \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 - fi -fi\ -" - chmod +x $output - fi - exit 0 - ;; - esac - - # See if we need to build an old-fashioned archive. - if test "$build_old_libs" = "yes"; then - # Transform .lo files to .o files. - oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^ ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'` - - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - eval cmds=\"$old_archive_from_new_cmds\" - else - eval cmds=\"$old_archive_cmds\" - fi - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - - # Now create the libtool archive. - case "$output" in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.a" - - $show "creating $output" - - # Only create the output if not a dry run. - if test -z "$run"; then - $echo > $output "\ -# $output - a libtool library file -# Generated by ltmain.sh - GNU $PACKAGE $VERSION - -# The name that we can dlopen(3). -dlname='$dlname' - -# Names of this library. -library_names='$library_names' - -# The name of the static archive. -old_library='$old_library' - -# Libraries that this one depends upon. -dependency_libs='$dependency_libs' - -# Version information for $libname. -current=$current -age=$age -revision=$revision - -# Directory that this library needs to be installed in: -libdir='$install_libdir'\ -" - fi - - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - $show "(cd $objdir && $LN_S ../$output $output)" - $run eval "(cd $objdir && $LN_S ../$output $output)" || exit 1 - ;; - esac - exit 0 - ;; - - # libtool install mode - install) - modename="$modename: install" - - # There may be an optional /bin/sh argument at the beginning of - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL"; then - # Aesthetically quote it. - arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` - case "$arg" in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) - arg="\"$arg\"" - ;; - esac - install_prog="$arg " - arg="$1" - shift - else - install_prog= - arg="$nonopt" - fi - - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case "$arg" in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog$arg" - - # We need to accept at least all the BSD install flags. - dest= - files= - opts= - prev= - install_type= - isdir= - stripme= - for arg - do - if test -n "$dest"; then - files="$files $dest" - dest="$arg" - continue - fi - - case "$arg" in - -d) isdir=yes ;; - -f) prev="-f" ;; - -g) prev="-g" ;; - -m) prev="-m" ;; - -o) prev="-o" ;; - -s) - stripme=" -s" - continue - ;; - -*) ;; - - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - prev= - else - dest="$arg" - continue - fi - ;; - esac - - # Aesthetically quote the argument. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case "$arg" in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog $arg" - done - - if test -z "$install_prog"; then - $echo "$modename: you must specify an install program" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - if test -n "$prev"; then - $echo "$modename: the \`$prev' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - if test -z "$files"; then - if test -z "$dest"; then - $echo "$modename: no file or destination specified" 1>&2 - else - $echo "$modename: you must specify a destination" 1>&2 - fi - $echo "$help" 1>&2 - exit 1 - fi - - # Strip any trailing slash from the destination. - dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` - - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test -n "$isdir"; then - destdir="$dest" - destname= - else - destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'` - test "X$destdir" = "X$dest" && destdir=. - destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'` - - # Not a directory, so check to see that there is only one file specified. - set dummy $files - if test $# -gt 2; then - $echo "$modename: \`$dest' is not a directory" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - fi - case "$destdir" in - /* | [A-Za-z]:\\*) ;; - *) - for file in $files; do - case "$file" in - *.lo) ;; - *) - $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; - esac - done - ;; - esac - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - staticlibs= - future_libdirs= - current_libdirs= - for file in $files; do - - # Do each installation. - case "$file" in - *.a) - # Do the static libraries later. - staticlibs="$staticlibs $file" - ;; - - *.la) - # Check to see that this really is a libtool archive. - if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then : - else - $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - library_names= - old_library= - # If there is no directory component, then add one. - case "$file" in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; - esac - fi - - dir="`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/" - test "X$dir" = "X$file/" && dir= - dir="$dir$objdir" - - # See the names of the shared library. - set dummy $library_names - if test -n "$2"; then - realname="$2" - shift - shift - - # Install the shared library and build the symlinks. - $show "$install_prog $dir/$realname $destdir/$realname" - $run eval "$install_prog $dir/$realname $destdir/$realname" || exit $? - test "X$dlname" = "X$realname" && dlname= - - if test $# -gt 0; then - # Delete the old symlinks. - rmcmd="$rm" - for linkname - do - rmcmd="$rmcmd $destdir/$linkname" - done - $show "$rmcmd" - $run $rmcmd - - # ... and create new ones. - for linkname - do - test "X$dlname" = "X$linkname" && dlname= - $show "(cd $destdir && $LN_S $realname $linkname)" - $run eval "(cd $destdir && $LN_S $realname $linkname)" - done - fi - - if test -n "$dlname"; then - # Install the dynamically-loadable library. - $show "$install_prog $dir/$dlname $destdir/$dlname" - $run eval "$install_prog $dir/$dlname $destdir/$dlname" || exit $? - fi - - # Do each command in the postinstall commands. - lib="$destdir/$realname" - eval cmds=\"$postinstall_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - - # Install the pseudo-library for information purposes. - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - $show "$install_prog $file $destdir/$name" - $run eval "$install_prog $file $destdir/$name" || exit $? - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" - ;; - - *.lo) - # Install (i.e. copy) a libtool object. - - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" - fi - - # Deduce the name of the destination old-style object file. - case "$destfile" in - *.lo) - staticdest=`$echo "X$destfile" | $Xsed -e 's/\.lo$/\.o/'` - ;; - *.o) - staticdest="$destfile" - destfile= - ;; - *) - $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; - esac - - # Install the libtool object if requested. - if test -n "$destfile"; then - $show "$install_prog $file $destfile" - $run eval "$install_prog $file $destfile" || exit $? - fi - - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - staticobj=`$echo "X$file" | $Xsed -e 's/\.lo$/\.o/'` - - $show "$install_prog $staticobj $staticdest" - $run eval "$install_prog \$staticobj \$staticdest" || exit $? - fi - exit 0 - ;; - - *) - # Do a test to see if this is really a libtool program. - if (sed -e '4q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then - link_against_libtool_libs= - finalize_command= - - # If there is no directory component, then add one. - case "$file" in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Check the variables that should have been set. - if test -z "$link_against_libtool_libs" || test -z "$finalize_command"; then - $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2 - exit 1 - fi - - finalize=yes - for lib in $link_against_libtool_libs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - # If there is no directory component, then add one. - case "$lib" in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - fi - libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" - if test -z "$libdir"; then - $echo "$modename: warning: \`$lib' contains no -rpath information" 1>&2 - elif test -f "$libfile"; then : - else - $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 - finalize=no - fi - done - - if test "$hardcode_action" = relink; then - if test "$finalize" = yes; then - $echo "$modename: warning: relinking \`$file' on behalf of your buggy system linker" 1>&2 - $show "$finalize_command" - if $run eval "$finalize_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - continue - fi - file="$objdir/$file"T - else - $echo "$modename: warning: cannot relink \`$file' on behalf of your buggy system linker" 1>&2 - fi - else - # Install the binary that we compiled earlier. - file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - - $show "$install_prog$stripme $file $dest" - $run eval "$install_prog\$stripme \$file \$dest" || exit $? - ;; - esac - done - - for file in $staticlibs; do - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - - # Set up the ranlib parameters. - oldlib="$destdir/$name" - - $show "$install_prog $file $oldlib" - $run eval "$install_prog \$file \$oldlib" || exit $? - - # Do each command in the postinstall commands. - eval cmds=\"$old_postinstall_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - done - - if test -n "$future_libdirs"; then - $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2 - fi - - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - test -n "$run" && current_libdirs=" -n$current_libdirs" - exec $SHELL $0 --finish$current_libdirs - exit 1 - fi - - exit 0 - ;; - - # libtool finish mode - finish) - modename="$modename: finish" - libdirs="$nonopt" - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done - - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. - eval cmds=\"$finish_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" - done - IFS="$save_ifs" - fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" - $run eval "$cmds" - fi - done - fi - - echo "------------------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - echo " $libdir" - done - echo - echo "To link against installed libraries in a given directory, LIBDIR," - echo "you must use the \`-LLIBDIR' flag during linking." - echo - echo " You will also need to do one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" - fi - if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" - echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - echo " - use the \`$flag' linker flag" - fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo - echo "See any operating system documentation about shared libraries for" - echo "more information, such as the ld(1) and ld.so(8) manual pages." - echo "------------------------------------------------------------------------------" - exit 0 - ;; - - # libtool execute mode - execute) - modename="$modename: execute" - - # The first argument is the command name. - cmd="$nonopt" - if test -z "$cmd"; then - $echo "$modename: you must specify a COMMAND" 1>&2 - $echo "$help" - exit 1 - fi - - # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do - if test -f "$file"; then : - else - $echo "$modename: \`$file' is not a file" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - dir= - case "$file" in - *.la) - # Check to see that this really is a libtool archive. - if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - # Read the libtool library. - dlname= - library_names= - - # If there is no directory component, then add one. - case "$file" in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Skip this library if it cannot be dlopened. - if test -z "$dlname"; then - # Warn if it was a shared library. - test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'" - continue - fi - - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - - if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" - else - $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 - exit 1 - fi - ;; - - *.lo) - # Just add the directory containing the .lo file. - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - ;; - - *) - $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 - continue - ;; - esac - - # Get the absolute pathname. - absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" - - # Now add the directory to shlibpath_var. - if eval "test -z \"\$$shlibpath_var\""; then - eval "$shlibpath_var=\"\$dir\"" - else - eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - - # This variable tells wrapper scripts just to set shlibpath_var - # rather than running their programs. - libtool_execute_magic="$magic" - - # Check if any of the arguments is a wrapper script. - args= - for file - do - case "$file" in - -*) ;; - *) - # Do a test to see if this is really a libtool program. - if (sed -e '4q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then - # If there is no directory component, then add one. - case "$file" in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Transform arg to wrapped name. - file="$progdir/$program" - fi - ;; - esac - # Quote arguments (to preserve shell metacharacters). - file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` - args="$args \"$file\"" - done - - if test -z "$run"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" - - # Now actually exec the command. - eval "exec \$cmd$args" - - $echo "$modename: cannot exec \$cmd$args" - exit 1 - else - # Display what would be done. - eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" - $echo "export $shlibpath_var" - $echo "$cmd$args" - exit 0 - fi - ;; - - # libtool uninstall mode - uninstall) - modename="$modename: uninstall" - rm="$nonopt" - files= - - for arg - do - case "$arg" in - -*) rm="$rm $arg" ;; - *) files="$files $arg" ;; - esac - done - - if test -z "$rm"; then - $echo "$modename: you must specify an RM program" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - for file in $files; do - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - - rmfiles="$file" - - case "$name" in - *.la) - # Possibly a libtool archive, so verify it. - if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then - . $dir/$name - - # Delete the libtool libraries and symlinks. - for n in $library_names; do - rmfiles="$rmfiles $dir/$n" - test "X$n" = "X$dlname" && dlname= - done - test -n "$dlname" && rmfiles="$rmfiles $dir/$dlname" - test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library" - - $show "$rm $rmfiles" - $run $rm $rmfiles - - if test -n "$library_names"; then - # Do each command in the postuninstall commands. - eval cmds=\"$postuninstall_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" - done - IFS="$save_ifs" - fi - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. - eval cmds=\"$old_postuninstall_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" - done - IFS="$save_ifs" - fi - - # FIXME: should reinstall the best remaining shared library. - fi - ;; - - *.lo) - if test "$build_old_libs" = yes; then - oldobj=`$echo "X$name" | $Xsed -e 's/\.lo$/\.o/'` - rmfiles="$rmfiles $dir/$oldobj" - fi - $show "$rm $rmfiles" - $run $rm $rmfiles - ;; - - *) - $show "$rm $rmfiles" - $run $rm $rmfiles - ;; - esac - done - exit 0 - ;; - - "") - $echo "$modename: you must specify a MODE" 1>&2 - $echo "$generic_help" 1>&2 - exit 1 - ;; - esac - - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$generic_help" 1>&2 - exit 1 -fi # test -z "$show_help" - -# We need to display help for each of the modes. -case "$mode" in -"") $echo \ -"Usage: $modename [OPTION]... [MODE-ARG]... - -Provide generalized library-building support services. - --n, --dry-run display commands without modifying any files - --features display configuration information and exit - --finish same as \`--mode=finish' - --help display this help message and exit - --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] - --quiet same as \`--silent' - --silent don't print informational messages - --version print version information - -MODE must be one of the following: - - compile compile a source file into a libtool object - execute automatically set library path, then run a program - finish complete the installation of libtool libraries - install install libraries or executables - link create a library or an executable - uninstall remove libraries from an installed directory - -MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for -a more detailed description of MODE." - exit 0 - ;; - -compile) - $echo \ -"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -Compile a source file into a libtool library object. - -COMPILE-COMMAND is a command to be used in creating a \`standard' object file -from the given SOURCEFILE. - -The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." - ;; - -execute) - $echo \ -"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]... - -Automatically set library path, then run a program. - -This mode accepts the following additional options: - - -dlopen FILE add the directory containing FILE to the library path - -This mode sets the library path environment variable according to \`-dlopen' -flags. - -If any of the ARGS are libtool executable wrappers, then they are translated -into their corresponding uninstalled binary, and any of their required library -directories are added to the library path. - -Then, COMMAND is executed, with ARGS as arguments." - ;; - -finish) - $echo \ -"Usage: $modename [OPTION]... --mode=finish [LIBDIR]... - -Complete the installation of libtool libraries. - -Each LIBDIR is a directory that contains libtool libraries. - -The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." - ;; - -install) - $echo \ -"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND... - -Install executables or libraries. - -INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. - -The rest of the components are interpreted as arguments to that command (only -BSD-compatible install options are recognized)." - ;; - -link) - $echo \ -"Usage: $modename [OPTION]... --mode=link LINK-COMMAND... - -Link object files or libraries together to form another library, or to -create an executable program. - -LINK-COMMAND is a command using the C compiler that you would use to create -a program from several object files. - -The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to dld_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -static do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -All other options (arguments beginning with \`-') are ignored. - -Every other argument is treated as a filename. Files ending in \`.la' are -treated as uninstalled libtool libraries, other files are standard or library -object files. - -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, only -library objects (\`.lo' files) may be specified, and \`-rpath' is required. - -If OUTPUT-FILE ends in \`.a', then a standard library is created using \`ar' -and \`ranlib'. - -If OUTPUT-FILE ends in \`.lo' or \`.o', then a reloadable object file is -created, otherwise an executable program is created." - ;; - -uninstall) - $echo -"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - -Remove libraries from an installation directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, all the files associated with it are deleted. -Otherwise, only FILE itself is deleted using RM." - ;; - -*) - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; -esac - -echo -$echo "Try \`$modename --help' for more information about other modes." - -exit 0 - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: diff --git a/po/ChangeLog b/po/ChangeLog index e69de29b..77b4e9c0 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -0,0 +1,8 @@ +1998-05-23 Erick Branderhorst <Erick.Branderhorst@asml.nl> + + * nl.po: Dutch translation by Erick Branderhorst. + + * fr.po: French translation by Erick Branderhorst, based on the + translations by Franc,ois Pinard in fr.msg and m4.cod. + + diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 85b34636..111b40fc 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -1,19 +1,10 @@ # Makefile for program source directory in GNU NLS utilities package. -# Copyright (C) 1995, 1996 Free Software Foundation, Inc. +# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu> # -# 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. +# This file file 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. PACKAGE = @PACKAGE@ VERSION = @VERSION@ @@ -35,7 +26,7 @@ subdir = po INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = @MKINSTALLDIRS@ +MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@ CC = @CC@ GENCAT = @GENCAT@ @@ -91,20 +82,16 @@ all: all-@USE_NLS@ all-yes: cat-id-tbl.c $(CATALOGS) all-no: -$(PACKAGE).pot: $(POTFILES) +$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ --add-comments --keyword=_ --keyword=N_ \ - --files-from=$(srcdir)/POTFILES.in - if [ ! -s $(PACKAGE).po ] \ - || cmp -s $(PACKAGE).po $(srcdir)/$(PACKAGE).pot; then \ - rm -f $(PACKAGE).po; \ - else \ - rm -f $(srcdir)/$(PACKAGE).pot \ - && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot; \ - fi + --files-from=$(srcdir)/POTFILES.in \ + && test ! -f $(PACKAGE).po \ + || ( rm -f $(srcdir)/$(PACKAGE).pot \ + && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot ) -cat-id-tbl.c: stamp-cat-id -stamp-cat-id: $(PACKAGE).pot +$(srcdir)/cat-id-tbl.c: stamp-cat-id; @: +$(srcdir)/stamp-cat-id: $(PACKAGE).pot rm -f cat-id-tbl.tmp sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \ | sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp @@ -123,23 +110,24 @@ install-exec: 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 \ + cat=`basename $$cat`; \ case "$$cat" in \ *.gmo) destdir=$(gnulocaledir);; \ *) destdir=$(localedir);; \ esac; \ - lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \ + 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); \ @@ -164,13 +152,13 @@ install-data-yes: all 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; \ - cd $(srcdir) && \ - $(INSTALL_DATA) Makefile.in.in $(gettextsrcdir)/Makefile.in.in; \ + $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ + $(gettextsrcdir)/Makefile.in.in; \ else \ : ; \ fi @@ -181,7 +169,8 @@ installcheck: uninstall: catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ - lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \ rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ @@ -207,6 +196,7 @@ distclean: clean maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." + rm -f $(GMOFILES) distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: update-po $(DISTFILES) @@ -222,7 +212,8 @@ update-po: Makefile cd $(srcdir); \ catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ - lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ mv $$lang.po $$lang.old.po; \ echo "$$lang:"; \ if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \ @@ -240,9 +231,12 @@ POTFILES: POTFILES.in else \ posrcprefix="../"; \ fi; \ - sed -e '/^#/d' -e '/^[ ]*$$/d' \ - -e "s@.*@ $$posrcprefix& \\\\@" \ - -e '$$s/\(.*\) \\/\1/' < $(srcdir)/POTFILES.in > POTFILES ) + rm -f $@-t $@ \ + && (sed -e '/^#/d' -e '/^[ ]*$$/d' \ + -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ + | sed -e '$$s/\\$$//') > $@-t \ + && chmod a-w $@-t \ + && mv $@-t $@ ) Makefile: Makefile.in.in ../config.status POTFILES cd .. \ diff --git a/po/POTFILES.in b/po/POTFILES.in index 2b770796..5578b784 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1 +1,12 @@ -src/m4.c
\ No newline at end of file +src/builtin.c +src/debug.c +src/eval.c +src/format.c +src/freeze.c +src/input.c +src/m4.c +src/macro.c +src/output.c +src/path.c +src/stackovf.c +src/symtab.c diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c index 45dec044..1b2a52f9 100644 --- a/po/cat-id-tbl.c +++ b/po/cat-id-tbl.c @@ -8,9 +8,57 @@ const struct _msg_ent _msg_tbl[] = { {"", 1}, - {"ERROR: Stack overflow. (Infinite define recursion?)", 2}, - {"Try `%s --help' for more information.\n", 3}, - {"Usage: %s [OPTION]... [FILE]...\n", 4}, + {"Warning: Too few arguments to built-in `%s'", 2}, + {"Warning: Excess arguments to built-in `%s' ignored", 3}, + {"Non-numeric argument to built-in `%s'", 4}, + {"INTERNAL ERROR: Bad token data type in define_macro ()", 5}, + {"Undefined name %s", 6}, + {"INTERNAL ERROR: Builtin not found in builtin table!", 7}, + {"INTERNAL ERROR: Bad token data type in m4_dumpdef ()", 8}, + {"Undefined macro `%s'", 9}, + {"INTERNAL ERROR: Bad symbol type in m4_defn ()", 10}, + {"Cannot open pipe to command `%s'", 11}, + {"Radix in eval out of range (radix = %d)", 12}, + {"Negative width to eval", 13}, + {"Non-numeric argument to %s", 14}, + {"Cannot undivert %s", 15}, + {"Cannot open %s", 16}, + {"Debugmode: bad debug flags: `%s'", 17}, + {"Cannot set error file: %s", 18}, + {"WARNING: \\0 will disappear, use \\& instead in replacements", 19}, + {"Bad regular expression `%s': %s", 20}, + {"Error matching regular expression `%s'", 21}, + {"INTERNAL ERROR: Builtin not found in builtin table! (trace_pre ())", 22}, + {"INTERNAL ERROR: Bad token data type (trace_pre ())", 23}, + {"Bad expression in eval (missing right parenthesis): %s", 24}, + {"Bad expression in eval: %s", 25}, + {"Bad expression in eval (bad input): %s", 26}, + {"Bad expression in eval (excess input): %s", 27}, + {"Divide by zero in eval: %s", 28}, + {"Modulo by zero in eval: %s", 29}, + {"INTERNAL ERROR: Bad error code in evaluate ()", 30}, + {"INTERNAL ERROR: Bad comparison operator in cmp_term ()", 31}, + {"INTERNAL ERROR: Bad shift operator in shift_term ()", 32}, + {"INTERNAL ERROR: Bad operator in mult_term ()", 33}, + {"INTERNAL ERROR: Built-in not found in builtin table!", 34}, + {"INTERNAL ERROR: Bad token data type in freeze_one_symbol ()", 35}, + {"Expecting line feed in frozen file", 36}, + {"Expecting character `%c' in frozen file", 37}, + {"Ill-formated frozen file", 38}, + {"Premature end of frozen file", 39}, + {"`%s' from frozen file not found in builtin table!", 40}, + {"Input read from %s", 41}, + {"INTERNAL ERROR: Recursive push_string!", 42}, + {"Input reverted to %s, line %d", 43}, + {"INTERNAL ERROR: Input stack botch in pop_input ()", 44}, + {"INTERNAL ERROR: Bad call to init_macro_token ()", 45}, + {"INTERNAL ERROR: Input stack botch in peek_input ()", 46}, + {"INTERNAL ERROR: Input stack botch in next_char ()", 47}, + {"NONE", 48}, + {"ERROR: EOF in string", 49}, + {"ERROR: Stack overflow. (Infinite define recursion?)", 50}, + {"Try `%s --help' for more information.\n", 51}, + {"Usage: %s [OPTION]... [FILE]...\n", 52}, {"\ Mandatory or optional arguments to long options are mandatory or optional\n\ for short options too.\n\ @@ -21,33 +69,33 @@ Operation modes:\n\ -e, --interactive unbuffer output, ignore interrupts\n\ -E, --fatal-warnings stop execution after first warning\n\ -Q, --quiet, --silent suppress some warnings for builtins\n\ - -P, --prefix-builtins force a `m4_' prefix to all builtins\n", 5}, - {" -W, --word-regexp=REGEXP use REGEXP for macro name syntax\n", 6}, + -P, --prefix-builtins force a `m4_' prefix to all builtins\n", 53}, + {" -W, --word-regexp=REGEXP use REGEXP for macro name syntax\n", 54}, {"\ \n\ Preprocessor features:\n\ -I, --include=DIRECTORY search this directory second for includes\n\ -D, --define=NAME[=VALUE] enter NAME has having VALUE, or empty\n\ -U, --undefine=NAME delete builtin NAME\n\ - -s, --synclines generate `#line NO \"FILE\"' lines\n", 7}, + -s, --synclines generate `#line NO \"FILE\"' lines\n", 55}, {"\ \n\ Limits control:\n\ -G, --traditional suppress all GNU extensions\n\ -H, --hashsize=PRIME set symbol lookup hash table size\n\ - -L, --nesting-limit=NUMBER change artificial nesting limit\n", 8}, + -L, --nesting-limit=NUMBER change artificial nesting limit\n", 56}, {"\ \n\ Frozen state files:\n\ -F, --freeze-state=FILE produce a frozen state on FILE at end\n\ - -R, --reload-state=FILE reload a frozen state from FILE at start\n", 9}, + -R, --reload-state=FILE reload a frozen state from FILE at start\n", 57}, {"\ \n\ Debugging:\n\ -d, --debug=[FLAGS] set debug level (no FLAGS implies `aeq')\n\ -t, --trace=NAME trace NAME when it will be defined\n\ -l, --arglength=NUM restrict macro tracing size\n\ - -o, --error-output=FILE redirect debug and trace output\n", 10}, + -o, --error-output=FILE redirect debug and trace output\n", 58}, {"\ \n\ FLAGS is any of:\n\ @@ -61,12 +109,30 @@ FLAGS is any of:\n\ l say current input line number\n\ p show results of path searches\n\ i show changes in input files\n\ - V shorthand for all of the above flags\n", 11}, + V shorthand for all of the above flags\n", 59}, {"\ \n\ -If no FILE or if FILE is `-', standard input is read.\n", 12}, - {"Bad debug flags: `%s'", 13}, - {"INTERNAL ERROR: Bad code in deferred arguments", 14}, +If no FILE or if FILE is `-', standard input is read.\n", 60}, + {"Bad debug flags: `%s'", 61}, + {"INTERNAL ERROR: Bad code in deferred arguments", 62}, + {"INTERNAL ERROR: Bad token type in expand_token ()", 63}, + {"ERROR: EOF in argument list", 64}, + {"INTERNAL ERROR: Bad token type in expand_argument ()", 65}, + {"INTERNAL ERROR: Bad symbol type in call_macro ()", 66}, + {"ERROR: Recursion limit of %d exceeded, use -L<N> to change it", 67}, + {"ERROR: Cannot create temporary file for diversion", 68}, + {"ERROR: Cannot flush diversion to temporary file", 69}, + {"ERROR: Copying inserted file", 70}, + {"ERROR: Reading inserted file", 71}, + {"Cannot stat diversion", 72}, + {"Path search for `%s' found `%s'", 73}, + {"VMEM limit exceeded?\n", 74}, + {"\ +Memory bounds violation detected (SIGSEGV). Either a stack overflow\n\ +occurred, or there is a bug in ", 75}, + {". Check for possible infinite recursion.\n", 76}, + {"INTERNAL ERROR: Illegal mode to symbol_lookup ()", 77}, + {"Name `%s' is unknown\n", 78}, }; -int _msg_tbl_length = 14; +int _msg_tbl_length = 78; diff --git a/po/fr.gmo b/po/fr.gmo Binary files differnew file mode 100644 index 00000000..8707d3ea --- /dev/null +++ b/po/fr.gmo diff --git a/po/fr.po b/po/fr.po new file mode 100644 index 00000000..85b66092 --- /dev/null +++ b/po/fr.po @@ -0,0 +1,468 @@ +# French messages for GNU m4. +# Copyright (C) 1998 Free Software Foundation, Inc. +# Erick Branderhorst <Erick.Branderhorst@asml.nl>, 1998, +# created this file based on fr.msg, which was created by: +# Franc,ois Pinard <pinard@iro.umontreal.ca> 199(4-7). +# +msgid "" +msgstr "" +"Project-Id-Version: m4 1.4d\n" +"POT-Creation-Date: 1998-05-25 12:26+0200\n" +"PO-Revision-Date: 1998-05-23 11:53+02:00\n" +"Last-Translator: Erick Branderhorst <Erick.Branderhorst@asml.nl>\n" +"Language-Team: dutch <nl@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=\n" +"Content-Transfer-Encoding: 8-bit\n" + +#: src/builtin.c:272 +#, c-format +msgid "Warning: Too few arguments to built-in `%s'" +msgstr "Attention: Trop peu d'arguments pour «%s» prédéfini" + +#: src/builtin.c:278 +#, c-format +msgid "Warning: Excess arguments to built-in `%s' ignored" +msgstr "Attention: Les arguments superflus pour «%s» prédéfini sont ignorés" + +#: src/builtin.c:298 +#, c-format +msgid "Non-numeric argument to built-in `%s'" +msgstr "Argument non-numérique pour «%s» prédéfini" + +#: src/builtin.c:438 +msgid "INTERNAL ERROR: Bad token data type in define_macro ()" +msgstr "ERREUR INTERNE: Mauvais type de lexème dans define_macro ()" + +#: src/builtin.c:608 src/builtin.c:671 src/builtin.c:1188 src/builtin.c:1212 +#, c-format +msgid "Undefined name %s" +msgstr "Nom «%s» non-défini" + +#: src/builtin.c:636 +msgid "INTERNAL ERROR: Builtin not found in builtin table!" +msgstr "ERREUR INTERNE: Prédéfini introuvable dans la table des prédéfinis!" + +#: src/builtin.c:644 +msgid "INTERNAL ERROR: Bad token data type in m4_dumpdef ()" +msgstr "ERREUR INTERNE: Mauvais type de données pour lexème dans m4_dumpdef ()" + +#: src/builtin.c:695 +#, c-format +msgid "Undefined macro `%s'" +msgstr "Macro «%s» non-défini" + +#: src/builtin.c:735 +msgid "INTERNAL ERROR: Bad symbol type in m4_defn ()" +msgstr "ERREUR INTERNE: Mauvais type de symbole dans m4_defn ()" + +#: src/builtin.c:772 +#, c-format +msgid "Cannot open pipe to command `%s'" +msgstr "Incapable d'ouvrir un «pipe» pour la commande «%s»" + +#: src/builtin.c:811 +#, c-format +msgid "Radix in eval out of range (radix = %d)" +msgstr "Base hors intervalle dans «eval» (base = %d)" + +#: src/builtin.c:820 +msgid "Negative width to eval" +msgstr "Largeur négative dans «eval»" + +#: src/builtin.c:925 +#, c-format +msgid "Non-numeric argument to %s" +msgstr "Argument non-numérique pour %s" + +#: src/builtin.c:937 +#, c-format +msgid "Cannot undivert %s" +msgstr "Incapble de ramener la diversion %s" + +#: src/builtin.c:1043 src/freeze.c:207 +#, c-format +msgid "Cannot open %s" +msgstr "Incapable d'ouvrir %s" + +#: src/builtin.c:1248 +#, c-format +msgid "Debugmode: bad debug flags: `%s'" +msgstr "Debugmode: mauvais indicateurs de mise-au-point: «%s»" + +#: src/builtin.c:1284 +#, c-format +msgid "Cannot set error file: %s" +msgstr "Incapable de préparer le fichier d'erreurs: %s" + +#: src/builtin.c:1501 +msgid "WARNING: \\0 will disappear, use \\& instead in replacements" +msgstr "" +"ATTENTION: \\\\0 disparaîtra, utiliser \\\\& plutôt pour les remplacements" + +#: src/builtin.c:1562 src/builtin.c:1622 src/input.c:637 +#, c-format +msgid "Bad regular expression `%s': %s" +msgstr "Mauvaise expression régulière «%s»: %s" + +#: src/builtin.c:1573 src/builtin.c:1646 +#, c-format +msgid "Error matching regular expression `%s'" +msgstr "Erreur d'appariement pour l'expressio régulière «%s»" + +#: src/debug.c:379 +msgid "INTERNAL ERROR: Builtin not found in builtin table! (trace_pre ())" +msgstr "" +"ERREUR INTERNE: Prédéfini introuvable dans la table des prédéfinis! " +"(trace_pre ())" + +#: src/debug.c:387 +msgid "INTERNAL ERROR: Bad token data type (trace_pre ())" +msgstr "ERREUR INTERNE: Mauvais type de donnée pour de lexème (trace_pre ())" + +#: src/eval.c:277 +#, c-format +msgid "Bad expression in eval (missing right parenthesis): %s" +msgstr "Mauvaise expression dans «eval» (parenthèse droite manquante): %s" + +#: src/eval.c:283 +#, c-format +msgid "Bad expression in eval: %s" +msgstr "Mauvaise expression dans «eval»: %s" + +#: src/eval.c:288 +#, c-format +msgid "Bad expression in eval (bad input): %s" +msgstr "Mauvaise expression dans «eval» (mauvaise entrée): %s" + +#: src/eval.c:293 +#, c-format +msgid "Bad expression in eval (excess input): %s" +msgstr "Mauvaise expression dans «eval» (entrée superflue): %s" + +#: src/eval.c:298 +#, c-format +msgid "Divide by zero in eval: %s" +msgstr "Division par zéro dans «eval»: %s" + +#: src/eval.c:303 +#, c-format +msgid "Modulo by zero in eval: %s" +msgstr "Module par zéro dans «eval»: %s" + +#: src/eval.c:308 +msgid "INTERNAL ERROR: Bad error code in evaluate ()" +msgstr "ERREUR INTERNE: Mauvais code d'erreur dans evaluate ()" + +#: src/eval.c:547 +msgid "INTERNAL ERROR: Bad comparison operator in cmp_term ()" +msgstr "ERREUR INTERNE: Mauvais opérateur de comparaison dans cmp_term ()" + +#: src/eval.c:590 +msgid "INTERNAL ERROR: Bad shift operator in shift_term ()" +msgstr "ERREUR INTERNE: Mauvais opérateur de décalage dans shift_term ()" + +#: src/eval.c:674 +msgid "INTERNAL ERROR: Bad operator in mult_term ()" +msgstr "ERREUR INTERNE: Mauvais opérateur dans mult_term ()" + +#: src/freeze.c:115 +msgid "INTERNAL ERROR: Built-in not found in builtin table!" +msgstr "ERREUR INTERNE: Prédéfini introuvable dans la table des prédéfinis!" + +#: src/freeze.c:128 +msgid "INTERNAL ERROR: Bad token data type in freeze_one_symbol ()" +msgstr "" +"ERREUR INTERNE: Mauvais type de donnée pour lexème dans freeze_one_symbol ()" + +#: src/freeze.c:159 +msgid "Expecting line feed in frozen file" +msgstr "Fin-de-ligne attendue du fichier figé" + +#: src/freeze.c:161 +#, c-format +msgid "Expecting character `%c' in frozen file" +msgstr "Caractère «%c» attendu du fichier figé" + +#: src/freeze.c:218 +msgid "Ill-formated frozen file" +msgstr "Fichier figé difforme" + +#: src/freeze.c:273 src/freeze.c:289 +msgid "Premature end of frozen file" +msgstr "Fin prématurée de fichier figé" + +#: src/freeze.c:323 +#, c-format +msgid "`%s' from frozen file not found in builtin table!" +msgstr "" +"«%s» dans le fichier figé est introuvable dans la table des prédéfinis!" + +#: src/input.c:174 +#, c-format +msgid "Input read from %s" +msgstr "Entrée lue de %s" + +#: src/input.c:231 +msgid "INTERNAL ERROR: Recursive push_string!" +msgstr "ERREUR INTERNE: Utilisation récursive de push_string!" + +#: src/input.c:311 +#, c-format +msgid "Input reverted to %s, line %d" +msgstr "Entrée reprise de %s, ligne %d" + +#: src/input.c:325 +msgid "INTERNAL ERROR: Input stack botch in pop_input ()" +msgstr "ERREUR INTERNE: Pile d'entrée douteuse dans pop_input ()" + +#: src/input.c:364 +msgid "INTERNAL ERROR: Bad call to init_macro_token ()" +msgstr "ERREUR INTERNE: Mauvais appel à init_macro_token ()" + +#: src/input.c:413 +msgid "INTERNAL ERROR: Input stack botch in peek_input ()" +msgstr "ERREUR INTERNE: Pile d'entrée douteuse dans peek_input ()" + +#: src/input.c:470 +msgid "INTERNAL ERROR: Input stack botch in next_char ()" +msgstr "ERREUR INTERNE: Pile d'entrée douteuse dans next_char ()" + +#: src/input.c:550 +msgid "NONE" +msgstr "AUCUN" + +#: src/input.c:777 +msgid "ERROR: EOF in string" +msgstr "ERREUR: Fin-de-fichier dans la chaîne" + +#: src/m4.c:106 +msgid "ERROR: Stack overflow. (Infinite define recursion?)" +msgstr "ERREUR INTERNE: Mauvais type de lexème dans expand_token ()" + +#: src/m4.c:133 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "Pour plus d'information, essayez «%s --help».\\n\n" + +#: src/m4.c:137 +#, c-format +msgid "Usage: %s [OPTION]... [FILE]...\n" +msgstr "Usage: %s [OPTION]... [FICHIER]...\\n\n" + +#: src/m4.c:138 +msgid "" +"Mandatory or optional arguments to long options are mandatory or optional\n" +"for short options too.\n" +"\n" +"Operation modes:\n" +" --help display this help and exit\n" +" --version output version information and exit\n" +" -e, --interactive unbuffer output, ignore interrupts\n" +" -E, --fatal-warnings stop execution after first warning\n" +" -Q, --quiet, --silent suppress some warnings for builtins\n" +" -P, --prefix-builtins force a `m4_' prefix to all builtins\n" +msgstr "" +"Les arguments obligatoires ou optionnels pour la forme longue des\n" +"options sont aussi obligatoires ou optionnels pour les formes courtes\n" +"qui leur correspondent.\n" +"\n" +"Modes d'opération:\n" +" --help fournir ce message d'aide, puis terminer\n" +" --version identifier le programme, puis terminer\n" +" -e, --interactive ne pas tamponner, ignorer les interruptions\n" +" -E, --fatal-warnings terminer l'exécution après le moindre " +"message\n" +" -Q, --quiet, --silent inhiber certains diagnostics prédéfinis\n" +" -P, --prefix-builtins préfixer tous les prédéfinis par «m4_»\n" + +#: src/m4.c:151 +msgid " -W, --word-regexp=REGEXP use REGEXP for macro name syntax\n" +msgstr "" +" -W, --word-regexp=REGEXP utiliser REGEXP pour les noms de macro\n" + +#: src/m4.c:155 +msgid "" +"\n" +"Preprocessor features:\n" +" -I, --include=DIRECTORY search this directory second for includes\n" +" -D, --define=NAME[=VALUE] enter NAME has having VALUE, or empty\n" +" -U, --undefine=NAME delete builtin NAME\n" +" -s, --synclines generate `#line NO \"FILE\"' lines\n" +msgstr "" +"\n" +"Capacités de préprocesseur:\n" +" -I, --include=REPERTOIRE ensuite fouiller ce répertoire d'inclusions\n" +" -D, --define=NOM[=VALEUR] définir NOM comme ayant VALEUR (ou vide)\n" +" -U, --undefine=NOM éliminer le NOM prédéfini\n" +" -s, --synclines engendrer des lignes «#line NNN " +"\\\"FICHIER\\\"»\n" + +#: src/m4.c:163 +msgid "" +"\n" +"Limits control:\n" +" -G, --traditional suppress all GNU extensions\n" +" -H, --hashsize=PRIME set symbol lookup hash table size\n" +" -L, --nesting-limit=NUMBER change artificial nesting limit\n" +msgstr "" +"\n" +"Contrôle des limites:\n" +" -G, --traditional inhiber toutes les extensions GNU\n" +" -H, --hashsize=PREMIER choisir la grandeur de la table de symboles\n" +" -L, --nesting-limit=NOMBRE modifier la limite artificielle " +"d'imbrication\n" + +#: src/m4.c:170 +msgid "" +"\n" +"Frozen state files:\n" +" -F, --freeze-state=FILE produce a frozen state on FILE at end\n" +" -R, --reload-state=FILE reload a frozen state from FILE at start\n" +msgstr "" +"\n" +"Fichiers d'état figé:\n" +" -F, --freeze-state=FICHIER produire un FICHIER figé à la fin\n" +" -R, --reload-state=FICHIER recharger un FICHIER figé au départ\n" + +#: src/m4.c:176 +msgid "" +"\n" +"Debugging:\n" +" -d, --debug=[FLAGS] set debug level (no FLAGS implies `aeq')\n" +" -t, --trace=NAME trace NAME when it will be defined\n" +" -l, --arglength=NUM restrict macro tracing size\n" +" -o, --error-output=FILE redirect debug and trace output\n" +msgstr "" +"\n" +"Mise-au-point:\n" +" -d, --debug=[INDICS] niveau de mise-au-point (implicitement " +"«aeq»)\n" +" -t, --trace=NOM tracer NOM lorsqu'il sera défini\n" +" -l, --arglength=NOMBRE restreindre la grandeur de trace des macros\n" +" -o, --error-output=FICHIER rediriger la sortie de trace et " +"mise-au-point\n" + +#: src/m4.c:184 +msgid "" +"\n" +"FLAGS is any of:\n" +" t trace for all macro calls, not only traceon'ed\n" +" a show actual arguments\n" +" e show expansion\n" +" q quote values as necessary, with a or e flag\n" +" c show before collect, after collect and after call\n" +" x add a unique macro call id, useful with c flag\n" +" f say current input file name\n" +" l say current input line number\n" +" p show results of path searches\n" +" i show changes in input files\n" +" V shorthand for all of the above flags\n" +msgstr "" +"\n" +"INDICS est une combinaison de:\n" +" t tracer tous les appels de macro, pas uniquement les «traceon»\n" +" a afficher les arguments véritables\n" +" e afficher le résultat de l'expension\n" +" q mettre entre guillemets lorsque necessaire, avec indics «a» ou «e»\n" +" c afficher avant et après la collecte, puis après l'appel\n" +" x ajouter une identification unique, utile avec l'indicateur «c»\n" +" f donner le nom courant du fichier d'entrée\n" +" l donner le numéro de la ligne d'entrée\n" +" p afficher les résultats des fouilles de chemin\n" +" i afficher les modifications dans les fichiers d'entrée\n" +" V abbréviation commode pour toutes les options précédentes à la fois\n" + +#: src/m4.c:199 +msgid "" +"\n" +"If no FILE or if FILE is `-', standard input is read.\n" +msgstr "" +"\n" +"Si aucun FICHIER ou si FICHIER vaut «-», lit l'entrée standard.\n" + +#: src/m4.c:355 +#, c-format +msgid "Bad debug flags: `%s'" +msgstr "Mauvais indicateurs de mise-au-point: «%s»" + +#: src/m4.c:434 +msgid "INTERNAL ERROR: Bad code in deferred arguments" +msgstr "ERREUR INTERNE: Mauvais code dans les arguments différés" + +#: src/macro.c:92 +msgid "INTERNAL ERROR: Bad token type in expand_token ()" +msgstr "ERREUR: Débordement de pile. (Récursion hors contrôle sur «define»?)" + +#: src/macro.c:158 +msgid "ERROR: EOF in argument list" +msgstr "ERREUR: Fin-de-fichier dans la liste d'arguments" + +#: src/macro.c:176 +msgid "INTERNAL ERROR: Bad token type in expand_argument ()" +msgstr "" +"ERREUR INTERNE: Mauvais type de données pour lexème dans expand_argument ()" + +#: src/macro.c:253 +msgid "INTERNAL ERROR: Bad symbol type in call_macro ()" +msgstr "ERREUR INTERNE: Mauvais type de symbole dans call_macro ()" + +#: src/macro.c:282 +#, c-format +msgid "ERROR: Recursion limit of %d exceeded, use -L<N> to change it" +msgstr "ERREUR: Limite de récursion %d dépassée, la changer par -L<N>" + +#: src/output.c:198 +msgid "ERROR: Cannot create temporary file for diversion" +msgstr "ERREUR: Incapable de créer un fichier temporaire pour la diversion" + +#: src/output.c:208 +msgid "ERROR: Cannot flush diversion to temporary file" +msgstr "ERREUR: Incapable de vider la diversion sur un fichier temporaire" + +#: src/output.c:292 +msgid "ERROR: Copying inserted file" +msgstr "ERREUR: Pendant la copie du fichier inséré" + +#: src/output.c:473 +msgid "ERROR: Reading inserted file" +msgstr "ERREUR: Pendant la lecture d'un fichier inséré" + +#: src/output.c:572 +msgid "Cannot stat diversion" +msgstr "Incapable d'opérer «stat» pour la diversion" + +#: src/path.c:131 +#, c-format +msgid "Path search for `%s' found `%s'" +msgstr "La fouille du chemin pour «%s» trouve «%s»" + +#. sbrk failed. Assume the RLIMIT_VMEM prevents expansion even +#. if the stack limit has not been reached. +#: src/stackovf.c:168 +msgid "VMEM limit exceeded?\n" +msgstr "Limit VMEM outrepassée?\n" + +#: src/stackovf.c:190 +msgid "" +"Memory bounds violation detected (SIGSEGV). Either a stack overflow\n" +"occurred, or there is a bug in " +msgstr "" +"Les violations de mémoire sont détectées (SIGSEGV). Ou bien la pile a\n" +"débordé, ou bien il y a un problème dans " + +#: src/stackovf.c:195 +msgid ". Check for possible infinite recursion.\n" +msgstr ". Vérifier une récursion hors contrôle.\n" + +#: src/symtab.c:190 +msgid "INTERNAL ERROR: Illegal mode to symbol_lookup ()" +msgstr "ERREUR INTERNE: Mode illégal dans symbol_lookup ()" + +#: src/symtab.c:243 +#, c-format +msgid "Name `%s' is unknown\n" +msgstr "Le nom «%s» est inconnu\n" + +#~ msgid "Bad regular expression: `%s': %s" +#~ msgstr "Mauvaise expression régulière: «%s»: %s" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1997-10-06 07:30+0159\n" +"POT-Creation-Date: 1998-05-25 12:26+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -14,6 +14,222 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" +#: src/builtin.c:272 +#, c-format +msgid "Warning: Too few arguments to built-in `%s'" +msgstr "" + +#: src/builtin.c:278 +#, c-format +msgid "Warning: Excess arguments to built-in `%s' ignored" +msgstr "" + +#: src/builtin.c:298 +#, c-format +msgid "Non-numeric argument to built-in `%s'" +msgstr "" + +#: src/builtin.c:438 +msgid "INTERNAL ERROR: Bad token data type in define_macro ()" +msgstr "" + +#: src/builtin.c:608 src/builtin.c:671 src/builtin.c:1188 src/builtin.c:1212 +#, c-format +msgid "Undefined name %s" +msgstr "" + +#: src/builtin.c:636 +msgid "INTERNAL ERROR: Builtin not found in builtin table!" +msgstr "" + +#: src/builtin.c:644 +msgid "INTERNAL ERROR: Bad token data type in m4_dumpdef ()" +msgstr "" + +#: src/builtin.c:695 +#, c-format +msgid "Undefined macro `%s'" +msgstr "" + +#: src/builtin.c:735 +msgid "INTERNAL ERROR: Bad symbol type in m4_defn ()" +msgstr "" + +#: src/builtin.c:772 +#, c-format +msgid "Cannot open pipe to command `%s'" +msgstr "" + +#: src/builtin.c:811 +#, c-format +msgid "Radix in eval out of range (radix = %d)" +msgstr "" + +#: src/builtin.c:820 +msgid "Negative width to eval" +msgstr "" + +#: src/builtin.c:925 +#, c-format +msgid "Non-numeric argument to %s" +msgstr "" + +#: src/builtin.c:937 +#, c-format +msgid "Cannot undivert %s" +msgstr "" + +#: src/builtin.c:1043 src/freeze.c:207 +#, c-format +msgid "Cannot open %s" +msgstr "" + +#: src/builtin.c:1248 +#, c-format +msgid "Debugmode: bad debug flags: `%s'" +msgstr "" + +#: src/builtin.c:1284 +#, c-format +msgid "Cannot set error file: %s" +msgstr "" + +#: src/builtin.c:1501 +msgid "WARNING: \\0 will disappear, use \\& instead in replacements" +msgstr "" + +#: src/builtin.c:1562 src/builtin.c:1622 src/input.c:637 +#, c-format +msgid "Bad regular expression `%s': %s" +msgstr "" + +#: src/builtin.c:1573 src/builtin.c:1646 +#, c-format +msgid "Error matching regular expression `%s'" +msgstr "" + +#: src/debug.c:379 +msgid "INTERNAL ERROR: Builtin not found in builtin table! (trace_pre ())" +msgstr "" + +#: src/debug.c:387 +msgid "INTERNAL ERROR: Bad token data type (trace_pre ())" +msgstr "" + +#: src/eval.c:277 +#, c-format +msgid "Bad expression in eval (missing right parenthesis): %s" +msgstr "" + +#: src/eval.c:283 +#, c-format +msgid "Bad expression in eval: %s" +msgstr "" + +#: src/eval.c:288 +#, c-format +msgid "Bad expression in eval (bad input): %s" +msgstr "" + +#: src/eval.c:293 +#, c-format +msgid "Bad expression in eval (excess input): %s" +msgstr "" + +#: src/eval.c:298 +#, c-format +msgid "Divide by zero in eval: %s" +msgstr "" + +#: src/eval.c:303 +#, c-format +msgid "Modulo by zero in eval: %s" +msgstr "" + +#: src/eval.c:308 +msgid "INTERNAL ERROR: Bad error code in evaluate ()" +msgstr "" + +#: src/eval.c:547 +msgid "INTERNAL ERROR: Bad comparison operator in cmp_term ()" +msgstr "" + +#: src/eval.c:590 +msgid "INTERNAL ERROR: Bad shift operator in shift_term ()" +msgstr "" + +#: src/eval.c:674 +msgid "INTERNAL ERROR: Bad operator in mult_term ()" +msgstr "" + +#: src/freeze.c:115 +msgid "INTERNAL ERROR: Built-in not found in builtin table!" +msgstr "" + +#: src/freeze.c:128 +msgid "INTERNAL ERROR: Bad token data type in freeze_one_symbol ()" +msgstr "" + +#: src/freeze.c:159 +msgid "Expecting line feed in frozen file" +msgstr "" + +#: src/freeze.c:161 +#, c-format +msgid "Expecting character `%c' in frozen file" +msgstr "" + +#: src/freeze.c:218 +msgid "Ill-formated frozen file" +msgstr "" + +#: src/freeze.c:273 src/freeze.c:289 +msgid "Premature end of frozen file" +msgstr "" + +#: src/freeze.c:323 +#, c-format +msgid "`%s' from frozen file not found in builtin table!" +msgstr "" + +#: src/input.c:174 +#, c-format +msgid "Input read from %s" +msgstr "" + +#: src/input.c:231 +msgid "INTERNAL ERROR: Recursive push_string!" +msgstr "" + +#: src/input.c:311 +#, c-format +msgid "Input reverted to %s, line %d" +msgstr "" + +#: src/input.c:325 +msgid "INTERNAL ERROR: Input stack botch in pop_input ()" +msgstr "" + +#: src/input.c:364 +msgid "INTERNAL ERROR: Bad call to init_macro_token ()" +msgstr "" + +#: src/input.c:413 +msgid "INTERNAL ERROR: Input stack botch in peek_input ()" +msgstr "" + +#: src/input.c:470 +msgid "INTERNAL ERROR: Input stack botch in next_char ()" +msgstr "" + +#: src/input.c:550 +msgid "NONE" +msgstr "" + +#: src/input.c:777 +msgid "ERROR: EOF in string" +msgstr "" + #: src/m4.c:106 msgid "ERROR: Stack overflow. (Infinite define recursion?)" msgstr "" @@ -114,3 +330,74 @@ msgstr "" #: src/m4.c:434 msgid "INTERNAL ERROR: Bad code in deferred arguments" msgstr "" + +#: src/macro.c:92 +msgid "INTERNAL ERROR: Bad token type in expand_token ()" +msgstr "" + +#: src/macro.c:158 +msgid "ERROR: EOF in argument list" +msgstr "" + +#: src/macro.c:176 +msgid "INTERNAL ERROR: Bad token type in expand_argument ()" +msgstr "" + +#: src/macro.c:253 +msgid "INTERNAL ERROR: Bad symbol type in call_macro ()" +msgstr "" + +#: src/macro.c:282 +#, c-format +msgid "ERROR: Recursion limit of %d exceeded, use -L<N> to change it" +msgstr "" + +#: src/output.c:198 +msgid "ERROR: Cannot create temporary file for diversion" +msgstr "" + +#: src/output.c:208 +msgid "ERROR: Cannot flush diversion to temporary file" +msgstr "" + +#: src/output.c:292 +msgid "ERROR: Copying inserted file" +msgstr "" + +#: src/output.c:473 +msgid "ERROR: Reading inserted file" +msgstr "" + +#: src/output.c:572 +msgid "Cannot stat diversion" +msgstr "" + +#: src/path.c:131 +#, c-format +msgid "Path search for `%s' found `%s'" +msgstr "" + +#. sbrk failed. Assume the RLIMIT_VMEM prevents expansion even +#. if the stack limit has not been reached. +#: src/stackovf.c:168 +msgid "VMEM limit exceeded?\n" +msgstr "" + +#: src/stackovf.c:190 +msgid "" +"Memory bounds violation detected (SIGSEGV). Either a stack overflow\n" +"occurred, or there is a bug in " +msgstr "" + +#: src/stackovf.c:195 +msgid ". Check for possible infinite recursion.\n" +msgstr "" + +#: src/symtab.c:190 +msgid "INTERNAL ERROR: Illegal mode to symbol_lookup ()" +msgstr "" + +#: src/symtab.c:243 +#, c-format +msgid "Name `%s' is unknown\n" +msgstr "" diff --git a/po/nl.gmo b/po/nl.gmo Binary files differnew file mode 100644 index 00000000..1452272f --- /dev/null +++ b/po/nl.gmo diff --git a/po/nl.po b/po/nl.po new file mode 100644 index 00000000..fd69a4ff --- /dev/null +++ b/po/nl.po @@ -0,0 +1,464 @@ +# Dutch messages for GNU m4. +# Copyright (C) 1998 Free Software Foundation, Inc. +# Erick Branderhorst <Erick.Branderhorst@asml.nl>, 1998. +# +msgid "" +msgstr "" +"Project-Id-Version: m4 1.4d\n" +"POT-Creation-Date: 1998-05-25 12:26+0200\n" +"PO-Revision-Date: 1998-05-23 09:27+02:00\n" +"Last-Translator: Erick Branderhorst <Erick.Branderhorst@asml.nl>\n" +"Language-Team: dutch <nl@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=\n" +"Content-Transfer-Encoding: 8-bit\n" + +#: src/builtin.c:272 +#, c-format +msgid "Warning: Too few arguments to built-in `%s'" +msgstr "Let op: Te weinig argument voor ingebouwde functie `%s'" + +#: src/builtin.c:278 +#, c-format +msgid "Warning: Excess arguments to built-in `%s' ignored" +msgstr "" +"Let op: Overbodige argumenten voor ingebouwde functie `%s' worden genegeerd" + +#: src/builtin.c:298 +#, c-format +msgid "Non-numeric argument to built-in `%s'" +msgstr "Niet numeriek argument voor ingebouwde functie `%s'" + +#: src/builtin.c:438 +msgid "INTERNAL ERROR: Bad token data type in define_macro ()" +msgstr "INTERNE FOUT: Onjuist teken data type in define_macro ()" + +#: src/builtin.c:608 src/builtin.c:671 src/builtin.c:1188 src/builtin.c:1212 +#, c-format +msgid "Undefined name %s" +msgstr "Ongedefinieerde naam %s" + +#: src/builtin.c:636 +msgid "INTERNAL ERROR: Builtin not found in builtin table!" +msgstr "INTERNE FOUT: Ingebouwde functie niet gevonden in functie tabel!" + +#: src/builtin.c:644 +msgid "INTERNAL ERROR: Bad token data type in m4_dumpdef ()" +msgstr "INTERNE FOUT: Onjuist teken data type in m4_dumpdef ()" + +#: src/builtin.c:695 +#, c-format +msgid "Undefined macro `%s'" +msgstr "Ongedefinieerde macro `%s'" + +#: src/builtin.c:735 +msgid "INTERNAL ERROR: Bad symbol type in m4_defn ()" +msgstr "INTERNE FOUT: Onjuist symbool type in m4_defn ()" + +#: src/builtin.c:772 +#, c-format +msgid "Cannot open pipe to command `%s'" +msgstr "Kan geen pijp openen voor commando `%s'" + +#: src/builtin.c:811 +#, c-format +msgid "Radix in eval out of range (radix = %d)" +msgstr "Radix in evaluatie buiten bereik (radix = %d)" + +#: src/builtin.c:820 +msgid "Negative width to eval" +msgstr "Negatieve breedte te evalueren" + +#: src/builtin.c:925 +#, c-format +msgid "Non-numeric argument to %s" +msgstr "Niet numeriek argument voor %s" + +#: src/builtin.c:937 +#, c-format +msgid "Cannot undivert %s" +msgstr "Cannot undivert %s" + +#: src/builtin.c:1043 src/freeze.c:207 +#, c-format +msgid "Cannot open %s" +msgstr "Kan %s niet openen" + +#: src/builtin.c:1248 +#, c-format +msgid "Debugmode: bad debug flags: `%s'" +msgstr "Debugmode: onjuiste debug vlaggen: `%s'" + +#: src/builtin.c:1284 +#, c-format +msgid "Cannot set error file: %s" +msgstr "Kan fout bestand niet instellen: %s" + +#: src/builtin.c:1501 +msgid "WARNING: \\0 will disappear, use \\& instead in replacements" +msgstr "LET OP: \\0 zal verdwijnen, gebruik hiervoor \\& als vervanging" + +#: src/builtin.c:1562 src/builtin.c:1622 src/input.c:637 +#, c-format +msgid "Bad regular expression `%s': %s" +msgstr "Onjuiste reguliere expressie `%s': %s" + +#: src/builtin.c:1573 src/builtin.c:1646 +#, c-format +msgid "Error matching regular expression `%s'" +msgstr "Fout overeenkomen reguliere expressies `%s'" + +#: src/debug.c:379 +msgid "INTERNAL ERROR: Builtin not found in builtin table! (trace_pre ())" +msgstr "" +"INTERNE FOUT: Ingebouwde functie niet gevonden in functie tabel! (trace_pre " +"())" + +#: src/debug.c:387 +msgid "INTERNAL ERROR: Bad token data type (trace_pre ())" +msgstr "INTERNE FOUT: Onjuiste teken data type (trace_pre ())" + +#: src/eval.c:277 +#, c-format +msgid "Bad expression in eval (missing right parenthesis): %s" +msgstr "Onjuiste expressie in evaluatie (ontbrekend rechter haakje): %s" + +#: src/eval.c:283 +#, c-format +msgid "Bad expression in eval: %s" +msgstr "Onjuist expressie in evaluatie: %s" + +#: src/eval.c:288 +#, c-format +msgid "Bad expression in eval (bad input): %s" +msgstr "Onjuist expressie in evaluatie (onjuiste invoer): %s" + +#: src/eval.c:293 +#, c-format +msgid "Bad expression in eval (excess input): %s" +msgstr "Onjuist expressie in evaluatie (te veel invoer): %s" + +#: src/eval.c:298 +#, c-format +msgid "Divide by zero in eval: %s" +msgstr "Delen door nul in evaluatie: %s" + +#: src/eval.c:303 +#, c-format +msgid "Modulo by zero in eval: %s" +msgstr "Modulo door nul in evaluatie: %s" + +#: src/eval.c:308 +msgid "INTERNAL ERROR: Bad error code in evaluate ()" +msgstr "INTERNE FOUT: Onjuiste fout code in evaluate ()" + +#: src/eval.c:547 +msgid "INTERNAL ERROR: Bad comparison operator in cmp_term ()" +msgstr "INTERNE FOUT: Onjuiste vergelijkings operator in cmp_term ()" + +#: src/eval.c:590 +msgid "INTERNAL ERROR: Bad shift operator in shift_term ()" +msgstr "INTERNE FOUT: Onjuiste schuif operator in shift_term ()" + +#: src/eval.c:674 +msgid "INTERNAL ERROR: Bad operator in mult_term ()" +msgstr "INTERNE FOUT: Onjuiste operator in mult_term ()" + +#: src/freeze.c:115 +msgid "INTERNAL ERROR: Built-in not found in builtin table!" +msgstr "INTERNE FOUT: Ingebouwde functie niet gevonden in functie tabel!" + +#: src/freeze.c:128 +msgid "INTERNAL ERROR: Bad token data type in freeze_one_symbol ()" +msgstr "INTERNE FOUT: Onjuist teken data type in freeze_one_symbol ()" + +#: src/freeze.c:159 +msgid "Expecting line feed in frozen file" +msgstr "Verwacht nieuwe regel in gefixeerd bestand" + +#: src/freeze.c:161 +#, c-format +msgid "Expecting character `%c' in frozen file" +msgstr "Verwacht karakter `%c' in gefixeerd bestand" + +#: src/freeze.c:218 +msgid "Ill-formated frozen file" +msgstr "Slecht geformateerd gefixeerd bestand" + +#: src/freeze.c:273 src/freeze.c:289 +msgid "Premature end of frozen file" +msgstr "Voorbarig einde van gefixeerd bestand" + +#: src/freeze.c:323 +#, c-format +msgid "`%s' from frozen file not found in builtin table!" +msgstr "`%s' van gefixeerd bestand niet gevonden in functie tabel!" + +#: src/input.c:174 +#, c-format +msgid "Input read from %s" +msgstr "Invoer gelezen vanuit %s" + +#: src/input.c:231 +msgid "INTERNAL ERROR: Recursive push_string!" +msgstr "INTERNE FOUT: Recursieve push_string!" + +#: src/input.c:311 +#, c-format +msgid "Input reverted to %s, line %d" +msgstr "Invoer reverted naar %s, lijn %d" + +#: src/input.c:325 +msgid "INTERNAL ERROR: Input stack botch in pop_input ()" +msgstr "INTERNE FOUT: Invoer stapel botch in pop_input ()" + +#: src/input.c:364 +msgid "INTERNAL ERROR: Bad call to init_macro_token ()" +msgstr "INTERNE FOUT: Onjuiste aanroep naar init_macro_token ()" + +#: src/input.c:413 +msgid "INTERNAL ERROR: Input stack botch in peek_input ()" +msgstr "INTERNE FOUT: Invoer stapel botch in peek_input ()" + +#: src/input.c:470 +msgid "INTERNAL ERROR: Input stack botch in next_char ()" +msgstr "INTERNE FOUT: Invoer stapel botch in next_char ()" + +#: src/input.c:550 +msgid "NONE" +msgstr "GEEN" + +#: src/input.c:777 +msgid "ERROR: EOF in string" +msgstr "FOUT: Einde van bestand teken in string" + +#: src/m4.c:106 +msgid "ERROR: Stack overflow. (Infinite define recursion?)" +msgstr "FOUT: Stapel overflow. (Infinite define recursion?)" + +#: src/m4.c:133 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "Probeer `%s --help' voor meer informatie.\n" + +#: src/m4.c:137 +#, c-format +msgid "Usage: %s [OPTION]... [FILE]...\n" +msgstr "Gebruik: %s [OPTIE]... [BESTAND]...\n" + +#: src/m4.c:138 +msgid "" +"Mandatory or optional arguments to long options are mandatory or optional\n" +"for short options too.\n" +"\n" +"Operation modes:\n" +" --help display this help and exit\n" +" --version output version information and exit\n" +" -e, --interactive unbuffer output, ignore interrupts\n" +" -E, --fatal-warnings stop execution after first warning\n" +" -Q, --quiet, --silent suppress some warnings for builtins\n" +" -P, --prefix-builtins force a `m4_' prefix to all builtins\n" +msgstr "" +"Verplichte of optionele argumenten voor lange opties zijn ook verplicht of\n" +"optioneel voor korte opties.\n" +"\n" +"Operatie modi:\n" +" --help toon help tekst en beëindig programma\n" +" --version toon versie informatie en beeindig programma\n" +" -e, --interactive unbuffer output, negeer interrupts\n" +" -E, --fatal-warnings stop uitvoering na eerste waarschuwing\n" +" -Q, --quiet, --silent onderdruk sommige waarschuwingen voor\n" +" ingebouwde functies\n" +" -P, --prefix-builtins forceer een `m4_' voorvoegsel voor alle \n" +" ingebouwde functies\n" + +#: src/m4.c:151 +msgid " -W, --word-regexp=REGEXP use REGEXP for macro name syntax\n" +msgstr " -W, --word-regexp=REGEXP gebruik REGEXP voor macro naam syntax\n" + +#: src/m4.c:155 +msgid "" +"\n" +"Preprocessor features:\n" +" -I, --include=DIRECTORY search this directory second for includes\n" +" -D, --define=NAME[=VALUE] enter NAME has having VALUE, or empty\n" +" -U, --undefine=NAME delete builtin NAME\n" +" -s, --synclines generate `#line NO \"FILE\"' lines\n" +msgstr "" +"\n" +"Voorbewerkings features:\n" +" -I, --include=DIRECTORY zoek in tweede instantie in deze directory " +"voor\n" +" inclusies\n" +" -D, --define=NAME[=VALUE] enter NAME has having VALUE, or empty\n" +" -U, --undefine=NAME verwijder ingebouwde functie NAME\n" +" -s, --synclines genereer `#line NO \"FILE\"' regel\n" + +#: src/m4.c:163 +msgid "" +"\n" +"Limits control:\n" +" -G, --traditional suppress all GNU extensions\n" +" -H, --hashsize=PRIME set symbol lookup hash table size\n" +" -L, --nesting-limit=NUMBER change artificial nesting limit\n" +msgstr "" +"\n" +"Limieten controlle:\n" +" -G, --traditional onderdruk alle GNU uitbreidingen\n" +" -H, --hashsize=PRIME stel symbolen opzoek hash tabel grootte\n" +" -L, --nesting-limit=NUMBER verander kunstmatige nesting limiet\n" + +#: src/m4.c:170 +msgid "" +"\n" +"Frozen state files:\n" +" -F, --freeze-state=FILE produce a frozen state on FILE at end\n" +" -R, --reload-state=FILE reload a frozen state from FILE at start\n" +msgstr "" +"\n" +"Gefixeerd staat bestanden:\n" +" -F, --freeze-state=FILE produceerd een gefixeerd staat van BESTAND\n" +" aan het einde\n" +" -R, --reload-state=FILE herlaad een gefixeerde staat van BESTAND\n" +" aan het begin\n" + +#: src/m4.c:176 +msgid "" +"\n" +"Debugging:\n" +" -d, --debug=[FLAGS] set debug level (no FLAGS implies `aeq')\n" +" -t, --trace=NAME trace NAME when it will be defined\n" +" -l, --arglength=NUM restrict macro tracing size\n" +" -o, --error-output=FILE redirect debug and trace output\n" +msgstr "" +"\n" +"Debugging:\n" +" -d, --debug=[VLAGGEN] stel debug nivo in (geen VLAGGEN \n" +" impliceert `aeq')\n" +" -t, --trace=NAAM traceer NAAM wanneer het wordt gedefinieerd\n" +" -l, --arglength=NUM restrict macro traceer grootte\n" +" -o, --error-output=FILE redirect debug en traceer uitvoer\n" + +#: src/m4.c:184 +msgid "" +"\n" +"FLAGS is any of:\n" +" t trace for all macro calls, not only traceon'ed\n" +" a show actual arguments\n" +" e show expansion\n" +" q quote values as necessary, with a or e flag\n" +" c show before collect, after collect and after call\n" +" x add a unique macro call id, useful with c flag\n" +" f say current input file name\n" +" l say current input line number\n" +" p show results of path searches\n" +" i show changes in input files\n" +" V shorthand for all of the above flags\n" +msgstr "" +"\n" +"FLAGS is any of:\n" +" t trace for all macro calls, not only traceon'ed\n" +" a show actual arguments\n" +" e show expansion\n" +" q quote values as necessary, with a or e flag\n" +" c show before collect, after collect and after call\n" +" x add a unique macro call id, useful with c flag\n" +" f say current input file name\n" +" l say current input line number\n" +" p show results of path searches\n" +" i show changes in input files\n" +" V shorthand for all of the above flags\n" + +#: src/m4.c:199 +msgid "" +"\n" +"If no FILE or if FILE is `-', standard input is read.\n" +msgstr "" +"\n" +"Als geen BESTAND of als BESTAND `-' is, standaard invoer wordt gelezen.\n" + +#: src/m4.c:355 +#, c-format +msgid "Bad debug flags: `%s'" +msgstr "Onjuiste debug vlaggen: `%s'" + +#: src/m4.c:434 +msgid "INTERNAL ERROR: Bad code in deferred arguments" +msgstr "INTERNE FOUT: Onjuiste code in afgeleide argumenten" + +#: src/macro.c:92 +msgid "INTERNAL ERROR: Bad token type in expand_token ()" +msgstr "INTERNE FOUT: Onjuist teken type in expand_token ()" + +#: src/macro.c:158 +msgid "ERROR: EOF in argument list" +msgstr "FOUT: Einde van bestand teken in argumentenlijst" + +#: src/macro.c:176 +msgid "INTERNAL ERROR: Bad token type in expand_argument ()" +msgstr "INTERNE FOUT: Onjuist teken type in expand_argument ()" + +#: src/macro.c:253 +msgid "INTERNAL ERROR: Bad symbol type in call_macro ()" +msgstr "INTERNE FOUT: Onjuist symbool type in call_macro ()" + +#: src/macro.c:282 +#, c-format +msgid "ERROR: Recursion limit of %d exceeded, use -L<N> to change it" +msgstr "" +"FOUT: Recursie limiet of %d overschreden, gebruik -L<N> om dit te wijzigen" + +#: src/output.c:198 +msgid "ERROR: Cannot create temporary file for diversion" +msgstr "FOUT: Kan geen tijdelijk bestand aanmaken voor diversion" + +#: src/output.c:208 +msgid "ERROR: Cannot flush diversion to temporary file" +msgstr "FOUT: Kan diversion niet flushen naar tijdelijk bestand" + +#: src/output.c:292 +msgid "ERROR: Copying inserted file" +msgstr "FOUT: Kopieren ingevoegde bestanden" + +#: src/output.c:473 +msgid "ERROR: Reading inserted file" +msgstr "FOUT: Lezen ingevoegd bestand" + +#: src/output.c:572 +msgid "Cannot stat diversion" +msgstr "Cannot stat diversion" + +#: src/path.c:131 +#, c-format +msgid "Path search for `%s' found `%s'" +msgstr "Zoeken naar `%s' via PATH levert `%s'" + +#. sbrk failed. Assume the RLIMIT_VMEM prevents expansion even +#. if the stack limit has not been reached. +#: src/stackovf.c:168 +msgid "VMEM limit exceeded?\n" +msgstr "VMEM limiet overschreden?\n" + +#: src/stackovf.c:190 +msgid "" +"Memory bounds violation detected (SIGSEGV). Either a stack overflow\n" +"occurred, or there is a bug in " +msgstr "" +"Geheugen bounds violation gedetecteerd (SIGSEGV). Een stack overflow \n" +"is opgetreden, of er is een fout in " + +#: src/stackovf.c:195 +msgid ". Check for possible infinite recursion.\n" +msgstr ". Kontroleer voor mogelijk oneindige recusie.\n" + +#: src/symtab.c:190 +msgid "INTERNAL ERROR: Illegal mode to symbol_lookup ()" +msgstr "INTERNE FOUT: Ongeldige mode voor symbol_lookup ()" + +#: src/symtab.c:243 +#, c-format +msgid "Name `%s' is unknown\n" +msgstr "Naam `%s' is niet bekend\n" + +#~ msgid "Bad regular expression: `%s': %s" +#~ msgstr "Onjuiste reguliere expressie: `%s': %s" diff --git a/src/Makefile.am b/src/Makefile.am index 00e8b063..203d36c7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = ansi2knr -CATALOGS = fr.msg + LIBS = @LIBS@ -STACKOVF = @STACKOVF@ +CFLAGS = -Wall @CFLAGS@ bin_PROGRAMS = m4 diff --git a/src/Makefile.in b/src/Makefile.in index a4d02a6d..7ea5f153 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -57,14 +57,13 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ AWK = @AWK@ +CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ +CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ GENCAT = @GENCAT@ -GLOCALE = @GLOCALE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GT_NO = @GT_NO@ @@ -74,17 +73,14 @@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ -LD = @LD@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -NM = @NM@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ +STACKOVF = @STACKOVF@ U = @U@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -92,9 +88,9 @@ VERSION = @VERSION@ l = @l@ AUTOMAKE_OPTIONS = ansi2knr -CATALOGS = fr.msg + LIBS = @LIBS@ -STACKOVF = @STACKOVF@ +CFLAGS = -Wall @CFLAGS@ bin_PROGRAMS = m4 @@ -119,10 +115,8 @@ freeze$U.o input$U.o macro$U.o output$U.o path$U.o symtab$U.o \ stackovf$U.o m4_DEPENDENCIES = ../lib/libm4.a m4_LDFLAGS = -CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in ansi2knr.1 ansi2knr.c @@ -136,7 +130,7 @@ OBJECTS = $(m4_OBJECTS) all: Makefile $(ANSI2KNR) $(PROGRAMS) .SUFFIXES: -.SUFFIXES: .S .c .lo .o .s +.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 @@ -159,8 +153,8 @@ install-binPROGRAMS: $(bin_PROGRAMS) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ else :; fi; \ done @@ -189,25 +183,6 @@ distclean-compile: maintainer-clean-compile: -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.S.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -maintainer-clean-libtool: - mostlyclean-krextra: clean-krextra: @@ -257,10 +232,8 @@ stackovf_.c: stackovf.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/stackovf.c; then echo $(srcdir)/stackovf.c; else echo stackovf.c; fi` | $(ANSI2KNR) stackovf_.c symtab_.c: symtab.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/symtab.c; then echo $(srcdir)/symtab.c; else echo symtab.c; fi` | $(ANSI2KNR) symtab_.c -builtin_.o builtin_.lo debug_.o debug_.lo eval_.o eval_.lo format_.o \ -format_.lo freeze_.o freeze_.lo input_.o input_.lo m4_.o m4_.lo \ -macro_.o macro_.lo output_.o output_.lo path_.o path_.lo stackovf_.o \ -stackovf_.lo symtab_.o symtab_.lo : $(ANSI2KNR) +builtin_.o debug_.o eval_.o format_.o freeze_.o input_.o m4_.o macro_.o \ +output_.o path_.o stackovf_.o symtab_.o : $(ANSI2KNR) tags: TAGS @@ -348,35 +321,32 @@ maintainer-clean-generic: -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-binPROGRAMS mostlyclean-compile \ - mostlyclean-libtool mostlyclean-krextra mostlyclean-kr \ - mostlyclean-tags mostlyclean-generic + mostlyclean-krextra mostlyclean-kr mostlyclean-tags \ + mostlyclean-generic -clean: clean-binPROGRAMS clean-compile clean-libtool clean-krextra \ - clean-kr clean-tags clean-generic mostlyclean +clean: clean-binPROGRAMS clean-compile clean-krextra clean-kr \ + clean-tags clean-generic mostlyclean -distclean: distclean-binPROGRAMS distclean-compile distclean-libtool \ - distclean-krextra distclean-kr distclean-tags \ - distclean-generic clean +distclean: distclean-binPROGRAMS distclean-compile distclean-krextra \ + distclean-kr distclean-tags distclean-generic clean -rm -f config.status - -rm -f libtool maintainer-clean: maintainer-clean-binPROGRAMS maintainer-clean-compile \ - maintainer-clean-libtool maintainer-clean-krextra \ - maintainer-clean-kr maintainer-clean-tags \ - maintainer-clean-generic distclean + maintainer-clean-krextra maintainer-clean-kr \ + maintainer-clean-tags maintainer-clean-generic \ + distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile mostlyclean-libtool distclean-libtool \ -clean-libtool maintainer-clean-libtool mostlyclean-krextra \ -distclean-krextra clean-krextra maintainer-clean-krextra mostlyclean-kr \ -distclean-kr clean-kr maintainer-clean-kr tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-compile mostlyclean-krextra distclean-krextra \ +clean-krextra maintainer-clean-krextra mostlyclean-kr distclean-kr \ +clean-kr maintainer-clean-kr tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir info dvi installcheck \ +install-exec install-data install uninstall all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff --git a/src/builtin.c b/src/builtin.c index 5a310ed2..d96ca220 100644 --- a/src/builtin.c +++ b/src/builtin.c @@ -1559,7 +1559,7 @@ m4_regexp (struct obstack *obs, int argc, token_data **argv) if (msg != NULL) { M4ERROR ((warning_status, 0, - _("Bad regular expression: `%s': %s"), regexp, msg)); + _("Bad regular expression `%s': %s"), regexp, msg)); return; } @@ -19,7 +19,7 @@ #include "m4.h" #include <getopt.h> -#include <sys/signal.h> +#include <signal.h> /* Operate interactively (-e). */ static int interactive = 0; |