diff options
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 41 |
2 files changed, 30 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 187cb57..190fc72 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,7 @@ AUTOMAKE_OPTIONS = gnits 1.8 ACLOCAL_AMFLAGS = -I m4 -SUBDIRS=cgi-bin data src xml po +SUBDIRS=cgi-bin data ellinika scm xml po htmldir = $(HTMLDIR) diff --git a/configure.ac b/configure.ac index 91525dd..147b586 100644 --- a/configure.ac +++ b/configure.ac @@ -6,14 +6,8 @@ AC_CONFIG_SRCDIR(cgi-bin/dict.cgi.in) AC_CONFIG_AUX_DIR([scripts]) AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE(no-exeext) -AC_CONFIG_HEADERS([config.h]) ## * Checks for programs. -AC_PROG_CC -AM_PROG_CC_STDC -AC_PROG_YACC -AM_PROG_LEX -AC_PROG_AWK M4='`cd $(top_srcdir); pwd`/scripts/missing --run m4' AC_SUBST(M4) @@ -29,6 +23,7 @@ RA_CHECK_GUILE(, esac], [AC_MSG_ERROR([You need Guile 1.6 or better])]) + RA_CHECK_LIB(mysqlclient, mysql_real_connect, [-lm], @@ -42,6 +37,25 @@ LIBS="$LIBS $ra_cv_lib_mysqlclient" ## Directories ## ************** +AC_SUBST(GUILE_BINDIR) +GUILE_BINDIR=`guile-config info bindir` + + +AC_SUBST(GUILE_SITE) +GUILE_SITE= +AC_ARG_WITH([guile-site], + AC_HELP_STRING([--with-guile-site], + [Install modules into the default guile site directory]), + [case $withval in + yes) GUILE_SITE=`guile-config info pkgdatadir`/site/'$(PACKAGE)';; + esac]) + +if test "$GUILE_SITE" = ""; then + GUILE_SITE='$(pkgdatadir)' + AC_SUBST(UPDPATH) + UPDPATH="(set! %load-path (cons \\\"\$\$s\\\" %load-path))" +fi + CGIDIR='$(prefix)/cgi-bin' AC_ARG_WITH(cgi-bin, AC_HELP_STRING([--with-cgi-bin=DIR], @@ -59,9 +73,12 @@ AC_SUBST(HTMLDIR) AC_SUBST(BASE_HREF) AC_SUBST(TARGET_DIR) -AC_OUTPUT(Makefile - cgi-bin/Makefile - data/Makefile - src/Makefile - xml/Makefile - po/Makefile.in) +AC_CONFIG_FILES(Makefile + cgi-bin/Makefile + data/Makefile + scm/Makefile + ellinika/Makefile + xml/Makefile + po/Makefile.in) + +AC_OUTPUT
\ No newline at end of file |