[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Groff-commit] groff ChangeLog Makefile.in configure configure.ac
From: |
Werner LEMBERG |
Subject: |
[Groff-commit] groff ChangeLog Makefile.in configure configure.ac |
Date: |
Sat, 07 Mar 2009 07:33:50 +0000 |
CVSROOT: /cvsroot/groff
Module name: groff
Changes by: Werner LEMBERG <wl> 09/03/07 07:33:50
Modified files:
. : ChangeLog Makefile.in configure configure.ac
Log message:
Improve configuration.
* configure.ac: Read `VERSION' and `REVISION' files to provide
proper values for AC_INIT.
* Makefile.in: Use address@hidden@' and address@hidden@' so that
configure's `--datarootdir' and `--docdir' options are honoured.
Documentation is now by default installed into something like
`/usr/local/share/doc/groff-1.20.1'.
* configure: Regenerated.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1197&r2=1.1198
http://cvs.savannah.gnu.org/viewcvs/groff/Makefile.in?cvsroot=groff&r1=1.108&r2=1.109
http://cvs.savannah.gnu.org/viewcvs/groff/configure?cvsroot=groff&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/groff/configure.ac?cvsroot=groff&r1=1.45&r2=1.46
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1197
retrieving revision 1.1198
diff -u -b -r1.1197 -r1.1198
--- ChangeLog 21 Feb 2009 07:40:21 -0000 1.1197
+++ ChangeLog 7 Mar 2009 07:33:49 -0000 1.1198
@@ -1,3 +1,17 @@
+2009-03-07 Werner Lemberg <address@hidden>
+ Gunnar Florus <address@hidden>
+
+ Improve configuration.
+
+ * configure.ac: Read `VERSION' and `REVISION' files to provide
+ proper values for AC_INIT.
+ * Makefile.in: Use address@hidden@' and address@hidden@' so that
+ configure's `--datarootdir' and `--docdir' options are honoured.
+ Documentation is now by default installed into something like
+ `/usr/local/share/doc/groff-1.20.1'.
+
+ * configure: Regenerated.
+
2009-02-21 Colin Watson <address@hidden>
Werner Lemberg <address@hidden>
Index: Makefile.in
===================================================================
RCS file: /cvsroot/groff/groff/Makefile.in,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- Makefile.in 6 Jan 2009 07:42:36 -0000 1.108
+++ Makefile.in 7 Mar 2009 07:33:49 -0000 1.109
@@ -21,6 +21,8 @@
#
address@hidden@
address@hidden@
+
address@hidden@
address@hidden@
address@hidden@
@@ -139,6 +141,7 @@
# `datasubdir' says where to install platform-independent data files.
address@hidden@
address@hidden@
dataprogramdir=$(datadir)/groff
datasubdir=$(dataprogramdir)/$(version)$(revision)
@@ -146,7 +149,7 @@
address@hidden@
# `docdir' says where to install documentation files.
-docdir=$(datadir)/doc/groff/$(version)$(revision)
address@hidden@
# `exampledir' says where to install example files.
exampledir=$(docdir)/examples
Index: configure
===================================================================
RCS file: /cvsroot/groff/groff/configure,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- configure 6 Jan 2009 07:42:36 -0000 1.82
+++ configure 7 Mar 2009 07:33:49 -0000 1.83
@@ -1,6 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63.
+# Generated by GNU Autoconf 2.63 for groff 1.20.1.
+#
+# Report bugs to <address@hidden>.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -592,11 +594,11 @@
SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+PACKAGE_NAME='groff'
+PACKAGE_TARNAME='groff-1.20.1'
+PACKAGE_VERSION='1.20.1'
+PACKAGE_STRING='groff 1.20.1'
+PACKAGE_BUGREPORT='address@hidden'
ac_unique_file="src/roff/groff/groff.cpp"
# Factoring default headers for most tests.
@@ -815,7 +817,7 @@
localstatedir='${prefix}/var'
includedir='${prefix}/include'
oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
infodir='${datarootdir}/info'
htmldir='${docdir}'
dvidir='${docdir}'
@@ -1327,7 +1329,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures groff 1.20.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1375,7 +1377,7 @@
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/groff-1.20.1]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@@ -1395,7 +1397,9 @@
fi
if test -n "$ac_init_help"; then
-
+ case $ac_init_help in
+ short | recursive ) echo "Configuration of groff 1.20.1:";;
+ esac
cat <<\_ACEOF
Optional Features:
@@ -1433,6 +1437,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
+Report bugs to <address@hidden>.
_ACEOF
ac_status=$?
fi
@@ -1495,7 +1500,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-configure
+groff configure 1.20.1
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1509,7 +1514,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by $as_me, which was
+It was created by groff $as_me 1.20.1, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -1862,6 +1867,14 @@
+
+
+
+
+
+
+
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6486,7 +6499,12 @@
$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's
result" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the
compiler will take precedence" >&5
$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take
precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## -------------------------------- ##
+## Report this to address@hidden ##
+## -------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -10360,7 +10378,12 @@
$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's
result" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the
compiler will take precedence" >&5
$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take
precedence" >&2;}
-
+ ( cat <<\_ASBOX
+## -------------------------------- ##
+## Report this to address@hidden ##
+## -------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -12738,7 +12761,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by $as_me, which was
+This file was extended by groff $as_me 1.20.1, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12797,7 +12820,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-config.status
+groff config.status 1.20.1
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
Index: configure.ac
===================================================================
RCS file: /cvsroot/groff/groff/configure.ac,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- configure.ac 6 Jan 2009 07:42:36 -0000 1.45
+++ configure.ac 7 Mar 2009 07:33:49 -0000 1.46
@@ -20,8 +20,30 @@
#
# Process this file with autoconf to produce a configure script.
-AC_INIT
-AC_PREREQ(2.59)
+dnl Use `VERSION' and `REVISION' files to get version.
+m4_define([GROFF_VERSION_DATA], m4_include([VERSION]))
+m4_define([GROFF_REVISION_DATA], m4_include([REVISION]))
+
+dnl Strip off newline characters.
+m4_define([GROFF_VERSION],
+ m4_substr(GROFF_VERSION_DATA,
+ [0], m4_decr(m4_len(GROFF_VERSION_DATA))))
+m4_define([GROFF_REVISION],
+ m4_substr(GROFF_REVISION_DATA,
+ [0], m4_decr(m4_len(GROFF_REVISION_DATA))))
+
+dnl Don't use revision if it is zero.
+m4_define([GROFF_VERSION_STRING],
+ m4_if(m4_eval(GROFF_REVISION[ > 0]),
+ [1],
+ GROFF_VERSION[.]GROFF_REVISION,
+ GROFF_VERSION))
+
+AC_INIT([groff],
+ GROFF_VERSION_STRING,
+ address@hidden,
+ [groff-]GROFF_VERSION_STRING)
+AC_PREREQ([2.59])
AC_CONFIG_HEADERS([src/include/config.h:src/include/config.hin])
AC_CONFIG_SRCDIR([src/roff/groff/groff.cpp])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Groff-commit] groff ChangeLog Makefile.in configure configure.ac,
Werner LEMBERG <=