Commit 3cce25d0 authored by salaun's avatar salaun
Browse files

[G. Paressant] Changes: New sympa.spec and build procedure for Mandrake.

New parameters are available in configure : with-etcdir, with-nlsdir, with-scriptdir,
with-sampledir,with-spooldir,with-docdir. Documentation is now installed.


git-svn-id: https://subversion.renater.fr/sympa/trunk@1700 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent 90bd7b41
......@@ -58,15 +58,14 @@ PIDDIR = @PIDDIR@
## files needs to be installed in /etc/smrsh.
MAILERPROGDIR = @BINDIR@
#RPMTOPDIR = `rpm --eval %_topdir`
RPMTOPDIR = /usr/src/redhat
RPMTOPDIR = `rpm --eval %_topdir`
#RPMTOPDIR = /usr/src/redhat
MANDIR = @MANDIR@
## SYSV init scripts directory
INITDIR = @INITDIR@
## no more used ##
BINDIR = @BINDIR@
SBINDIR = @SBINDIR@
......@@ -75,8 +74,18 @@ CGIDIR = @CGIDIR@
LIBDIR = @LIBDIR@
NLSDIR = @NLSDIR@
DOCDIR = @DOCDIR@
ETCDIR = @ETCDIR@
SCRIPTDIR = @SCRIPTDIR@
SAMPLEDIR = @SAMPLEDIR@
## Spools directory
SPOOLDIR = $(DIR)/spool
SPOOLDIR = @SPOOLDIR@
## Directory for installing WWSympa
WWSBINDIR = $(BINDIR)
......@@ -149,7 +158,6 @@ CFLAGS = -g
CONFIG = $(CONFDIR)/sympa.conf
WWSCONFIG = $(CONFDIR)/wwsympa.conf
ETCBINDIR = @DATADIR@
NLSDIR = $(DIR)/nls
#ifeq ($(shell uname), Linux)
# LOG_SOCKET_TYPE="inet"
......@@ -220,7 +228,7 @@ clean:
$(MAKE) PERL='${PERL}' clean) || exit 1; \
done;
install: importantchanges installsrc installnls installwws installman installscript installsample installdir installconfig
install: importantchanges installsrc installnls installwws installman installscript installsample installdir installconfig installdoc
importantchanges:
@( PERL=$(PERL); export PERL; \
......@@ -245,6 +253,15 @@ installsrc:
SSLCERTDIR='${SSLCERTDIR}' \
USER='${USER}' GROUP='${GROUP}' newinstall) || exit 1;
installdoc:
@(cd doc && echo "make install in doc..." && \
$(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' \
DIR='${DIR}' DOCDIR='${DOCDIR}' ETCBINDIR='${ETCBINDIR}' \
DESTDIR='${DESTDIR}' CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' \
SENDMAIL_ALIASES='${SENDMAIL_ALIASES}' \
VIRTUAL_ALIASES='${VIRTUAL_ALIASES}' \
USER='${USER}' GROUP='${GROUP}' install) || exit 1;
installnls:
@(cd nls && echo "making in nls..." && \
$(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' \
......@@ -265,7 +282,8 @@ installwws:
installsample:
@(cd src/etc/sample && echo "making in src/etc/sample..." && \
$(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' LOG_SOCKET_TYPE='${LOG_SOCKET_TYPE}' \
DESTDIR='${DESTDIR}' DIR='${DIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' \
DESTDIR='${DESTDIR}' DIR='${DIR}' SAMPLEDIR='${SAMPLEDIR}' \
BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' \
EXPL_DIR='${EXPL_DIR}' WWSBINDIR='${WWSBINDIR}' HOST='${HOST}' \
CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' ETCBINDIR='${ETCBINDIR}' MAILERPROGDIR='${MAILERPROGDIR}' \
COOKIE='${COOKIE}' OPENSSL='@OPENSSL@' SSLCERTDIR='${SSLCERTDIR}' \
......@@ -301,7 +319,9 @@ installman:
installscript:
@(cd src/etc/script && echo "making in src/etc/script..." && \
$(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' \
DIR='${DIR}' DESTDIR='${DESTDIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' WWSBINDIR='${WWSBINDIR}' HOST='${HOST}' \
DIR='${DIR}' DESTDIR='${DESTDIR}' SCRIPTDIR='${SCRIPTDIR}' \
BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' \
WWSBINDIR='${WWSBINDIR}' HOST='${HOST}' \
CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' ETCBINDIR='${ETCBINDIR}' \
MAILERPROGDIR='${MAILERPROGDIR}' PIDDIR='${PIDDIR}' \
COOKIE='${COOKIE}' INITDIR='${INITDIR}' \
......@@ -320,7 +340,7 @@ installdir:
chmod 755 $(DESTDIR)$(DIR); \
chown $(USER) $(DESTDIR)$(DIR); \
chgrp $(GROUP) $(DESTDIR)$(DIR); \
for dir in $(EXPL_DIR) $(DIR)/etc $(DIR)/sample ; do \
for dir in $(EXPL_DIR) $(CONFDIR) $(SAMPLEDIR) ; do \
if [ ! -d $(DESTDIR)$$dir ] ; then \
echo "Creating $(DESTDIR)$$dir"; \
mkdir -p $(DESTDIR)$$dir; \
......@@ -331,13 +351,13 @@ installdir:
fi
@if [ ! -f $(DESTDIR)$(CONFDIR)/sympa.conf ] ; then \
echo "First installation : installing conf directories..."; \
for dir in etc/create_list_templates etc/templates etc/wws_templates etc/scenari \
etc/task_models etc/general_task_models; do \
if [ ! -d $(DESTDIR)$(DIR)/$$dir ] ; then \
echo "Creating $(DESTDIR)$(DIR)/$$dir"; \
mkdir -p $(DESTDIR)$(DIR)/$$dir; \
chown $(USER) $(DESTDIR)$(DIR)/$$dir; \
chgrp $(GROUP) $(DESTDIR)$(DIR)/$$dir; \
for dir in create_list_templates templates wws_templates scenari \
task_models general_task_models; do \
if [ ! -d $(DESTDIR)$(ETCDIR)/$$dir ] ; then \
echo "Creating $(DESTDIR)$(ETCDIR)/$$dir"; \
mkdir -p $(DESTDIR)$(ETCDIR)/$$dir; \
chown $(USER) $(DESTDIR)$(ETCDIR)/$$dir; \
chgrp $(GROUP) $(DESTDIR)$(ETCDIR)/$$dir; \
fi \
done \
fi
......@@ -365,8 +385,10 @@ installconfig:
$(PERL) -I $(DESTDIR)$(LIBDIR) $(DESTDIR)$(SBINDIR)/sympa_wizard.pl -c $$cfile; \
chown $(USER) $(DESTDIR)$(CONFDIR)/$$cfile; \
chgrp $(GROUP) $(DESTDIR)$(CONFDIR)/$$cfile; \
if [ $(DESTDIR) = '' ]; then \
INITCONF='1'; \
fi \
fi \
done; \
if [ "$$INITCONF" ] ; then \
echo "###############################################"; \
......@@ -410,9 +432,23 @@ build_mdk_rpm: clean
ZIPEXT='bz2'; export ZIPEXT; \
APPGROUP='System/Servers'; export APPGROUP; \
HOMEDIR='/var/lib/sympa'; export HOMEDIR; \
PIDDIR='/var/run/sympa'; export PIDDIR; \
ICONSDIR='/var/www/icons'; export ICONSDIR; \
VERSION=$(SYMPA_VERSION); export VERSION; \
CONFDIR=$(CONFDIR); export CONFDIR; \
SENDMAIL_ALIASES=$(SENDMAIL_ALIASES); export SENDMAIL_ALIASES; \
MAILERPROGDIR=$(MAILERPROGDIR); export MAILERPROGDIR; \
PIDDIR=$(PIDDIR); export PIDDIR; \
SPOOLDIR=$(SPOOLDIR); export SPOOLDIR; \
ICONSDIR=$(ICONSDIR); export ICONSDIR; \
BINDIR=$(BINDIR); export BINDIR; \
SBINDIR=$(SBINDIR); export SBINDIR; \
DATADIR=$(DATADIR); export DATADIR; \
EXPLDIR=$(EXPLDIR); export EXPLDIR; \
LIBDIR=$(LIBDIR); export LIBDIR; \
CGIDIR=$(CGIDIR); export CGIDIR; \
NLSDIR=$(NLSDIR); export NLSDIR; \
SCRIPTDIR=$(SCRIPTDIR); export SCRIPTDIR; \
SAMPLEDIR=$(SAMPLEDIR); export SAMPLEDIR; \
ETCDIR=$(ETCDIR); export ETCDIR; \
$(PERL) ../../../subst.pl sympa.spec \
)
@( \
......
......@@ -119,8 +119,8 @@ PIDDIR = @PIDDIR@
MAILERPROGDIR = @BINDIR@
#RPMTOPDIR = `rpm --eval %_topdir`
RPMTOPDIR = /usr/src/redhat
RPMTOPDIR = `rpm --eval %_topdir`
#RPMTOPDIR = /usr/src/redhat
MANDIR = @MANDIR@
......@@ -134,7 +134,17 @@ CGIDIR = @CGIDIR@
LIBDIR = @LIBDIR@
SPOOLDIR = $(DIR)/spool
NLSDIR = @NLSDIR@
DOCDIR = @DOCDIR@
ETCDIR = @ETCDIR@
SCRIPTDIR = @SCRIPTDIR@
SAMPLEDIR = @SAMPLEDIR@
SPOOLDIR = @SPOOLDIR@
WWSBINDIR = $(BINDIR)
......@@ -184,7 +194,6 @@ CFLAGS = -g
CONFIG = $(CONFDIR)/sympa.conf
WWSCONFIG = $(CONFDIR)/wwsympa.conf
ETCBINDIR = @DATADIR@
NLSDIR = $(DIR)/nls
#ifeq ($(shell uname), Linux)
# LOG_SOCKET_TYPE="inet"
......@@ -405,7 +414,7 @@ clean:
$(MAKE) PERL='${PERL}' clean) || exit 1; \
done;
install: importantchanges installsrc installnls installwws installman installscript installsample installdir installconfig
install: importantchanges installsrc installnls installwws installman installscript installsample installdir installconfig installdoc
importantchanges:
@( PERL=$(PERL); export PERL; \
......@@ -429,6 +438,15 @@ installsrc:
SSLCERTDIR='${SSLCERTDIR}' \
USER='${USER}' GROUP='${GROUP}' newinstall) || exit 1;
installdoc:
@(cd doc && echo "make install in doc..." && \
$(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' \
DIR='${DIR}' DOCDIR='${DOCDIR}' ETCBINDIR='${ETCBINDIR}' \
DESTDIR='${DESTDIR}' CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' \
SENDMAIL_ALIASES='${SENDMAIL_ALIASES}' \
VIRTUAL_ALIASES='${VIRTUAL_ALIASES}' \
USER='${USER}' GROUP='${GROUP}' install) || exit 1;
installnls:
@(cd nls && echo "making in nls..." && \
$(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' \
......@@ -449,7 +467,8 @@ installwws:
installsample:
@(cd src/etc/sample && echo "making in src/etc/sample..." && \
$(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' LOG_SOCKET_TYPE='${LOG_SOCKET_TYPE}' \
DESTDIR='${DESTDIR}' DIR='${DIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' \
DESTDIR='${DESTDIR}' DIR='${DIR}' SAMPLEDIR='${SAMPLEDIR}' \
BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' \
EXPL_DIR='${EXPL_DIR}' WWSBINDIR='${WWSBINDIR}' HOST='${HOST}' \
CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' ETCBINDIR='${ETCBINDIR}' MAILERPROGDIR='${MAILERPROGDIR}' \
COOKIE='${COOKIE}' OPENSSL='@OPENSSL@' SSLCERTDIR='${SSLCERTDIR}' \
......@@ -484,7 +503,9 @@ installman:
installscript:
@(cd src/etc/script && echo "making in src/etc/script..." && \
$(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' \
DIR='${DIR}' DESTDIR='${DESTDIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' WWSBINDIR='${WWSBINDIR}' HOST='${HOST}' \
DIR='${DIR}' DESTDIR='${DESTDIR}' SCRIPTDIR='${SCRIPTDIR}' \
BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' LIBDIR='${LIBDIR}' \
WWSBINDIR='${WWSBINDIR}' HOST='${HOST}' \
CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' ETCBINDIR='${ETCBINDIR}' \
MAILERPROGDIR='${MAILERPROGDIR}' PIDDIR='${PIDDIR}' \
COOKIE='${COOKIE}' INITDIR='${INITDIR}' \
......@@ -502,7 +523,7 @@ installdir:
chmod 755 $(DESTDIR)$(DIR); \
chown $(USER) $(DESTDIR)$(DIR); \
chgrp $(GROUP) $(DESTDIR)$(DIR); \
for dir in $(EXPL_DIR) $(DIR)/etc $(DIR)/sample ; do \
for dir in $(EXPL_DIR) $(CONFDIR) $(SAMPLEDIR) ; do \
if [ ! -d $(DESTDIR)$$dir ] ; then \
echo "Creating $(DESTDIR)$$dir"; \
mkdir -p $(DESTDIR)$$dir; \
......@@ -513,13 +534,13 @@ installdir:
fi
@if [ ! -f $(DESTDIR)$(CONFDIR)/sympa.conf ] ; then \
echo "First installation : installing conf directories..."; \
for dir in etc/create_list_templates etc/templates etc/wws_templates etc/scenari \
etc/task_models etc/general_task_models; do \
if [ ! -d $(DESTDIR)$(DIR)/$$dir ] ; then \
echo "Creating $(DESTDIR)$(DIR)/$$dir"; \
mkdir -p $(DESTDIR)$(DIR)/$$dir; \
chown $(USER) $(DESTDIR)$(DIR)/$$dir; \
chgrp $(GROUP) $(DESTDIR)$(DIR)/$$dir; \
for dir in create_list_templates templates wws_templates scenari \
task_models general_task_models; do \
if [ ! -d $(DESTDIR)$(ETCDIR)/$$dir ] ; then \
echo "Creating $(DESTDIR)$(ETCDIR)/$$dir"; \
mkdir -p $(DESTDIR)$(ETCDIR)/$$dir; \
chown $(USER) $(DESTDIR)$(ETCDIR)/$$dir; \
chgrp $(GROUP) $(DESTDIR)$(ETCDIR)/$$dir; \
fi \
done \
fi
......@@ -547,8 +568,10 @@ installconfig:
$(PERL) -I $(DESTDIR)$(LIBDIR) $(DESTDIR)$(SBINDIR)/sympa_wizard.pl -c $$cfile; \
chown $(USER) $(DESTDIR)$(CONFDIR)/$$cfile; \
chgrp $(GROUP) $(DESTDIR)$(CONFDIR)/$$cfile; \
if [ $(DESTDIR) = '' ]; then \
INITCONF='1'; \
fi \
fi \
done; \
if [ "$$INITCONF" ] ; then \
echo "###############################################"; \
......@@ -592,9 +615,23 @@ build_mdk_rpm: clean
ZIPEXT='bz2'; export ZIPEXT; \
APPGROUP='System/Servers'; export APPGROUP; \
HOMEDIR='/var/lib/sympa'; export HOMEDIR; \
PIDDIR='/var/run/sympa'; export PIDDIR; \
ICONSDIR='/var/www/icons'; export ICONSDIR; \
VERSION=$(SYMPA_VERSION); export VERSION; \
CONFDIR=$(CONFDIR); export CONFDIR; \
SENDMAIL_ALIASES=$(SENDMAIL_ALIASES); export SENDMAIL_ALIASES; \
MAILERPROGDIR=$(MAILERPROGDIR); export MAILERPROGDIR; \
PIDDIR=$(PIDDIR); export PIDDIR; \
SPOOLDIR=$(SPOOLDIR); export SPOOLDIR; \
ICONSDIR=$(ICONSDIR); export ICONSDIR; \
BINDIR=$(BINDIR); export BINDIR; \
SBINDIR=$(SBINDIR); export SBINDIR; \
DATADIR=$(DATADIR); export DATADIR; \
EXPLDIR=$(EXPLDIR); export EXPLDIR; \
LIBDIR=$(LIBDIR); export LIBDIR; \
CGIDIR=$(CGIDIR); export CGIDIR; \
NLSDIR=$(NLSDIR); export NLSDIR; \
SCRIPTDIR=$(SCRIPTDIR); export SCRIPTDIR; \
SAMPLEDIR=$(SAMPLEDIR); export SAMPLEDIR; \
ETCDIR=$(ETCDIR); export ETCDIR; \
$(PERL) ../../../subst.pl sympa.spec \
)
@( \
......
......@@ -36,6 +36,18 @@ ac_help="$ac_help
--with-initdir=DIR install System V init script in DIR (default /etc/rc.d/init.d)"
ac_help="$ac_help
--with-piddir=DIR create .pid files in DIR (default ${prefix})"
ac_help="$ac_help
--with-etcdir=DIR Config directories populated by the user are in DIR (default ${prefix}/etc)"
ac_help="$ac_help
--with-nlsdir=DIR create language files in DIR (default ${prefix}/nls)"
ac_help="$ac_help
--with-docdir=DIR create documentation files in DIR (default ${prefix}/doc)"
ac_help="$ac_help
--with-scriptdir=DIR create script files in DIR (default ${prefix}/bin)"
ac_help="$ac_help
--with-sampledir=DIR create sample files in DIR (default ${prefix}/sample)"
ac_help="$ac_help
--with-spooldir=DIR spool directory is DIR (default ${prefix}/spool)"
ac_help="$ac_help
--with-perl=FULLPATH set full path to Perl interpreter (default /usr/bin/perl)"
ac_help="$ac_help
......@@ -626,7 +638,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
echo "configure:630: checking host system type" >&5
echo "configure:642: checking host system type" >&5
host_alias=$host
case "$host_alias" in
......@@ -647,7 +659,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$host" 1>&6
echo $ac_n "checking target system type""... $ac_c" 1>&6
echo "configure:651: checking target system type" >&5
echo "configure:663: checking target system type" >&5
target_alias=$target
case "$target_alias" in
......@@ -665,7 +677,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$target" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6
echo "configure:669: checking build system type" >&5
echo "configure:681: checking build system type" >&5
build_alias=$build
case "$build_alias" in
......@@ -694,7 +706,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
echo "configure:698: checking host system type" >&5
echo "configure:710: checking host system type" >&5
host_alias=$host
case "$host_alias" in
......@@ -726,7 +738,7 @@ echo "$ac_t""$host" 1>&6
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:730: checking for a BSD compatible install" >&5
echo "configure:742: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
......@@ -779,7 +791,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
echo "configure:783: checking whether build environment is sane" >&5
echo "configure:795: checking whether build environment is sane" >&5
# Just in case
sleep 1
echo timestamp > conftestfile
......@@ -836,7 +848,7 @@ test "$program_suffix" != NONE &&
test "$program_transform_name" = "" && program_transform_name="s,x,x,"
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
echo "configure:840: checking whether ${MAKE-make} sets \${MAKE}" >&5
echo "configure:852: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
......@@ -875,7 +887,7 @@ fi
missing_dir=`cd $ac_aux_dir && pwd`
echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
echo "configure:879: checking for working aclocal" >&5
echo "configure:891: checking for working aclocal" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
......@@ -888,7 +900,7 @@ else
fi
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
echo "configure:892: checking for working autoconf" >&5
echo "configure:904: checking for working autoconf" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
......@@ -901,7 +913,7 @@ else
fi
echo $ac_n "checking for working automake""... $ac_c" 1>&6
echo "configure:905: checking for working automake" >&5
echo "configure:917: checking for working automake" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
......@@ -914,7 +926,7 @@ else
fi
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
echo "configure:918: checking for working autoheader" >&5
echo "configure:930: checking for working autoheader" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
......@@ -927,7 +939,7 @@ else
fi
echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
echo "configure:931: checking for working makeinfo" >&5
echo "configure:943: checking for working makeinfo" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
......@@ -1067,10 +1079,71 @@ fi
## directory for Config directories populated by the user
ETCDIR='${prefix}/etc'
# Check whether --with-etcdir or --without-etcdir was given.
if test "${with_etcdir+set}" = set; then
withval="$with_etcdir"
ETCDIR="$withval"
fi
## directory for language files
NLSDIR='${prefix}/nls'
# Check whether --with-nlsdir or --without-nlsdir was given.
if test "${with_nlsdir+set}" = set; then
withval="$with_nlsdir"
NLSDIR="$withval"
fi
## directory for Documentation files
DOCDIR='${prefix}/doc'
# Check whether --with-docdir or --without-docdir was given.
if test "${with_docdir+set}" = set; then
withval="$with_docdir"
DOCDIR="$withval"
fi
## directory for script files
SCRIPTDIR='${prefix}/bin'
# Check whether --with-scriptdir or --without-scriptdir was given.
if test "${with_scriptdir+set}" = set; then
withval="$with_scriptdir"
SCRIPTDIR="$withval"
fi
## directory for sample files
SAMPLEDIR='${prefix}/sample'
# Check whether --with-sampledir or --without-sampledir was given.
if test "${with_sampledir+set}" = set; then
withval="$with_sampledir"
SAMPLEDIR="$withval"
fi
## directory for sample files
SPOOLDIR='${prefix}/spool'
# Check whether --with-spooldir or --without-spooldir was given.
if test "${with_spooldir+set}" = set; then
withval="$with_spooldir"
SPOOLDIR="$withval"
fi
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1074: checking for $ac_word" >&5
echo "configure:1147: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -1100,7 +1173,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1104: checking for $ac_word" >&5
echo "configure:1177: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -1151,7 +1224,7 @@ fi
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1155: checking for $ac_word" >&5
echo "configure:1228: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -1183,7 +1256,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
echo "configure:1187: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
echo "configure:1260: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
......@@ -1194,12 +1267,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
#line 1198 "configure"
#line 1271 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
if { (eval echo configure:1203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:1276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
......@@ -1225,12 +1298,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
echo "configure:1229: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "configure:1302: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
echo "configure:1234: checking whether we are using GNU C" >&5
echo "configure:1307: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -1239,7 +1312,7 @@ else
yes;
#endif
EOF
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
......@@ -1258,7 +1331,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
echo "configure:1262: checking whether ${CC-cc} accepts -g" >&5
echo "configure:1335: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -1290,7 +1363,7 @@ else
fi
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
echo "configure:1294: checking whether ${MAKE-make} sets \${MAKE}" >&5
echo "configure:1367: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
......@@ -1317,7 +1390,7 @@ else
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
echo "configure:1321: checking how to run the C preprocessor" >&5
echo "configure:1394: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
......@@ -1332,13 +1405,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
#line 1336 "configure"
#line 1409 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
......@@ -1349,13 +1422,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
#line 1353 "configure"
#line 1426 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1432: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
......@@ -1366,13 +1439,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
#line 1370 "configure"
#line 1443 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"