comparison configure.ac @ 1317:e12cef71aa1a

Karn Kallio's patch for static mhash linking
author Adam Chlipala <adam@chlipala.net>
date Thu, 18 Nov 2010 14:22:04 -0500
parents be2ef50780ed
children b2bc8bcd546f
comparison
equal deleted inserted replaced
1316:df7bfb30dcc3 1317:e12cef71aa1a
4 AC_PROG_CC() 4 AC_PROG_CC()
5 AC_PROG_LIBTOOL() 5 AC_PROG_LIBTOOL()
6 AC_CONFIG_MACRO_DIR([m4]) 6 AC_CONFIG_MACRO_DIR([m4])
7 AC_CONFIG_HEADERS([config.h]) 7 AC_CONFIG_HEADERS([config.h])
8 8
9 AC_CHECK_LIB(mhash, mhash_get_block_size, [], [echo "You must install libmhash."; exit 1]) 9 dnl Setting the search directory for mhash.
10 AC_CHECK_HEADER([mhash.h], [], [echo "You must install libmhash dev files."; exit 1]) 10 AC_ARG_WITH(mhash-dir, AS_HELP_STRING([--with-mhash-dir=DIR], [mhash directory; default = /usr]),
11 with_mhash_dir="$withval", with_mhash_dir="/usr")
12
13 dnl Check for libmhash
14 LIBS_save="$LIBS"
15 LIBS="-L${with_mhash_dir}/lib/ -lmhash"
16 AC_CHECK_LIB(mhash, mhash_get_block_size,
17 [MHASH_LIB_DIR="${with_mhash_dir}/lib"], [echo "You must install libmhash."; exit 1])
18 LIBS="${LIBS_save}"
19
20 dnl Check for mhash.h
21 AC_CHECK_HEADER(["${with_mhash_dir}/include/mhash.h"],
22 [CPPFLAGS="${CPPFLAGS} -I${with_mhash_dir}/include"], [echo "You must install libmhash dev files."; exit 1])
11 23
12 AC_CHECK_PROG(MLTON, mlton, yes, []) 24 AC_CHECK_PROG(MLTON, mlton, yes, [])
13 25
14 if test [-z $MLTON]; then 26 if test [-z $MLTON]; then
15 echo "You must install MLton." 27 echo "You must install MLton."
53 AC_SUBST(BIN) 65 AC_SUBST(BIN)
54 AC_SUBST(LIB) 66 AC_SUBST(LIB)
55 AC_SUBST(INCLUDE) 67 AC_SUBST(INCLUDE)
56 AC_SUBST(SITELISP) 68 AC_SUBST(SITELISP)
57 AC_SUBST(GCCARGS) 69 AC_SUBST(GCCARGS)
70 AC_SUBST(MHASH_LIB_DIR)
58 71
59 AC_CONFIG_FILES([ 72 AC_CONFIG_FILES([
60 Makefile 73 Makefile
61 src/c/Makefile 74 src/c/Makefile
62 src/config.sml 75 src/config.sml
65 AC_OUTPUT() 78 AC_OUTPUT()
66 79
67 cat <<EOF 80 cat <<EOF
68 81
69 Ur/Web configuration: 82 Ur/Web configuration:
70 bin directory: BIN $BIN 83 bin directory: BIN $BIN
71 lib directory: LIB $LIB 84 lib directory: LIB $LIB
72 include directory: INCLUDE $INCLUDE 85 include directory: INCLUDE $INCLUDE
73 site-lisp directory: SITELISP $SITELISP 86 site-lisp directory: SITELISP $SITELISP
74 Extra GCC args: GCCARGS $GCCARGS 87 mhash lib directory: MHASH_LIB_DIR $MHASH_LIB_DIR
88 Extra GCC args: GCCARGS $GCCARGS
75 EOF 89 EOF