[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Groff-commit] groff ./ChangeLog ./Makefile.in ./aclocal.m4 ./...
|
From: |
Werner LEMBERG |
|
Subject: |
[Groff-commit] groff ./ChangeLog ./Makefile.in ./aclocal.m4 ./... |
|
Date: |
Thu, 27 Oct 2005 17:30:31 -0400 |
CVSROOT: /cvsroot/groff
Module name: groff
Branch:
Changes by: Werner LEMBERG <address@hidden> 05/10/27 21:30:30
Modified files:
. : ChangeLog Makefile.in aclocal.m4 configure
configure.ac
doc : Makefile.in Makefile.sub
Log message:
* aclocal.m4 (GROFF_MAKEINFO): New function for checking whether
makeinfo 4.8 or newer is available.
* configure.ac: Call GROFF_MAKEINFO.
* configure: Regenerated.
* Makefile.in (MAKEINFO): Use autoconf variable.
(MDEFINES): Add MAKEINFO.
* doc/Makefile.in (MAKEINFO): Use autoconf variable.
* doc/Makefile.sub (MAKEINFO): Remove.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.855&tr2=1.856&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/Makefile.in.diff?tr1=1.86&tr2=1.87&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/aclocal.m4.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/configure.diff?tr1=1.67&tr2=1.68&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/configure.ac.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/doc/Makefile.in.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/doc/Makefile.sub.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.855 groff/ChangeLog:1.856
--- groff/ChangeLog:1.855 Wed Oct 26 20:54:30 2005
+++ groff/ChangeLog Thu Oct 27 21:30:29 2005
@@ -1,3 +1,16 @@
+2005-10-27 Werner LEMBERG <address@hidden>
+
+ * aclocal.m4 (GROFF_MAKEINFO): New function for checking whether
+ makeinfo 4.8 or newer is available.
+ * configure.ac: Call GROFF_MAKEINFO.
+ * configure: Regenerated.
+
+ * Makefile.in (MAKEINFO): Use autoconf variable.
+ (MDEFINES): Add MAKEINFO.
+
+ * doc/Makefile.in (MAKEINFO): Use autoconf variable.
+ * doc/Makefile.sub (MAKEINFO): Remove.
+
2005-10-26 Werner LEMBERG <address@hidden>
* REVISION: Set to 3.
Index: groff/Makefile.in
diff -u groff/Makefile.in:1.86 groff/Makefile.in:1.87
--- groff/Makefile.in:1.86 Wed Aug 3 07:19:00 2005
+++ groff/Makefile.in Thu Oct 27 21:30:30 2005
@@ -357,6 +357,8 @@
address@hidden@
YACCFLAGS=-v
address@hidden@
+
address@hidden@
address@hidden@
# a simple heuristic assumption
@@ -420,6 +422,7 @@
"LIBM=$(LIBM)" \
"LIBOBJS=$(LIBOBJS)" \
"LIBS=$(LIBS)" \
+ "MAKEINFO=$(MAKEINFO)" \
"MAKEOVERRIDES=$(MAKEOVERRIDES)" \
"OBJEXT=$(OBJEXT)" \
"OTHERDEVDIRS=$(OTHERDEVDIRS)" \
Index: groff/aclocal.m4
diff -u groff/aclocal.m4:1.48 groff/aclocal.m4:1.49
--- groff/aclocal.m4:1.48 Thu May 26 21:01:56 2005
+++ groff/aclocal.m4 Thu Oct 27 21:30:30 2005
@@ -57,6 +57,57 @@
AC_DEFUN([GROFF_PROG_YACC],
[AC_CHECK_PROGS([YACC], [byacc 'bison -y'], [yacc])])
+# We need makeinfo 4.8 or newer.
+
+AC_DEFUN([GROFF_MAKEINFO],
+ [missing=
+ AC_CHECK_PROG([MAKEINFO], [makeinfo], [makeinfo])
+ if test -z "$MAKEINFO"; then
+ missing="\`makeinfo' is missing."
+ else
+ # We need an additional level of quoting to make sed's regexps work.
+ [makeinfo_version=`$MAKEINFO --version 2>&1 \
+ | sed '1 {s/^.* \([^ ]\+\)$/\1/;q}'`]
+ # Consider only the first two numbers in version number string.
+ [makeinfo_version_major=`echo $makeinfo_version \
+ | sed 's/^\([0-9]*\).*$/\1/'`]
+ if test -z "$makeinfo_version_major"; then
+ makeinfo_version_major=0
+ makeinfo_version_minor=0
+ else
+ [makeinfo_version_minor=`echo $makeinfo_version \
+ | sed 's/^[^.]\+\(.*\)$/\1/'`]
+ # No minor version number at all?
+ if test -z "$makeinfo_version_minor"; then
+ makeinfo_version_minor=0
+ else
+ [makeinfo_version_minor=`echo $makeinfo_version_minor \
+ | sed 's/\.\([0-9]*\).*$/\1/'`]
+ if test -z "$makeinfo_version_minor"; then
+ makeinfo_version_minor=0
+ fi
+ fi
+ fi
+ fi
+ makeinfo_version_numeric=`expr $makeinfo_version_major '*' 1000 \
+ '+' $makeinfo_version_minor`
+ if test $makeinfo_version_numeric -lt 4008; then
+ missing="\`makeinfo' is too old."
+ fi
+
+ if test -n "$missing"; then
+ if test ! -f doc/groff \
+ || test ${srcdir}/doc/groff.texinfo -nt doc/groff; then
+ AC_MSG_ERROR($missing
+[Get the `texinfo' package version 4.8 or newer.])
+ else
+ AC_MSG_WARN($missing
+[Get the `texinfo' package version 4.8 or newer if you want to convert
+`groff.texinfo' into a PDF or HTML document.])
+ fi
+ fi
+ AC_SUBST([MAKEINFO])])
+
# The following programs are needed for grohtml.
AC_DEFUN([GROFF_HTML_PROGRAMS],
Index: groff/configure
diff -u groff/configure:1.67 groff/configure:1.68
--- groff/configure:1.67 Wed May 18 07:03:06 2005
+++ groff/configure Thu Oct 27 21:30:30 2005
@@ -540,7 +540,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS
LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX TTYDEVDIRS
OTHERDEVDIRS CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XDEVDIRS XPROGDIRS
XLIBDIRS appresdir LPR LP LPQ PSPRINT DVIPRINT PERLPATH YACC RANLIB
ac_ct_RANLIB INSTALL_INFO INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S
SH_SCRIPT_SED_CMD GREP EGREP LIBC LIBM LIBOBJS BROKEN_SPOOLER_FLAGS PAGE g
sys_tmac_prefix tmac_wrap GROFF_PATH_SEPARATOR ALT_GHOSTSCRIPT_PROGS
GHOSTSCRIPT ac_ct_GHOSTSCRIPT pnmcut pnmcrop pnmtopng psselect pnmtops
make_html make_install_html ALT_AWK_PROGS AWK ac_ct_AWK make_pdfdoc
make_install_pdfdoc pnmtops_nosetpage LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS
LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX TTYDEVDIRS
OTHERDEVDIRS CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XDEVDIRS XPROGDIRS
XLIBDIRS appresdir LPR LP LPQ PSPRINT DVIPRINT PERLPATH YACC MAKEINFO RANLIB
ac_ct_RANLIB INSTALL_INFO INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S
SH_SCRIPT_SED_CMD GREP EGREP LIBC LIBM LIBOBJS BROKEN_SPOOLER_FLAGS PAGE g
sys_tmac_prefix tmac_wrap GROFF_PATH_SEPARATOR ALT_GHOSTSCRIPT_PROGS
GHOSTSCRIPT ac_ct_GHOSTSCRIPT pnmcut pnmcrop pnmtopng psselect pnmtops
make_html make_install_html ALT_AWK_PROGS AWK ac_ct_AWK make_pdfdoc
make_install_pdfdoc pnmtops_nosetpage LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -5464,6 +5464,93 @@
done
test -n "$YACC" || YACC="yacc"
+missing=
+ # Extract the first word of "makeinfo", so it can be a program name with
args.
+set dummy makeinfo; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_MAKEINFO+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$MAKEINFO"; then
+ ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_MAKEINFO="makeinfo"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+MAKEINFO=$ac_cv_prog_MAKEINFO
+if test -n "$MAKEINFO"; then
+ echo "$as_me:$LINENO: result: $MAKEINFO" >&5
+echo "${ECHO_T}$MAKEINFO" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ if test -z "$MAKEINFO"; then
+ missing="\`makeinfo' is missing."
+ else
+ # We need an additional level of quoting to make sed's regexps work.
+ makeinfo_version=`$MAKEINFO --version 2>&1 \
+ | sed '1 {s/^.* \([^ ]\+\)$/\1/;q}'`
+ # Consider only the first two numbers in version number string.
+ makeinfo_version_major=`echo $makeinfo_version \
+ | sed 's/^\([0-9]*\).*$/\1/'`
+ if test -z "$makeinfo_version_major"; then
+ makeinfo_version_major=0
+ makeinfo_version_minor=0
+ else
+ makeinfo_version_minor=`echo $makeinfo_version \
+ | sed 's/^[^.]\+\(.*\)$/\1/'`
+ # No minor version number at all?
+ if test -z "$makeinfo_version_minor"; then
+ makeinfo_version_minor=0
+ else
+ makeinfo_version_minor=`echo $makeinfo_version_minor \
+ | sed 's/\.\([0-9]*\).*$/\1/'`
+ if test -z "$makeinfo_version_minor"; then
+ makeinfo_version_minor=0
+ fi
+ fi
+ fi
+ fi
+ makeinfo_version_numeric=`expr $makeinfo_version_major '*' 1000 \
+ '+' $makeinfo_version_minor`
+ if test $makeinfo_version_numeric -lt 4008; then
+ missing="\`makeinfo' is too old."
+ fi
+
+ if test -n "$missing"; then
+ if test ! -f doc/groff \
+ || test ${srcdir}/doc/groff.texinfo -nt doc/groff; then
+ { { echo "$as_me:$LINENO: error: $missing
+Get the \`texinfo' package version 4.8 or newer." >&5
+echo "$as_me: error: $missing
+Get the \`texinfo' package version 4.8 or newer." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ { echo "$as_me:$LINENO: WARNING: $missing
+Get the \`texinfo' package version 4.8 or newer if you want to convert
+\`groff.texinfo' into a PDF or HTML document." >&5
+echo "$as_me: WARNING: $missing
+Get the \`texinfo' package version 4.8 or newer if you want to convert
+\`groff.texinfo' into a PDF or HTML document." >&2;}
+ fi
+ fi
+
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a
program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -11093,6 +11180,7 @@
s,@DVIPRINT@,$DVIPRINT,;t t
s,@PERLPATH@,$PERLPATH,;t t
s,@YACC@,$YACC,;t t
+s,@MAKEINFO@,$MAKEINFO,;t t
s,@RANLIB@,$RANLIB,;t t
s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
s,@INSTALL_INFO@,$INSTALL_INFO,;t t
Index: groff/configure.ac
diff -u groff/configure.ac:1.35 groff/configure.ac:1.36
--- groff/configure.ac:1.35 Thu May 26 21:01:56 2005
+++ groff/configure.ac Thu Oct 27 21:30:30 2005
@@ -38,6 +38,7 @@
GROFF_PRINT
AC_PATH_PROG([PERLPATH], [perl], [/usr/bin/perl])
GROFF_PROG_YACC
+GROFF_MAKEINFO
AC_PROG_RANLIB
GROFF_INSTALL_SH
GROFF_INSTALL_INFO
Index: groff/doc/Makefile.in
diff -u groff/doc/Makefile.in:1.17 groff/doc/Makefile.in:1.18
--- groff/doc/Makefile.in:1.17 Sun Aug 7 09:09:44 2005
+++ groff/doc/Makefile.in Thu Oct 27 21:30:30 2005
@@ -41,8 +41,7 @@
# info files are distributed with the groff package, so makeinfo is
# usually not needed (however, to build from CVS you NEED it!)
-# FIXME: Add autoconf test to check whether makeinfo exists.
-MAKEINFO=makeinfo
address@hidden@
# Users who want to print out the groff manual are expected to have
# a working TeX installation.
Index: groff/doc/Makefile.sub
diff -u groff/doc/Makefile.sub:1.21 groff/doc/Makefile.sub:1.22
--- groff/doc/Makefile.sub:1.21 Sun Aug 7 09:09:44 2005
+++ groff/doc/Makefile.sub Thu Oct 27 21:30:30 2005
@@ -21,11 +21,6 @@
GROFFBIN=$(top_builddir)/src/roff/groff/groff
GROFF_BIN_PATH=`echo $(groff_bin_dirs) | sed -e 's| *|$(SH_SEP)|g'`
-# info files are distributed with the groff package, so makeinfo is
-# usually not needed (however, to build from CVS you NEED it!)
-# FIXME: Add autoconf test to check whether makeinfo exists.
-MAKEINFO=makeinfo
-
groff_bin_dirs=\
$(top_builddir)/src/roff/groff \
$(top_builddir)/src/roff/troff \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Groff-commit] groff ./ChangeLog ./Makefile.in ./aclocal.m4 ./...,
Werner LEMBERG <=