diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | config/var-def.mk | 1 | ||||
| -rwxr-xr-x | configure | 167 | ||||
| -rw-r--r-- | configure.ac | 26 | ||||
| -rw-r--r-- | configure.ac.pamphlet | 41 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/algebra/Makefile.in | 4 | ||||
| -rw-r--r-- | src/algebra/Makefile.pamphlet | 4 | ||||
| -rw-r--r-- | src/algebra/color.spad.pamphlet | 2 | ||||
| -rw-r--r-- | src/algebra/net.spad.pamphlet | 2 | ||||
| -rw-r--r-- | src/algebra/syntax.spad.pamphlet | 1 | ||||
| -rwxr-xr-x | src/hyper/presea.in (renamed from src/hyper/presea) | 2 |
12 files changed, 107 insertions, 153 deletions
@@ -1,3 +1,8 @@ +2008-10-26 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * configure.ac.pamphlet: Look for path to `awk'. + Instantiate src/hyper/presea. + 2008-09-13 Gabriel Dos Reis <gdr@cs.tamu.edu> * configure.ac.pamphlet: Simplify native type translation table diff --git a/config/var-def.mk b/config/var-def.mk index 83fcdc50..c1b88d2f 100644 --- a/config/var-def.mk +++ b/config/var-def.mk @@ -38,6 +38,7 @@ srcdir = @srcdir@ abs_srcdir = @abs_srcdir@ top_srcdir = @top_srcdir@ abs_top_srcdir = @abs_top_srcdir@ +top_confdir = $(top_srcdir)/config # Notice that there is a bug in Autoconf 2.59 whereby the variable # top_builddir is not defined. So avoid to use it directly. Use @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for OpenAxiom 1.3.0-2008-10-24. +# Generated by GNU Autoconf 2.60 for OpenAxiom 1.3.0-2008-10-25. # # Report bugs to <open-axiom-bugs@lists.sf.net>. # @@ -713,8 +713,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.3.0-2008-10-24' -PACKAGE_STRING='OpenAxiom 1.3.0-2008-10-24' +PACKAGE_VERSION='1.3.0-2008-10-25' +PACKAGE_STRING='OpenAxiom 1.3.0-2008-10-25' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -845,6 +845,7 @@ INSTALL_DATA TOUCH MKTEMP AWK +HOST_AWK PATCH LATEX MAKEINDEX @@ -1404,7 +1405,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenAxiom 1.3.0-2008-10-24 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.3.0-2008-10-25 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1474,7 +1475,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2008-10-24:";; + short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2008-10-25:";; esac cat <<\_ACEOF @@ -1578,7 +1579,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.3.0-2008-10-24 +OpenAxiom configure 1.3.0-2008-10-25 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1592,7 +1593,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenAxiom $as_me 1.3.0-2008-10-24, which was +It was created by OpenAxiom $as_me 1.3.0-2008-10-25, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -3798,7 +3799,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3801 "configure"' > conftest.$ac_ext + echo '#line 3802 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6943,11 +6944,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6946: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6947: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6950: \$? = $ac_status" >&5 + echo "$as_me:6951: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7211,11 +7212,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7214: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7215: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7218: \$? = $ac_status" >&5 + echo "$as_me:7219: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7315,11 +7316,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7318: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7319: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7322: \$? = $ac_status" >&5 + echo "$as_me:7323: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9767,7 +9768,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9770 "configure" +#line 9771 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9867,7 +9868,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9870 "configure" +#line 9871 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12235,11 +12236,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12238: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12239: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12242: \$? = $ac_status" >&5 + echo "$as_me:12243: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12339,11 +12340,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12342: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12343: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12346: \$? = $ac_status" >&5 + echo "$as_me:12347: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13909,11 +13910,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13912: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13913: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13916: \$? = $ac_status" >&5 + echo "$as_me:13917: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14013,11 +14014,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14016: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14017: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14020: \$? = $ac_status" >&5 + echo "$as_me:14021: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16243,11 +16244,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16246: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16247: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16250: \$? = $ac_status" >&5 + echo "$as_me:16251: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16511,11 +16512,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16514: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16515: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16518: \$? = $ac_status" >&5 + echo "$as_me:16519: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16615,11 +16616,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16618: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16619: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16622: \$? = $ac_status" >&5 + echo "$as_me:16623: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20457,10 +20458,10 @@ fi done -case $build in - *-solaris9) - # Extract the first word of "gawk", so it can be a program name with args. -set dummy gawk; ac_word=$2 +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AWK+set}" = set; then @@ -20476,7 +20477,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AWK="gawk" + ac_cv_prog_AWK="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -20484,9 +20485,6 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_prog_AWK" && ac_cv_prog_AWK="{ { echo "$as_me:$LINENO: error: OpenAxiom needs gawk" >&5 -echo "$as_me: error: OpenAxiom needs gawk" >&2;} - { (exit 1); exit 1; }; }" fi fi AWK=$ac_cv_prog_AWK @@ -20499,70 +20497,31 @@ echo "${ECHO_T}no" >&6; } fi - - # Extract the first word of "gpatch", so it can be a program name with args. -set dummy gpatch; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_PATCH+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$PATCH"; then - ac_cv_prog_PATCH="$PATCH" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_PATCH="gptach" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + test -n "$AWK" && break done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_PATCH" && ac_cv_prog_PATCH="{ { echo "$as_me:$LINENO: error: OpenAxiom needs gpatch" >&5 -echo "$as_me: error: OpenAxiom needs gpatch" >&2;} - { (exit 1); exit 1; }; }" -fi -fi -PATCH=$ac_cv_prog_PATCH -if test -n "$PATCH"; then - { echo "$as_me:$LINENO: result: $PATCH" >&5 -echo "${ECHO_T}$PATCH" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - ;; - *) - for ac_prog in gawk mawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then +if test "${ac_cv_path_HOST_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $HOST_AWK in + [\\/]* | ?:[\\/]*) + ac_cv_path_HOST_AWK="$HOST_AWK" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AWK="$ac_prog" + ac_cv_path_HOST_AWK="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -20570,23 +20529,24 @@ done done IFS=$as_save_IFS + ;; +esac fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - { echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6; } +HOST_AWK=$ac_cv_path_HOST_AWK +if test -n "$HOST_AWK"; then + { echo "$as_me:$LINENO: result: $HOST_AWK" >&5 +echo "${ECHO_T}$HOST_AWK" >&6; } else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } fi - test -n "$AWK" && break + test -n "$HOST_AWK" && break done - for ac_prog in gpatch patch +for ac_prog in gpatch patch do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -20631,8 +20591,6 @@ test -n "$PATCH" || PATCH="{ { echo "$as_me:$LINENO: error: OpenAxiom needs a pa echo "$as_me: error: OpenAxiom needs a patch program" >&2;} { (exit 1); exit 1; }; }" - ;; -esac # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 @@ -25707,6 +25665,9 @@ ac_config_files="$ac_config_files src/etc/Makefile:config/var-def.mk:src/etc/Mak ac_config_files="$ac_config_files src/doc/Makefile:config/var-def.mk:src/doc/Makefile.in:config/setup-dep.mk" +ac_config_files="$ac_config_files src/hyper/presea" + + ## We now generate the "document" script and support files at configure time. ## We put them in the build directory because they are intended to be @@ -26097,7 +26058,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenAxiom $as_me 1.3.0-2008-10-24, which was +This file was extended by OpenAxiom $as_me 1.3.0-2008-10-25, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26146,7 +26107,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenAxiom config.status 1.3.0-2008-10-24 +OpenAxiom config.status 1.3.0-2008-10-25 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -26276,6 +26237,7 @@ do "src/input/Makefile") CONFIG_FILES="$CONFIG_FILES src/input/Makefile:config/var-def.mk:src/input/Makefile.in:config/setup-dep.mk" ;; "src/etc/Makefile") CONFIG_FILES="$CONFIG_FILES src/etc/Makefile:config/var-def.mk:src/etc/Makefile.in:config/setup-dep.mk" ;; "src/doc/Makefile") CONFIG_FILES="$CONFIG_FILES src/doc/Makefile:config/var-def.mk:src/doc/Makefile.in:config/setup-dep.mk" ;; + "src/hyper/presea") CONFIG_FILES="$CONFIG_FILES src/hyper/presea" ;; "build/scripts/document") CONFIG_FILES="$CONFIG_FILES build/scripts/document:$srcdir/src/scripts/document.in" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 @@ -26429,12 +26391,12 @@ INSTALL_DATA!$INSTALL_DATA$ac_delim TOUCH!$TOUCH$ac_delim MKTEMP!$MKTEMP$ac_delim AWK!$AWK$ac_delim +HOST_AWK!$HOST_AWK$ac_delim PATCH!$PATCH$ac_delim LATEX!$LATEX$ac_delim MAKEINDEX!$MAKEINDEX$ac_delim NOTANGLE!$NOTANGLE$ac_delim NOWEAVE!$NOWEAVE$ac_delim -AXIOM_LISP!$AXIOM_LISP$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -26476,6 +26438,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +AXIOM_LISP!$AXIOM_LISP$ac_delim axiom_include_gcl!$axiom_include_gcl$ac_delim axiom_lisp_flavor!$axiom_lisp_flavor$ac_delim oa_standard_linking!$oa_standard_linking$ac_delim @@ -26513,7 +26476,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -26914,6 +26877,7 @@ echo "$as_me: $ac_file is unchanged" >&6;} case $ac_file$ac_mode in + "src/hyper/presea":F) chmod +x src/hyper/presea ;; "build/scripts/document":F) \ chmod +x build/scripts/document ;; @@ -26959,7 +26923,8 @@ egrep '<<(category|domain|package) .*>>=' \ set $chunk_desc; spad_abbrev=$2 cat >> src/algebra/tmp-extract-spad.mk <<EOF $spad_abbrev.spad: \$(srcdir)/`basename $spad_file` ; \ - @\$(axiom_build_document) --output=\$@ --tangle="$chunk_desc" \$< + @\$(axiom_build_document) --output=\$@.tmp --tangle="$chunk_desc" \$< && \ + \$(top_confdir)/move-if-change \$@.tmp \$@ EOF done echo done diff --git a/configure.ac b/configure.ac index c1a34f97..76ec73f5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.3.0-2008-10-24], +AC_INIT([OpenAxiom], [1.3.0-2008-10-25], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) @@ -112,22 +112,11 @@ AC_CHECK_PROG([TOUCH], [touch], [touch], [AC_MSG_ERROR(['touch' program is missing.])]) AC_CHECK_PROGS([MKTEMP], [mktemp]) -case $build in - *-solaris9) - AC_CHECK_PROG([AWK], [gawk], - [gawk], [AC_MSG_ERROR([OpenAxiom needs gawk])]) - - AC_CHECK_PROG([PATCH], [gpatch], - [gptach], [AC_MSG_ERROR([OpenAxiom needs gpatch])]) - ;; +AC_PROG_AWK +AC_PATH_PROGS([HOST_AWK],[gawk mawk nawk awk]) - *) - AC_PROG_AWK - - AC_CHECK_PROGS([PATCH], [gpatch patch], - [AC_MSG_ERROR([OpenAxiom needs a patch program])]) - ;; -esac +AC_CHECK_PROGS([PATCH], [gpatch patch], + [AC_MSG_ERROR([OpenAxiom needs a patch program])]) AC_CHECK_PROG([AR], [ar], [ar], [AC_MSG_ERROR([program 'ar' is missing])]) @@ -644,6 +633,8 @@ AXIOM_MAKEFILE([src/input/Makefile]) AXIOM_MAKEFILE([src/etc/Makefile]) AXIOM_MAKEFILE([src/doc/Makefile]) +AC_CONFIG_FILES([src/hyper/presea], [chmod +x src/hyper/presea]) + ## We now generate the "document" script and support files at configure time. ## We put them in the build directory because they are intended to be @@ -663,7 +654,8 @@ egrep '<<(category|domain|package) .*>>=' \ set $chunk_desc; spad_abbrev=$2 cat >> src/algebra/tmp-extract-spad.mk <<EOF $spad_abbrev.spad: \$(srcdir)/`basename $spad_file` ; \ - @\$(axiom_build_document) --output=\$@ --tangle="$chunk_desc" \$< + @\$(axiom_build_document) --output=\$@.tmp --tangle="$chunk_desc" \$< && \ + \$(top_confdir)/move-if-change \$@.tmp \$@ EOF done echo done diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 6ebb61d8..2af9939c 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -692,32 +692,18 @@ AC_CHECK_PROGS([MKTEMP], [mktemp]) @ \paragraph{The [[awk]] program} -The old build machinery needs 'awk'. Currently, it checks for -'gawk', 'nawk', and 'awk'. Autoconf has a predefined test for that -task. It checks for 'gawk', 'mawk', 'nawk', and 'awk' in that order. -That should be OK and match OpenAxiom's need. - -The old build system claims that on solaris9, gawk, gtar -and gpatch are required (with no much explanation of why). Notice -that these programs are needed only to build OpenAxiom; so we do -check based on the value of [[build]]. -<<awk and tar program>>= -case $build in - *-solaris9) - AC_CHECK_PROG([AWK], [gawk], - [gawk], [AC_MSG_ERROR([OpenAxiom needs gawk])]) - - AC_CHECK_PROG([PATCH], [gpatch], - [gptach], [AC_MSG_ERROR([OpenAxiom needs gpatch])]) - ;; +The old build machinery needs \Tool{awk} on the build machine for +extracting algebra definitions. The same tool is needed on the +host machine for proper run of HyperDoc utilities. Note that at +the moment we do not make a distinction between the build machine +and the host machine (though that may change in the future). - *) - AC_PROG_AWK +<<awk and tar program>>= +AC_PROG_AWK +AC_PATH_PROGS([HOST_AWK],[gawk mawk nawk awk]) - AC_CHECK_PROGS([PATCH], [gpatch patch], - [AC_MSG_ERROR([OpenAxiom needs a patch program])]) - ;; -esac +AC_CHECK_PROGS([PATCH], [gpatch patch], + [AC_MSG_ERROR([OpenAxiom needs a patch program])]) @ \paragraph{Binary utils.} @@ -1126,7 +1112,7 @@ information: <<Autoconf init>>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.3.0-2008-10-24], +AC_INIT([OpenAxiom], [1.3.0-2008-10-25], [open-axiom-bugs@lists.sf.net]) @ @@ -1199,6 +1185,8 @@ AXIOM_MAKEFILE([src/input/Makefile]) AXIOM_MAKEFILE([src/etc/Makefile]) AXIOM_MAKEFILE([src/doc/Makefile]) +AC_CONFIG_FILES([src/hyper/presea], [chmod +x src/hyper/presea]) + ## We now generate the "document" script and support files at configure time. ## We put them in the build directory because they are intended to be @@ -1218,7 +1206,8 @@ egrep '@<<(category|domain|package) .*>>=' \ set $chunk_desc; spad_abbrev=$2 cat >> src/algebra/tmp-extract-spad.mk <<EOF $spad_abbrev.spad: \$(srcdir)/`basename $spad_file` ; \ - @\$(axiom_build_document) --output=\$@ --tangle="$chunk_desc" \$< + @\$(axiom_build_document) --output=\$@.tmp --tangle="$chunk_desc" \$< && \ + \$(top_confdir)/move-if-change \$@.tmp \$@ EOF done echo done diff --git a/src/ChangeLog b/src/ChangeLog index 5a972fef..b4ee3f7b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-10-26 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * hyper/presea.in: Rename from hyper/presea. `awk' is not + substitued at configuration time. + 2008-10-25 Gabriel Dos Reis <gdr@cs.tamu.edu> * clef/edible.c: #include "cfuns.h" for oa_getenv use. diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index 130b228f..7d7846c0 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -919,13 +919,13 @@ check: +.PRECIOUS: $(OUT)/%.$(FASLEXT) ${OUT}/%.$(FASLEXT): %.NRLIB/code.$(FASLEXT) cp $< $@ .PRECIOUS: %.NRLIB/code.$(FASLEXT) %.NRLIB/code.$(FASLEXT): %.spad - @ rm -rf $*.NRLIB ${INTERPSYS} --strap=strap --system-algebra --optimize=2 --compile $< # Compile bootstrap file to machine object code, and the result # immediately available for AXIOMsys consumption. @@ -966,11 +966,9 @@ $(axiom_build_texdir)/diagrams.tex: $(axiom_src_docdir)/diagrams.tex @cp -p $< $@ SPADPRSR.NRLIB/code.$(FASLEXT): spad-parser.spad - @ rm -rf SPADPRSR.NRLIB ${INTERPSYS} --system-algebra --compile $< PARSER.NRLIB/code.$(FASLEXT): script-parser.spad - @ rm -rf PARSER.NRLIB ${INTERPSYS} --system-algebra --compile $< diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet index 1a960216..25269dd2 100644 --- a/src/algebra/Makefile.pamphlet +++ b/src/algebra/Makefile.pamphlet @@ -1851,6 +1851,7 @@ deriving the dependencies by scanning the ``Loading ...'' messages. <<genericDotOfiles>>= +.PRECIOUS: $(OUT)/%.$(FASLEXT) ${OUT}/%.$(FASLEXT): %.NRLIB/code.$(FASLEXT) cp $< $@ @@ -1860,7 +1861,6 @@ ${OUT}/%.$(FASLEXT): %.NRLIB/code.$(FASLEXT) .PRECIOUS: %.NRLIB/code.$(FASLEXT) %.NRLIB/code.$(FASLEXT): %.spad - @ rm -rf $*.NRLIB ${INTERPSYS} --strap=strap --system-algebra --optimize=2 --compile $< @ @@ -1917,11 +1917,9 @@ $(axiom_build_texdir)/diagrams.tex: $(axiom_src_docdir)/diagrams.tex <<genericDOCfiles>> SPADPRSR.NRLIB/code.$(FASLEXT): spad-parser.spad - @ rm -rf SPADPRSR.NRLIB ${INTERPSYS} --system-algebra --compile $< PARSER.NRLIB/code.$(FASLEXT): script-parser.spad - @ rm -rf PARSER.NRLIB ${INTERPSYS} --system-algebra --compile $< @ diff --git a/src/algebra/color.spad.pamphlet b/src/algebra/color.spad.pamphlet index a8a0e329..74025c2d 100644 --- a/src/algebra/color.spad.pamphlet +++ b/src/algebra/color.spad.pamphlet @@ -44,7 +44,7 @@ RGBColorModel(T: AbelianMonoid): Category == AbelianMonoid with ++ This category defines the common interface for RGB color spaces. RGBColorSpace(T: AbelianMonoid): Category == RGBColorModel T with whitePoint: % - ++ whitepoint is the contant indicating the white point + ++ whitePoint is the contant indicating the white point ++ of this color space. @ diff --git a/src/algebra/net.spad.pamphlet b/src/algebra/net.spad.pamphlet index f73b278c..efde9e0d 100644 --- a/src/algebra/net.spad.pamphlet +++ b/src/algebra/net.spad.pamphlet @@ -129,7 +129,7 @@ InputBinaryFile(): Public == Private where eof?: % -> Boolean ++ eof?(ifile) holds when the last read reached end of file. isOpen?: % -> Boolean - ++ open?(ifile) holds if `ifile' is in open state. + ++ isOpen?(ifile) holds if `ifile' is in open state. position: % -> SingleInteger ++ position(f) returns the current byte-position in the file `f'. position!: (%,SingleInteger) -> SingleInteger diff --git a/src/algebra/syntax.spad.pamphlet b/src/algebra/syntax.spad.pamphlet index be0fc84b..a649c1f5 100644 --- a/src/algebra/syntax.spad.pamphlet +++ b/src/algebra/syntax.spad.pamphlet @@ -373,6 +373,7 @@ import CoercibleTo Syntax AbstractSyntaxCategory(): Category == Join(SetCategory, CoercibleTo Syntax) with coerce: Syntax -> % + ++ coerce(s) parses syntax object `s' as a Spad construct. add coerce(x: %): Syntax == x pretend Syntax diff --git a/src/hyper/presea b/src/hyper/presea.in index fb9af4db..c8ab71c1 100755 --- a/src/hyper/presea +++ b/src/hyper/presea.in @@ -1,4 +1,4 @@ -#!/bin/awk -f +#!@HOST_AWK@ -f BEGIN {n=0;m=0 } |