summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adam@chlipala.net>2012-05-03 10:29:12 -0400
committerGravatar Adam Chlipala <adam@chlipala.net>2012-05-03 10:29:12 -0400
commit6e8853d922c0a547b65e4e72b9ce285495e512b6 (patch)
tree496e99c0deed91ed81df74ef5dd397edce5ea011 /configure
parent53ab42ae386350fbcd0171c8ba630bb8dcb71c54 (diff)
Adaptations to ezyang's patch
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure13
1 files changed, 10 insertions, 3 deletions
diff --git a/configure b/configure
index c401ffad..8bc630bc 100755
--- a/configure
+++ b/configure
@@ -618,6 +618,7 @@ PGHEADER
CCARGS
SITELISP
INCLUDE
+SRCLIB
LIB
BIN
USE_EMACS_FALSE
@@ -11872,7 +11873,7 @@ CC="$lt_save_CC"
-ac_config_headers="$ac_config_headers config.h"
+ac_config_headers="$ac_config_headers include/urweb/config.h"
@@ -12553,7 +12554,11 @@ if test -z $BIN; then
fi
if test -z $LIB; then
- LIB=$prefix/lib/urweb
+ LIB=$prefix/lib
+fi
+
+if test -z $SRCLIB; then
+ SRCLIB=$prefix/lib/urweb
fi
if test -z $INCLUDE; then
@@ -12641,6 +12646,7 @@ fi
+
ac_config_files="$ac_config_files Makefile src/c/Makefile src/config.sml"
@@ -13656,7 +13662,7 @@ do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
- "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ "include/urweb/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/urweb/config.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/c/Makefile") CONFIG_FILES="$CONFIG_FILES src/c/Makefile" ;;
"src/config.sml") CONFIG_FILES="$CONFIG_FILES src/config.sml" ;;
@@ -15024,6 +15030,7 @@ cat <<EOF
Ur/Web configuration:
bin directory: BIN $BIN
lib directory: LIB $LIB
+ src lib directory: SRCLIB $SRCLIB
include directory: INCLUDE $INCLUDE
site-lisp directory: SITELISP $SITELISP
C compiler: CC $CC