comparison 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
comparison
equal deleted inserted replaced
1739:c414850f206f 1740:d2ec62c5ad81
616 MSHEADER 616 MSHEADER
617 PGHEADER 617 PGHEADER
618 CCARGS 618 CCARGS
619 SITELISP 619 SITELISP
620 INCLUDE 620 INCLUDE
621 SRCLIB
621 LIB 622 LIB
622 BIN 623 BIN
623 USE_EMACS_FALSE 624 USE_EMACS_FALSE
624 USE_EMACS_TRUE 625 USE_EMACS_TRUE
625 MLYACC 626 MLYACC
11870 11871
11871 # Only expand once: 11872 # Only expand once:
11872 11873
11873 11874
11874 11875
11875 ac_config_headers="$ac_config_headers config.h" 11876 ac_config_headers="$ac_config_headers include/urweb/config.h"
11876 11877
11877 11878
11878 11879
11879 11880
11880 ac_ext=c 11881 ac_ext=c
12551 if test -z $BIN; then 12552 if test -z $BIN; then
12552 BIN=$prefix/bin 12553 BIN=$prefix/bin
12553 fi 12554 fi
12554 12555
12555 if test -z $LIB; then 12556 if test -z $LIB; then
12556 LIB=$prefix/lib/urweb 12557 LIB=$prefix/lib
12558 fi
12559
12560 if test -z $SRCLIB; then
12561 SRCLIB=$prefix/lib/urweb
12557 fi 12562 fi
12558 12563
12559 if test -z $INCLUDE; then 12564 if test -z $INCLUDE; then
12560 INCLUDE=$prefix/include/urweb 12565 INCLUDE=$prefix/include/urweb
12561 fi 12566 fi
12625 fi 12630 fi
12626 12631
12627 if test $WORKING_VERSION = "1"; then 12632 if test $WORKING_VERSION = "1"; then
12628 VERSION="$VERSION + `hg identify || (cat .hg_archival.txt | grep 'node\:') || echo ?`" 12633 VERSION="$VERSION + `hg identify || (cat .hg_archival.txt | grep 'node\:') || echo ?`"
12629 fi 12634 fi
12635
12630 12636
12631 12637
12632 12638
12633 12639
12634 12640
13654 for ac_config_target in $ac_config_targets 13660 for ac_config_target in $ac_config_targets
13655 do 13661 do
13656 case $ac_config_target in 13662 case $ac_config_target in
13657 "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; 13663 "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
13658 "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; 13664 "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
13659 "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; 13665 "include/urweb/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/urweb/config.h" ;;
13660 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; 13666 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
13661 "src/c/Makefile") CONFIG_FILES="$CONFIG_FILES src/c/Makefile" ;; 13667 "src/c/Makefile") CONFIG_FILES="$CONFIG_FILES src/c/Makefile" ;;
13662 "src/config.sml") CONFIG_FILES="$CONFIG_FILES src/config.sml" ;; 13668 "src/config.sml") CONFIG_FILES="$CONFIG_FILES src/config.sml" ;;
13663 13669
13664 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 13670 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
15022 cat <<EOF 15028 cat <<EOF
15023 15029
15024 Ur/Web configuration: 15030 Ur/Web configuration:
15025 bin directory: BIN $BIN 15031 bin directory: BIN $BIN
15026 lib directory: LIB $LIB 15032 lib directory: LIB $LIB
15033 src lib directory: SRCLIB $SRCLIB
15027 include directory: INCLUDE $INCLUDE 15034 include directory: INCLUDE $INCLUDE
15028 site-lisp directory: SITELISP $SITELISP 15035 site-lisp directory: SITELISP $SITELISP
15029 C compiler: CC $CC 15036 C compiler: CC $CC
15030 Extra CC args: CCARGS $CCARGS 15037 Extra CC args: CCARGS $CCARGS
15031 Postgres C header: PGHEADER $PGHEADER 15038 Postgres C header: PGHEADER $PGHEADER