summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac43
1 files changed, 32 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index 01d5b4a..be489b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,15 +16,15 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
AC_PREREQ(2.59)
AC_REVISION($Revision$)
-AC_INIT(ellinika, 1.0, gray@gnu.org)
+AC_INIT(ellinika, 1.1, gray@gnu.org)
AC_CONFIG_SRCDIR(cgi-bin/dict.cgi.in)
-AC_CONFIG_AUX_DIR([scripts])
+AC_CONFIG_AUX_DIR([build-aux])
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE(no-exeext)
## * Checks for programs.
M4='`cd $(top_srcdir); pwd`/scripts/missing --run m4'
@@ -58,38 +58,59 @@ case `guile -c "(display (member \"$GUILE_SITE\" %load-path))(newline)"` in
esac
AC_SUBST(GUILE_COMMENT)
AC_SUBST(GUILE_SITE)
-CGIDIR='$(prefix)/cgi-bin'
-AC_ARG_WITH(cgi-bin,
- AC_HELP_STRING([--with-cgi-bin=DIR],
- [install CGI programs in DIR [[PREFIX/cgi-bin]]]),
- [CGIDIR=$withval])
-AC_SUBST(CGIDIR)
-
HTMLDIR='$(prefix)/ellinika'
AC_ARG_WITH(html-dir,
AC_HELP_STRING([--with-html-dir=DIR],
[install HTML pages in DIR [[PREFIX/ellinika]]]),
[HTMLDIR=$withval])
AC_SUBST(HTMLDIR)
+AC_SUBST(APACHE_IFACE,CGI)
+AC_ARG_ENABLE(cgi,
+ AC_HELP_STRING([--enable-cgi],
+ [Use CGI or SCM]),
+ [case $enableval in
+ yes) APACHE_IFACE=CGI;;
+ no) APACHE_IFACE=SCM;;
+ *) AC_MSG_ERROR([unknown argument to --enable-cgi])
+ esac])
+
+AC_SUBST(SCRIPT_SUFFIX)
+AC_SUBST(SCRIPT_DIR)
+AC_SUBST(CGIDIR)
+if test $APACHE_IFACE = "CGI"; then
+ SCRIPT_SUFFIX=cgi
+ SCRIPT_DIR=/cgi-name
+ CGIDIR='$(prefix)/cgi-bin'
+else
+ SCRIPT_SUFFIX=scm
+ SCRIPT_DIR=
+ CGIDIR='$(HTMLDIR)'
+fi
+
+AC_ARG_WITH(cgi-bin,
+ AC_HELP_STRING([--with-cgi-bin=DIR],
+ [install CGI programs in DIR [[PREFIX/cgi-bin]]]),
+ [CGIDIR=$withval])
+
AC_SUBST(BASE_HREF)
AC_SUBST(TARGET_DIR)
dnl Check for Emacs site-lisp directory
AM_PATH_LISPDIR
if test "$EMACS" != "no"; then
lisp_LISP='$(LISPSRC)'
fi
AC_SUBST(lisp_LISP)
-AC_SUBST(AUTOGENERATED)
-AUTOGENERATED=";;;; This file is generated automatically. Please do not edit."
+AC_SUBST(AUTOGENERATED,
+ ";;;; This file is generated automatically. Please do not edit. -*- buffer-read-only: t -*- vi: set ro:")
AC_CONFIG_FILES(Makefile
cgi-bin/Makefile
elisp/Makefile
data/Makefile
scm/Makefile

Return to:

Send suggestions and report system problems to the System administrator.