diff options
author | wlemb <wlemb> | 2000-08-18 09:03:26 +0000 |
---|---|---|
committer | wlemb <wlemb> | 2000-08-18 09:03:26 +0000 |
commit | 6dbb54b34a48441490100ccf7ec7d961bb3d616d (patch) | |
tree | 0acc3bb49c84c3bfd1b236081596956c6fde6fbf | |
parent | f62b6a3d7de0573a935d85cf63a3d94895106382 (diff) | |
download | groff-6dbb54b34a48441490100ccf7ec7d961bb3d616d.tar.gz |
* configure.in: Don't provide an empty value for SH_SCRIPT_SED_CMD
since some non-GNU sed programs can't handle null regexps.
* configure, src/preproc/eqn/Makefile.sub,
src/roff/grog/Makefile.sub, src/roff/nroff/Makefile.sub: Updated.
* src/devices/grolbp/lbp.cc: Add an AIX workaround for an autoconf
bug (string.h and strings.h are both needed according to latest
POSIX standard).
-rw-r--r-- | ChangeLog | 11 | ||||
-rwxr-xr-x | configure | 2 | ||||
-rwxr-xr-x | configure.in | 4 | ||||
-rw-r--r-- | src/devices/grolbp/lbp.cc | 2 | ||||
-rw-r--r-- | src/preproc/eqn/Makefile.sub | 2 | ||||
-rw-r--r-- | src/roff/grog/Makefile.sub | 2 | ||||
-rw-r--r-- | src/roff/nroff/Makefile.sub | 2 |
7 files changed, 20 insertions, 5 deletions
@@ -1,3 +1,14 @@ +2000-08-18 Werner LEMBERG <wl@gnu.org> + + * configure.in: Don't provide an empty value for SH_SCRIPT_SED_CMD + since some non-GNU sed programs can't handle null regexps. + * configure, src/preproc/eqn/Makefile.sub, + src/roff/grog/Makefile.sub, src/roff/nroff/Makefile.sub: Updated. + + * src/devices/grolbp/lbp.cc: Add an AIX workaround for an autoconf + bug (string.h and strings.h are both needed according to latest + POSIX standard). + 2000-08-08 Werner LEMBERG <wl@gnu.org> * tmac/tmac.a4: Will now work with ms macros also; -ma4 should be @@ -1389,7 +1389,7 @@ chmod +x conftest.sh if echo ./conftest.sh | (csh >/dev/null 2>&1) >/dev/null 2>&1; then echo "$ac_t""yes" 1>&6; SH_SCRIPT_SED_CMD='1s/.*/:/' else - echo "$ac_t""no" 1>&6; SH_SCRIPT_SED_CMD='' + echo "$ac_t""no" 1>&6; SH_SCRIPT_SED_CMD='1s/a/a/' fi rm -f conftest.sh diff --git a/configure.in b/configure.in index 081df0e6..ef9e31d3 100755 --- a/configure.in +++ b/configure.in @@ -15,7 +15,9 @@ AC_PROG_RANLIB GROFF_INSTALL_SH AC_PROG_INSTALL AC_PROG_LN_S -GROFF_CSH_HACK(SH_SCRIPT_SED_CMD='1s/.*/:/', SH_SCRIPT_SED_CMD='') +dnl use a dummy sustitution if no csh hack is necessary to avoid errors +dnl with non-GNU sed programs +GROFF_CSH_HACK(SH_SCRIPT_SED_CMD='1s/.*/:/', SH_SCRIPT_SED_CMD='1s/a/a/') AC_SUBST(SH_SCRIPT_SED_CMD) dnl checks for headers AC_CHECK_HEADERS(stdlib.h unistd.h dirent.h limits.h sys/dir.h \ diff --git a/src/devices/grolbp/lbp.cc b/src/devices/grolbp/lbp.cc index fe06e1c4..61f053e5 100644 --- a/src/devices/grolbp/lbp.cc +++ b/src/devices/grolbp/lbp.cc @@ -33,6 +33,7 @@ TODO #include "nonposix.h" +#ifndef _AIX #ifdef HAVE_STRNCASECMP #ifdef NEED_DECLARATION_STRNCASECMP extern "C" { @@ -41,6 +42,7 @@ extern "C" { } #endif /* NEED_DECLARATION_STRNCASECMP */ #endif /* HAVE_STRNCASECMP */ +#endif /* !_AIX */ static short int papersize = -1, // papersize orientation = -1 , // orientation diff --git a/src/preproc/eqn/Makefile.sub b/src/preproc/eqn/Makefile.sub index 7b43a6e5..5d1934a1 100644 --- a/src/preproc/eqn/Makefile.sub +++ b/src/preproc/eqn/Makefile.sub @@ -46,7 +46,7 @@ all: neqn neqn: neqn.sh -rm -f neqn - sed -e 's/@g@/$(g)/g' -e "$(SH_SCRIPT_SED_CMD)" $(srcdir)/neqn.sh >neqn + sed -e 's/@g@/$(g)/g' -e $(SH_SCRIPT_SED_CMD) $(srcdir)/neqn.sh >neqn chmod +x neqn install_data: neqn diff --git a/src/roff/grog/Makefile.sub b/src/roff/grog/Makefile.sub index 35b2b3ca..de3dd4b8 100644 --- a/src/roff/grog/Makefile.sub +++ b/src/roff/grog/Makefile.sub @@ -11,7 +11,7 @@ grog: grog.pl grog.sh else \ rm -f $@; \ sed -e 's/@g@/$(g)/g' \ - -e "$(SH_SCRIPT_SED_CMD)" $(srcdir)/grog.sh >$@; \ + -e $(SH_SCRIPT_SED_CMD) $(srcdir)/grog.sh >$@; \ fi chmod +x $@ diff --git a/src/roff/nroff/Makefile.sub b/src/roff/nroff/Makefile.sub index fa6bc4dc..47a1878b 100644 --- a/src/roff/nroff/Makefile.sub +++ b/src/roff/nroff/Makefile.sub @@ -6,7 +6,7 @@ all: nroff nroff: nroff.sh rm -f $@ - sed "$(SH_SCRIPT_SED_CMD)" $(srcdir)/nroff.sh >$@ + sed -e $(SH_SCRIPT_SED_CMD) $(srcdir)/nroff.sh >$@ chmod +x $@ install_data: nroff |