diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2003-11-24 14:52:58 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2003-11-24 14:52:58 +0000 |
| commit | b3d72d3ec52e4477eb9837c2b0d701e47fa55ef5 (patch) | |
| tree | 701f8fde77a73206be2c4e6c9d140e54f0fda253 /configure.in | |
| parent | c52204b2246c5effd9f5638206bf022585dd782f (diff) | |
| download | postgresql-b3d72d3ec52e4477eb9837c2b0d701e47fa55ef5.tar.gz | |
Use --with-docdir to choose installation location of documentation; put
back --infodir, which several automatic build environments expect to exist.
Add --without-docdir to prevent installation of documentation, which is
helpful for things like RPM that have their own method of installing
documentation.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/configure.in b/configure.in index 940524b62c..2b64964894 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -dnl $Header: /cvsroot/pgsql/configure.in,v 1.303 2003/11/24 13:16:22 petere Exp $ +dnl $Header: /cvsroot/pgsql/configure.in,v 1.304 2003/11/24 14:52:57 petere Exp $ dnl dnl Developers, please strive to achieve this order: dnl @@ -16,15 +16,8 @@ dnl dnl Read the Autoconf manual for details. dnl m4_pattern_forbid(^PGAC_)dnl to catch undefined macros -dnl -dnl The GNU folks apparently haven't heard that some people don't use -dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir". -m4_define([info], [doc]) -m4_define([infodir], [docdir]) + AC_INIT([PostgreSQL], [7.5devel], [pgsql-bugs@postgresql.org]) -m4_undefine([infodir]) -m4_undefine([info]) -AC_SUBST(docdir) AC_PREREQ(2.53) AC_COPYRIGHT([Copyright 2003 PostgreSQL Global Development Group]) @@ -126,6 +119,17 @@ AC_SUBST(TAS) ## Command line options ## +# +# Installation directory for documentation +# +PGAC_ARG(with, docdir, [ --with-docdir=DIR install the documentation in DIR [[PREFIX/doc]] + --without-docdir do not install the documentation], + [AC_MSG_ERROR([option --with-docdir requires an argument])], + [docdir=], + [docdir=$withval], + [docdir='${prefix}/doc']) +AC_SUBST(docdir) + # # Add non-standard directories to the include path @@ -490,7 +494,7 @@ AC_SUBST(krb_srvtab) # Kerberos configuration parameters # PGAC_ARG_REQ(with, krb-srvnam, - [ --with-krb-srvnam=NAME name of the service principal in Kerberos [postgres]], + [ --with-krb-srvnam=NAME name of the service principal in Kerberos [[postgres]]], [], [with_krb_srvnam="postgres"]) AC_DEFINE_UNQUOTED([PG_KRB_SRVNAM], ["$with_krb_srvnam"], |