diff options
-rw-r--r-- | configure.ac | 43 |
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 @@ | |||
16 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 16 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
17 | # | 17 | # |
18 | 18 | ||
19 | AC_PREREQ(2.59) | 19 | AC_PREREQ(2.59) |
20 | 20 | ||
21 | AC_REVISION($Revision$) | 21 | AC_REVISION($Revision$) |
22 | AC_INIT(ellinika, 1.0, gray@gnu.org) | 22 | AC_INIT(ellinika, 1.1, gray@gnu.org) |
23 | AC_CONFIG_SRCDIR(cgi-bin/dict.cgi.in) | 23 | AC_CONFIG_SRCDIR(cgi-bin/dict.cgi.in) |
24 | AC_CONFIG_AUX_DIR([scripts]) | 24 | AC_CONFIG_AUX_DIR([build-aux]) |
25 | AC_CANONICAL_SYSTEM | 25 | AC_CANONICAL_SYSTEM |
26 | AM_INIT_AUTOMAKE(no-exeext) | 26 | AM_INIT_AUTOMAKE(no-exeext) |
27 | 27 | ||
28 | ## * Checks for programs. | 28 | ## * Checks for programs. |
29 | 29 | ||
30 | M4='`cd $(top_srcdir); pwd`/scripts/missing --run m4' | 30 | M4='`cd $(top_srcdir); pwd`/scripts/missing --run m4' |
@@ -58,38 +58,59 @@ case `guile -c "(display (member \"$GUILE_SITE\" %load-path))(newline)"` in | |||
58 | esac | 58 | esac |
59 | 59 | ||
60 | AC_SUBST(GUILE_COMMENT) | 60 | AC_SUBST(GUILE_COMMENT) |
61 | AC_SUBST(GUILE_SITE) | 61 | AC_SUBST(GUILE_SITE) |
62 | 62 | ||
63 | 63 | ||
64 | CGIDIR='$(prefix)/cgi-bin' | ||
65 | AC_ARG_WITH(cgi-bin, | ||
66 | AC_HELP_STRING([--with-cgi-bin=DIR], | ||
67 | [install CGI programs in DIR [[PREFIX/cgi-bin]]]), | ||
68 | [CGIDIR=$withval]) | ||
69 | AC_SUBST(CGIDIR) | ||
70 | |||
71 | HTMLDIR='$(prefix)/ellinika' | 64 | HTMLDIR='$(prefix)/ellinika' |
72 | AC_ARG_WITH(html-dir, | 65 | AC_ARG_WITH(html-dir, |
73 | AC_HELP_STRING([--with-html-dir=DIR], | 66 | AC_HELP_STRING([--with-html-dir=DIR], |
74 | [install HTML pages in DIR [[PREFIX/ellinika]]]), | 67 | [install HTML pages in DIR [[PREFIX/ellinika]]]), |
75 | [HTMLDIR=$withval]) | 68 | [HTMLDIR=$withval]) |
76 | AC_SUBST(HTMLDIR) | 69 | AC_SUBST(HTMLDIR) |
77 | 70 | ||
71 | AC_SUBST(APACHE_IFACE,CGI) | ||
72 | AC_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 | |||
81 | AC_SUBST(SCRIPT_SUFFIX) | ||
82 | AC_SUBST(SCRIPT_DIR) | ||
83 | AC_SUBST(CGIDIR) | ||
84 | if test $APACHE_IFACE = "CGI"; then | ||
85 | SCRIPT_SUFFIX=cgi | ||
86 | SCRIPT_DIR=/cgi-name | ||
87 | CGIDIR='$(prefix)/cgi-bin' | ||
88 | else | ||
89 | SCRIPT_SUFFIX=scm | ||
90 | SCRIPT_DIR= | ||
91 | CGIDIR='$(HTMLDIR)' | ||
92 | fi | ||
93 | |||
94 | AC_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 | |||
78 | AC_SUBST(BASE_HREF) | 99 | AC_SUBST(BASE_HREF) |
79 | AC_SUBST(TARGET_DIR) | 100 | AC_SUBST(TARGET_DIR) |
80 | 101 | ||
81 | dnl Check for Emacs site-lisp directory | 102 | dnl Check for Emacs site-lisp directory |
82 | AM_PATH_LISPDIR | 103 | AM_PATH_LISPDIR |
83 | if test "$EMACS" != "no"; then | 104 | if test "$EMACS" != "no"; then |
84 | lisp_LISP='$(LISPSRC)' | 105 | lisp_LISP='$(LISPSRC)' |
85 | fi | 106 | fi |
86 | AC_SUBST(lisp_LISP) | 107 | AC_SUBST(lisp_LISP) |
87 | 108 | ||
88 | AC_SUBST(AUTOGENERATED) | 109 | AC_SUBST(AUTOGENERATED, |
89 | AUTOGENERATED=";;;; 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 | ||
91 | AC_CONFIG_FILES(Makefile | 112 | AC_CONFIG_FILES(Makefile |
92 | cgi-bin/Makefile | 113 | cgi-bin/Makefile |
93 | elisp/Makefile | 114 | elisp/Makefile |
94 | data/Makefile | 115 | data/Makefile |
95 | scm/Makefile | 116 | scm/Makefile |