summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2006-10-08 21:40:32 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2006-10-08 21:40:32 (GMT)
commitc84f3061d0be6dd349fee9222002c69a84b5f66e (patch) (unidiff)
tree519fcb8ec1d1976f9400d088feb78ce6384a5b29
parent109cf4d84378cbfce6b157ac854383be2a9ea866 (diff)
downloadellinika-c84f3061d0be6dd349fee9222002c69a84b5f66e.tar.gz
ellinika-c84f3061d0be6dd349fee9222002c69a84b5f66e.tar.bz2
Use build-aux as an aux dir.
New option --enable-cgi git-svn-id: file:///home/puszcza/svnroot/ellinika/trunk@461 941c8c0f-9102-463b-b60b-cd22ce0e6858
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
@@ -19,9 +19,9 @@
19AC_PREREQ(2.59) 19AC_PREREQ(2.59)
20 20
21AC_REVISION($Revision$) 21AC_REVISION($Revision$)
22AC_INIT(ellinika, 1.0, gray@gnu.org) 22AC_INIT(ellinika, 1.1, gray@gnu.org)
23AC_CONFIG_SRCDIR(cgi-bin/dict.cgi.in) 23AC_CONFIG_SRCDIR(cgi-bin/dict.cgi.in)
24AC_CONFIG_AUX_DIR([scripts]) 24AC_CONFIG_AUX_DIR([build-aux])
25AC_CANONICAL_SYSTEM 25AC_CANONICAL_SYSTEM
26AM_INIT_AUTOMAKE(no-exeext) 26AM_INIT_AUTOMAKE(no-exeext)
27 27
@@ -61,13 +61,6 @@ AC_SUBST(GUILE_COMMENT)
61AC_SUBST(GUILE_SITE) 61AC_SUBST(GUILE_SITE)
62 62
63 63
64CGIDIR='$(prefix)/cgi-bin'
65AC_ARG_WITH(cgi-bin,
66 AC_HELP_STRING([--with-cgi-bin=DIR],
67 [install CGI programs in DIR [[PREFIX/cgi-bin]]]),
68 [CGIDIR=$withval])
69AC_SUBST(CGIDIR)
70
71HTMLDIR='$(prefix)/ellinika' 64HTMLDIR='$(prefix)/ellinika'
72AC_ARG_WITH(html-dir, 65AC_ARG_WITH(html-dir,
73 AC_HELP_STRING([--with-html-dir=DIR], 66 AC_HELP_STRING([--with-html-dir=DIR],
@@ -75,6 +68,34 @@ AC_ARG_WITH(html-dir,
75 [HTMLDIR=$withval]) 68 [HTMLDIR=$withval])
76AC_SUBST(HTMLDIR) 69AC_SUBST(HTMLDIR)
77 70
71AC_SUBST(APACHE_IFACE,CGI)
72AC_ARG_ENABLE(cgi,
73 AC_HELP_STRING([--enable-cgi],
74 [Use CGI or SCM]),
75 [case $enableval in
76 yes) APACHE_IFACE=CGI;;
77 no) APACHE_IFACE=SCM;;
78 *) AC_MSG_ERROR([unknown argument to --enable-cgi])
79 esac])
80
81AC_SUBST(SCRIPT_SUFFIX)
82 AC_SUBST(SCRIPT_DIR)
83AC_SUBST(CGIDIR)
84if test $APACHE_IFACE = "CGI"; then
85 SCRIPT_SUFFIX=cgi
86 SCRIPT_DIR=/cgi-name
87 CGIDIR='$(prefix)/cgi-bin'
88else
89 SCRIPT_SUFFIX=scm
90 SCRIPT_DIR=
91 CGIDIR='$(HTMLDIR)'
92fi
93
94AC_ARG_WITH(cgi-bin,
95 AC_HELP_STRING([--with-cgi-bin=DIR],
96 [install CGI programs in DIR [[PREFIX/cgi-bin]]]),
97 [CGIDIR=$withval])
98
78AC_SUBST(BASE_HREF) 99AC_SUBST(BASE_HREF)
79AC_SUBST(TARGET_DIR) 100AC_SUBST(TARGET_DIR)
80 101
@@ -85,8 +106,8 @@ if test "$EMACS" != "no"; then
85fi 106fi
86AC_SUBST(lisp_LISP) 107AC_SUBST(lisp_LISP)
87 108
88AC_SUBST(AUTOGENERATED) 109AC_SUBST(AUTOGENERATED,
89AUTOGENERATED=";;;; This file is generated automatically. Please do not edit." 110 ";;;; This file is generated automatically. Please do not edit. -*- buffer-read-only: t -*- vi: set ro:")
90 111
91AC_CONFIG_FILES(Makefile 112AC_CONFIG_FILES(Makefile
92 cgi-bin/Makefile 113 cgi-bin/Makefile

Return to:

Send suggestions and report system problems to the System administrator.