diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | config/var-def.mk | 3 | ||||
| -rwxr-xr-x | configure | 58 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | configure.ac.pamphlet | 12 | ||||
| -rw-r--r-- | src/sman/Makefile.in | 6 |
6 files changed, 50 insertions, 48 deletions
@@ -1,3 +1,10 @@ +2009-09-21 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * configure.ac.pamphlet: Don't unconditionally initialize CCF. + * config/var-def.mk (PLF): Remove. + (LDF): Likewise. + (LISP): Likewise. + 2009-09-20 Gabriel Dos Reis <gdr@cs.tamu.edu> * configure.ac.pamphlet: Don't define CPP LINUXplaform, diff --git a/config/var-def.mk b/config/var-def.mk index c2d99b1f..e226e7f1 100644 --- a/config/var-def.mk +++ b/config/var-def.mk @@ -196,10 +196,7 @@ axiom_optional_srcdir = $(abs_top_srcdir)/zips open_axiom_installdir = @open_axiom_installdir@ INC=$(top_srcdir)/src/include -PLF=@PLF@ CCF=@CCF@ -LDF=@LDF@ -lm -LISP=@LISP@ oa_c_runtime_extra = @LIBS@ @axiom_c_runtime_extra@ -lm oa_c_libs = -lopen-axiom-core $(oa_c_runtime_extra) -lm @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for OpenAxiom 1.4.0-2009-09-19. +# Generated by GNU Autoconf 2.63 for OpenAxiom 1.4.0-2009-09-21. # # Report bugs to <open-axiom-bugs@lists.sf.net>. # @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.4.0-2009-09-19' -PACKAGE_STRING='OpenAxiom 1.4.0-2009-09-19' +PACKAGE_VERSION='1.4.0-2009-09-21' +PACKAGE_STRING='OpenAxiom 1.4.0-2009-09-21' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -795,8 +795,6 @@ int_type char_type void_type GCLOPTS -LISP -LDF CCF openaxiom_host_has_regex axiom_use_x @@ -1500,7 +1498,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.4.0-2009-09-19 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.4.0-2009-09-21 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1570,7 +1568,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2009-09-19:";; + short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2009-09-21:";; esac cat <<\_ACEOF @@ -1673,7 +1671,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.4.0-2009-09-19 +OpenAxiom configure 1.4.0-2009-09-21 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1687,7 +1685,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.4.0-2009-09-19, which was +It was created by OpenAxiom $as_me 1.4.0-2009-09-21, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -3735,13 +3733,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:3738: $ac_compile\"" >&5) + (eval echo "\"\$as_me:3736: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:3741: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:3739: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:3744: output\"" >&5) + (eval echo "\"\$as_me:3742: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -4944,7 +4942,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4947 "configure"' > conftest.$ac_ext + echo '#line 4945 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7092,11 +7090,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:7095: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7093: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7099: \$? = $ac_status" >&5 + echo "$as_me:7097: \$? = $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. @@ -7431,11 +7429,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:7434: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7432: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7438: \$? = $ac_status" >&5 + echo "$as_me:7436: \$? = $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. @@ -7536,11 +7534,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:7539: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7537: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7543: \$? = $ac_status" >&5 + echo "$as_me:7541: \$? = $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 @@ -7591,11 +7589,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:7594: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7592: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7598: \$? = $ac_status" >&5 + echo "$as_me:7596: \$? = $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 @@ -10391,7 +10389,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10394 "configure" +#line 10392 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10487,7 +10485,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10490 "configure" +#line 10488 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16528,9 +16526,11 @@ esac axiom_gcl_x_option="--disable-tkconfig --disable-x --disable-xgcl" axiom_gcl_emacs="--enable-emacs=correct" -CCF="-O2 -Wall -D_GNU_SOURCE" -LDF= -LISP=lsp +cae $GCC in + yes) + CCF="-O2 -Wall -D_GNU_SOURCE" + ;; +esac case $target in *bsd*|*dragonfly*) @@ -16559,8 +16559,6 @@ GCLOPTS="$axiom_gcl_emacs $axiom_gcl_bfd_option $axiom_gcl_mm_option $axiom_gcl_ - - case $axiom_lisp_flavor in gcl) void_type='void' @@ -17064,7 +17062,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.4.0-2009-09-19, which was +This file was extended by OpenAxiom $as_me 1.4.0-2009-09-21, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17127,7 +17125,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -OpenAxiom config.status 1.4.0-2009-09-19 +OpenAxiom config.status 1.4.0-2009-09-21 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index badbecf9..ef531d07 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.4.0-2009-09-19], +AC_INIT([OpenAxiom], [1.4.0-2009-09-21], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) @@ -593,9 +593,11 @@ esac axiom_gcl_x_option="--disable-tkconfig --disable-x --disable-xgcl" axiom_gcl_emacs="--enable-emacs=correct" -CCF="-O2 -Wall -D_GNU_SOURCE" -LDF= -LISP=lsp +cae $GCC in + yes) + CCF="-O2 -Wall -D_GNU_SOURCE" + ;; +esac case $target in *bsd*|*dragonfly*) @@ -619,8 +621,6 @@ esac GCLOPTS="$axiom_gcl_emacs $axiom_gcl_bfd_option $axiom_gcl_mm_option $axiom_gcl_x_option" AC_SUBST(CCF) -AC_SUBST(LDF) -AC_SUBST(LISP) AC_SUBST(GCLOPTS) case $axiom_lisp_flavor in gcl) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index c1c42cb5..cadc4461 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -567,9 +567,11 @@ do with platforms. <<platform specific bits>>= <<gcl options>> -CCF="-O2 -Wall -D_GNU_SOURCE" -LDF= -LISP=lsp +cae $GCC in + yes) + CCF="-O2 -Wall -D_GNU_SOURCE" + ;; +esac case $target in *bsd*|*dragonfly*) @@ -593,8 +595,6 @@ esac GCLOPTS="$axiom_gcl_emacs $axiom_gcl_bfd_option $axiom_gcl_mm_option $axiom_gcl_x_option" AC_SUBST(CCF) -AC_SUBST(LDF) -AC_SUBST(LISP) AC_SUBST(GCLOPTS) @ @@ -1152,7 +1152,7 @@ information: <<Autoconf init>>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.4.0-2009-09-19], +AC_INIT([OpenAxiom], [1.4.0-2009-09-21], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/sman/Makefile.in b/src/sman/Makefile.in index 5e3c8ed3..87086d02 100644 --- a/src/sman/Makefile.in +++ b/src/sman/Makefile.in @@ -85,16 +85,16 @@ stamp: $(OUTLIB)/session$(EXEEXT) \ -I$(top_srcdir)/src/driver $< ${OUTLIB}/session$(EXEEXT): $(session_objects) $(session_DEPENDENCIES) - $(LINK) -o $@ $(session_objects) $(session_LDADD) ${LDF} + $(LINK) -o $@ $(session_objects) $(session_LDADD) ${OUTLIB}/spadclient$(EXEEXT): $(spadclient_objects) $(spadclient_DEPENDENCIES) - $(LINK) -o $@ $(spadclient_objects) $(spadclient_LDADD) ${LDF} + $(LINK) -o $@ $(spadclient_objects) $(spadclient_LDADD) spadclient.$(OBJEXT): ${INC}/useproto.h ${INC}/spadclient.H1 \ $(axiom_configdir)/axiom-c-macros.h ${OUT}/sman$(EXEEXT): $(sman_objects) $(sman_DEPENDENCIES) - $(LINK) -o $@ $(sman_objects) $(sman_LDADD) ${LDF} + $(LINK) -o $@ $(sman_objects) $(sman_LDADD) $(sman_objects): sman.h $(axiom_c_macros_h) |