diff configure @ 1740:d2ec62c5ad81

Adaptations to ezyang's patch
author Adam Chlipala <adam@chlipala.net>
date Thu, 03 May 2012 10:29:12 -0400
parents 0152f65ced6a
children 7afe63952fe6
line wrap: on
line diff
--- a/configure	Wed May 02 17:17:57 2012 -0400
+++ b/configure	Thu May 03 10:29:12 2012 -0400
@@ -618,6 +618,7 @@
 CCARGS
 SITELISP
 INCLUDE
+SRCLIB
 LIB
 BIN
 USE_EMACS_FALSE
@@ -11872,7 +11873,7 @@
 
 
 
-ac_config_headers="$ac_config_headers config.h"
+ac_config_headers="$ac_config_headers include/urweb/config.h"
 
 
 
@@ -12553,7 +12554,11 @@
 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 @@
 
 
 
+
 ac_config_files="$ac_config_files Makefile src/c/Makefile src/config.sml"
 
 
@@ -13656,7 +13662,7 @@
   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 @@
 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