diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rwxr-xr-x | configure | 55 | ||||
| -rw-r--r-- | configure.ac | 26 |
4 files changed, 81 insertions, 19 deletions
@@ -1,3 +1,17 @@ +2009-03-07 Werner Lemberg <wl@gnu.org> + Gunnar Florus <gunnar@florus.no> + + Improve configuration. + + * configure.ac: Read `VERSION' and `REVISION' files to provide + proper values for AC_INIT. + * Makefile.in: Use `@datarootdir@' and `@docdir@' 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 <cjwatson@debian.org> Werner Lemberg <wl@gnu.org> diff --git a/Makefile.in b/Makefile.in index ccc46dcb..e66e66dc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -21,6 +21,8 @@ # SHELL=@SHELL@ +PACKAGE_TARNAME=@PACKAGE_TARNAME@ + srcdir=@srcdir@ top_srcdir=@abs_top_srcdir@ VPATH=@srcdir@ @@ -139,6 +141,7 @@ libprogramdir=$(libdir)/groff # `datasubdir' says where to install platform-independent data files. datadir=@datadir@ +datarootdir=@datarootdir@ dataprogramdir=$(datadir)/groff datasubdir=$(dataprogramdir)/$(version)$(revision) @@ -146,7 +149,7 @@ datasubdir=$(dataprogramdir)/$(version)$(revision) infodir=@infodir@ # `docdir' says where to install documentation files. -docdir=$(datadir)/doc/groff/$(version)$(revision) +docdir=@docdir@ # `exampledir' says where to install example files. exampledir=$(docdir)/examples @@ -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 <bug-groff@gnu.org>. # # 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 @@ MAKEFLAGS= 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='bug-groff@gnu.org' ac_unique_file="src/roff/groff/groff.cpp" # Factoring default headers for most tests. @@ -815,7 +817,7 @@ sharedstatedir='${prefix}/com' 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 @@ if test "$ac_init_help" = "long"; then # 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 @@ Fine tuning of the installation directories: --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 @@ _ACEOF 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 @@ Some influential environment variables: 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 <bug-groff@gnu.org>. _ACEOF ac_status=$? fi @@ -1495,7 +1500,7 @@ fi 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 @@ cat >config.log <<_ACEOF 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 @@ fi + + + + + + + + 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: section \"Present But Cannot Be Compi $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 bug-groff@gnu.org ## +## -------------------------------- ## +_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: section \"Present But Cannot Be Compi $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 bug-groff@gnu.org ## +## -------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 @@ -12738,7 +12761,7 @@ exec 6>&1 # 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 @@ Report bugs to <bug-autoconf@gnu.org>." _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'`\\" diff --git a/configure.ac b/configure.ac index 250585ff..bdf80cf4 100644 --- a/configure.ac +++ b/configure.ac @@ -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, + [bug-groff@gnu.org], + [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]) |