comparison configure.in @ 198:79e324213734 noffle

[svn] * packages/redhat/noffle.spec: Update to version to 1.1-1 and fix up some items causing RPM3 vs RPM4 problems. * configure,configure.in: Bump version to 1.1.1-unstable-develop, and add --with-spooldir and --with-configfile options (idea due to Mirko Liss).
author bears
date Tue, 06 Nov 2001 21:22:19 +0000
parents fed1334d766b
children b4f1731a6470
comparison
equal deleted inserted replaced
197:24d4cd032da5 198:79e324213734
5 AC_INIT(src/noffle.c) 5 AC_INIT(src/noffle.c)
6 6
7 AC_PREREQ(2.13) 7 AC_PREREQ(2.13)
8 8
9 PACKAGE=noffle 9 PACKAGE=noffle
10 VERSION=1.1-unstable-develop 10 VERSION=1.1.1-unstable-develop
11 11
12 AM_CONFIG_HEADER(config.h) 12 AM_CONFIG_HEADER(config.h)
13 AM_INIT_AUTOMAKE($PACKAGE,$VERSION) 13 AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
14 14
15 dnl AM_MAINTAINER_MODE 15 dnl AM_MAINTAINER_MODE
139 fi 139 fi
140 140
141 141
142 # [ This is adapted from mutt. ] 142 # [ This is adapted from mutt. ]
143 AC_ARG_WITH(docdir, 143 AC_ARG_WITH(docdir,
144 [ --with-docdir=PATH specify where to put the documentation 144 [ --with-docdir=PATH specify where to put the documentation],
145 ], [noffle_cv_docdir=$withval], 145 [noffle_cv_docdir=$withval],
146 [ AC_CACHE_CHECK(where to put the documentation, noffle_cv_docdir, 146 [ AC_CACHE_CHECK(where to put the documentation, noffle_cv_docdir,
147 [if test x$prefix = xNONE; then 147 [if test x$prefix = xNONE; then
148 noffle_cv_prefix=$ac_default_prefix 148 noffle_cv_prefix=$ac_default_prefix
149 else 149 else
150 noffle_cv_prefix=$prefix 150 noffle_cv_prefix=$prefix
151 fi 151 fi
152 noffle_cv_docdir=$noffle_cv_prefix/doc/noffle 152 noffle_cv_docdir=$noffle_cv_prefix/doc/noffle
153 ]) 153 ])
154 ]) 154 ])
155 155
156 156 dnl check where to put the spooldir - taken from leafnode 2.0beta.
157 dnl --------------------------------------------------------------------------- 157 AC_MSG_CHECKING(spooldir)
158 dnl Unquoted defines and substituted variables. 158 AC_ARG_WITH(spooldir,
159 dnl --------------------------------------------------------------------------- 159 [ --with-spooldir=PATH news spool directory (/var/spool/noffle)],
160 160 if echo "$withval" | egrep >/dev/null -v '^/' ; then
161 CONFIGFILE="/etc/noffle.conf" 161 AC_MSG_ERROR(you must give an absolute path)
162 fi
163 withval=`echo "$withval" | sed 'sx/*$xx;'`
164 ,
165 withval="/var/spool/$PACKAGE"
166 )
167 SPOOLDIR=$withval
168 AC_MSG_RESULT($SPOOLDIR)
169 AC_DEFINE_UNQUOTED(SPOOLDIR, "$SPOOLDIR")
170 AC_SUBST(SPOOLDIR)
171
172 dnl check where to put the config file
173 AC_MSG_CHECKING(configfile)
174 AC_ARG_WITH(configfile,
175 [ --with-configfile=PATH configuration file (/etc/noffle.conf)],
176 if echo "$withval" | egrep >/dev/null -v '^/' ; then
177 AC_MSG_ERROR(you must give an absolute path)
178 fi
179 withval=`echo "$withval" | sed 'sx/*$xx;'`
180 ,
181 withval="/etc/$PACKAGE.conf"
182 )
183 CONFIGFILE=$withval
184 AC_MSG_RESULT($CONFIGFILE)
162 AC_DEFINE_UNQUOTED(CONFIGFILE,"$CONFIGFILE") 185 AC_DEFINE_UNQUOTED(CONFIGFILE,"$CONFIGFILE")
163 AC_SUBST(CONFIGFILE) 186 AC_SUBST(CONFIGFILE)
187
188 dnl ---------------------------------------------------------------------------
189 dnl Unquoted defines and substituted variables.
190 dnl ---------------------------------------------------------------------------
164 191
165 dnl NOFFLE_EXPAND_DIR(VARNAME, DIR) 192 dnl NOFFLE_EXPAND_DIR(VARNAME, DIR)
166 dnl expands occurrences of ${prefix} and ${exec_prefix} in the given DIR, 193 dnl expands occurrences of ${prefix} and ${exec_prefix} in the given DIR,
167 dnl and assigns the resulting string to VARNAME 194 dnl and assigns the resulting string to VARNAME
168 dnl example: NOFFLE_EXPAND_DIR(LOCALEDIR, "$datadir/locale") 195 dnl example: NOFFLE_EXPAND_DIR(LOCALEDIR, "$datadir/locale")
176 test "x$exec_prefix" = xNONE && exec_prefix="${prefix}" 203 test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
177 eval echo \""[$]$1"\" 204 eval echo \""[$]$1"\"
178 )` 205 )`
179 ]) 206 ])
180 207
181 SPOOLDIR="/var/spool/$PACKAGE"
182 AC_DEFINE_UNQUOTED(SPOOLDIR, "$SPOOLDIR")
183 AC_SUBST(SPOOLDIR)
184
185 DOCDIR=$noffle_cv_docdir 208 DOCDIR=$noffle_cv_docdir
186 AC_SUBST(DOCDIR) 209 AC_SUBST(DOCDIR)
187 210
188 AC_DEFINE_UNQUOTED(SENDMAILPROG, "$SENDMAILPROG") 211 AC_DEFINE_UNQUOTED(SENDMAILPROG, "$SENDMAILPROG")
189 212