axiom-developer
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Axiom-developer] FW: Axiom on Solaris 10.2 x86


From: Gabriel Dos Reis
Subject: Re: [Axiom-developer] FW: Axiom on Solaris 10.2 x86
Date: 09 Apr 2007 21:43:13 -0500

"Bill Page" <address@hidden> writes:

[...]

| Yes, I could commit this change but I just noticed that I am using
| autoconf-2.61 so 'build-setup.sh' produces a lot of "housekeeping"
| changes in 'configure'. Do you want me to include the new onfigure
| in the commit? Or will you update it later?

Bill --

Tha patch below addresses the issues you have raised:
  
  * It adds the additional C runtime libraries for linking programs
  * It brings HyperDoc back.

For the second point, 

  (1) I removed a workaround for Autoconf-2.59 bug, whereby
      top_builddir was left undefined -- therefore I added ./ to
      imply correct semantics.  Since that bug was fixed in
      Autoconf-2.60 and later, we don't need it anymore.

  (2) We were not telling htadd that we were building the system
      database.  Fixed by supplying the option "-s" so that htadd can
      look up the value of the AXIOM environment variable.

Tested on an x86_64-suse-linux.  Committed to build-improvements.

Please let me know if it works on your solaris box.

-- Gaby

2007-04-09  Gabriel Dos Reis  <address@hidden>

        * config/var-def.mk (axiom_top_builddir): Remove leading ./ now
        that we require Autoconf 2.60 and the Autoconf 2.59 bug is fixed.
        (axiom_targetdir): Likewise.
        (INC): Likewise.
        (AXIOM): Likewise.
        * configure.ac.pamphlet: Update version information.
        * configure.ac: Regenerate.
        * configure: Likewise.

src/hyper/
2007-04-09  Gabriel Dos Reis  <address@hidden>

        * Makefile.pamphlet (${HYPER}/pages/ht.db): Tell htadd that we're
        building a system database.
        * Makefile.in: Regenerate.

src/sman/
2007-04-09  Bill Page  <address@hidden>

        * Makefile.pamphlet (session_LDADD): Add extrac C runtime libraries.
        (spadclient_LDADD): Likewise.
        * Makefile.in: Regenerate.

*** config/var-def.mk   (revision 15444)
--- config/var-def.mk   (local)
*************** axiom_abs_build_mandir = $(axiom_abs_bui
*** 123,129 ****
  axiom_abs_build_datadir = $(axiom_abs_builddir)/share
  axiom_abs_build_texdir = $(axiom_abs_build_datadir)/texmf/tex
  
! axiom_top_builddir = ./$(top_builddir)/build
  axiom_builddir = $(axiom_top_builddir)/$(build)
  axiom_build_bindir = $(axiom_builddir)/bin
  axiom_build_libdir = $(axiom_builddir)/lib
--- 123,129 ----
  axiom_abs_build_datadir = $(axiom_abs_builddir)/share
  axiom_abs_build_texdir = $(axiom_abs_build_datadir)/texmf/tex
  
! axiom_top_builddir = $(top_builddir)/build
  axiom_builddir = $(axiom_top_builddir)/$(build)
  axiom_build_bindir = $(axiom_builddir)/bin
  axiom_build_libdir = $(axiom_builddir)/lib
*************** axiom_c_macros = $(axiom_configdir)/axio
*** 138,144 ****
  LATEX = @LATEX@
  
  ## Staging directory for the target DESTDIR
! axiom_targetdir = ./$(top_builddir)/target/$(target)
  axiom_target_bindir = $(axiom_targetdir)/bin
  axiom_target_libdir = $(axiom_targetdir)/lib
  axiom_target_srcdir = $(axiom_targetdir)/src
--- 138,144 ----
  LATEX = @LATEX@
  
  ## Staging directory for the target DESTDIR
! axiom_targetdir = $(top_builddir)/target/$(target)
  axiom_target_bindir = $(axiom_targetdir)/bin
  axiom_target_libdir = $(axiom_targetdir)/lib
  axiom_target_srcdir = $(axiom_targetdir)/src
*************** axiom_target_texdir = $(axiom_target_dat
*** 150,156 ****
  ## Where Axiom keeps the tarballs for optional components
  axiom_optional_srcdir = $(abs_top_srcdir)/zips
  
! INC=./$(top_srcdir)/src/include
  address@hidden@
  address@hidden@
  address@hidden@
--- 150,156 ----
  ## Where Axiom keeps the tarballs for optional components
  axiom_optional_srcdir = $(abs_top_srcdir)/zips
  
! INC=$(top_srcdir)/src/include
  address@hidden@
  address@hidden@
  address@hidden@
*************** AXIOM_X11_LDFLAGS = @X_LIBS@ @X_PRE_LIBS
*** 162,168 ****
  axiom_includes = -I$(axiom_src_srcdir)/include -I$(axiom_configdir)
  
  ## Where the staging build directory is found
! AXIOM = ./$(top_builddir)/target/$(target)
  
  ## Where to find Axiom data bases.
  DAASE = $(axiom_src_datadir)
--- 162,168 ----
  axiom_includes = -I$(axiom_src_srcdir)/include -I$(axiom_configdir)
  
  ## Where the staging build directory is found
! AXIOM = $(top_builddir)/target/$(target)
  
  ## Where to find Axiom data bases.
  DAASE = $(axiom_src_datadir)
*** configure   (revision 15444)
--- configure   (local)
***************
*** 1,6 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.60 for Axiom build-improvements branch 
2006-04-07.
  #
  # Report bugs to <address@hidden>.
  #
--- 1,6 ----
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.60 for Axiom build-improvements branch 
2007-04-09.
  #
  # Report bugs to <address@hidden>.
  #
*************** SHELL=${CONFIG_SHELL-/bin/sh}
*** 559,566 ****
  # Identity of this package.
  PACKAGE_NAME='Axiom build-improvements branch'
  PACKAGE_TARNAME='axiom-build-improvements-branch'
! PACKAGE_VERSION='2006-04-07'
! PACKAGE_STRING='Axiom build-improvements branch 2006-04-07'
  PACKAGE_BUGREPORT='address@hidden'
  
  ac_unique_file="src/Makefile.pamphlet"
--- 559,566 ----
  # Identity of this package.
  PACKAGE_NAME='Axiom build-improvements branch'
  PACKAGE_TARNAME='axiom-build-improvements-branch'
! PACKAGE_VERSION='2007-04-09'
! PACKAGE_STRING='Axiom build-improvements branch 2007-04-09'
  PACKAGE_BUGREPORT='address@hidden'
  
  ac_unique_file="src/Makefile.pamphlet"
*************** if test "$ac_init_help" = "long"; then
*** 1213,1219 ****
    # 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 Axiom build-improvements branch 2006-04-07 to adapt 
to many kinds of systems.
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
  
--- 1213,1219 ----
    # 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 Axiom build-improvements branch 2007-04-09 to adapt 
to many kinds of systems.
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
  
*************** fi
*** 1283,1289 ****
  
  if test -n "$ac_init_help"; then
    case $ac_init_help in
!      short | recursive ) echo "Configuration of Axiom build-improvements 
branch 2006-04-07:";;
     esac
    cat <<\_ACEOF
  
--- 1283,1289 ----
  
  if test -n "$ac_init_help"; then
    case $ac_init_help in
!      short | recursive ) echo "Configuration of Axiom build-improvements 
branch 2007-04-09:";;
     esac
    cat <<\_ACEOF
  
*************** fi
*** 1373,1379 ****
  test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
! Axiom build-improvements branch configure 2006-04-07
  generated by GNU Autoconf 2.60
  
  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--- 1373,1379 ----
  test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
! Axiom build-improvements branch configure 2007-04-09
  generated by GNU Autoconf 2.60
  
  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
*************** cat >config.log <<_ACEOF
*** 1387,1393 ****
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
! It was created by Axiom build-improvements branch $as_me 2006-04-07, which was
  generated by GNU Autoconf 2.60.  Invocation command line was
  
    $ $0 $@
--- 1387,1393 ----
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
! It was created by Axiom build-improvements branch $as_me 2007-04-09, which was
  generated by GNU Autoconf 2.60.  Invocation command line was
  
    $ $0 $@
*************** exec 6>&1
*** 9060,9066 ****
  # report actual input values of CONFIG_FILES etc. instead of their
  # values after options handling.
  ac_log="
! This file was extended by Axiom build-improvements branch $as_me 2006-04-07, 
which was
  generated by GNU Autoconf 2.60.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
--- 9060,9066 ----
  # report actual input values of CONFIG_FILES etc. instead of their
  # values after options handling.
  ac_log="
! This file was extended by Axiom build-improvements branch $as_me 2007-04-09, 
which was
  generated by GNU Autoconf 2.60.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
*************** Report bugs to <address@hidden>."
*** 9109,9115 ****
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
! Axiom build-improvements branch config.status 2006-04-07
  configured by $0, generated by GNU Autoconf 2.60,
    with options \\"`echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`\\"
  
--- 9109,9115 ----
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
! Axiom build-improvements branch config.status 2007-04-09
  configured by $0, generated by GNU Autoconf 2.60,
    with options \\"`echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`\\"
  
*** configure.ac        (revision 15444)
--- configure.ac        (local)
***************
*** 1,5 ****
  sinclude(config/axiom.m4)
! AC_INIT([Axiom build-improvements branch], [2006-04-07], 
          address@hidden)
  AC_CONFIG_AUX_DIR(config)
  AC_CONFIG_MACRO_DIR(config)
--- 1,5 ----
  sinclude(config/axiom.m4)
! AC_INIT([Axiom build-improvements branch], [2007-04-09], 
          address@hidden)
  AC_CONFIG_AUX_DIR(config)
  AC_CONFIG_MACRO_DIR(config)
*** configure.ac.pamphlet       (revision 15444)
--- configure.ac.pamphlet       (local)
*************** information:
*** 936,942 ****
  \end{itemize}
  <<Autoconf init>>=
  sinclude(config/axiom.m4)
! AC_INIT([Axiom build-improvements branch], [2006-04-07], 
          address@hidden)
  @
  
--- 936,942 ----
  \end{itemize}
  <<Autoconf init>>=
  sinclude(config/axiom.m4)
! AC_INIT([Axiom build-improvements branch], [2007-04-09], 
          address@hidden)
  @
  
*** src/hyper/Makefile.in       (revision 15444)
--- src/hyper/Makefile.in       (local)
*************** ${HYPER}/pages/ht.db: $(HTADD) $(srcdir)
*** 161,168 ****
                        > ${HYPER}/pages/`basename $$A`; \
             done
        @ rm -f ${HYPER}/pages/ht.db ; \
!           rm -f ${HYPER}/pages/*~ ; \
!         ${HTADD} ${HYPER}/pages/*.ht ${HYPER}/pages/*.pht
        @ cp -pr $(srcdir)/bitmaps ${HYPER}
        @ cp -pr $(srcdir)/viewports $(axiom_target_datadir)
  
--- 161,168 ----
                        > ${HYPER}/pages/`basename $$A`; \
             done
        @ rm -f ${HYPER}/pages/ht.db ; \
!           rm -f ${HYPER}/pages/*~ ; AXIOM=$(AXIOM) \
!         ${HTADD} -s ${HYPER}/pages/*.ht ${HYPER}/pages/*.pht
        @ cp -pr $(srcdir)/bitmaps ${HYPER}
        @ cp -pr $(srcdir)/viewports $(axiom_target_datadir)
  
*** src/hyper/Makefile.pamphlet (revision 15444)
--- src/hyper/Makefile.pamphlet (local)
*************** ${HYPER}/pages/ht.db: $(HTADD) $(srcdir)
*** 287,294 ****
                        > ${HYPER}/pages/`basename $$A`; \
             done
        @ rm -f ${HYPER}/pages/ht.db ; \
!           rm -f ${HYPER}/pages/*~ ; \
!         ${HTADD} ${HYPER}/pages/*.ht ${HYPER}/pages/*.pht
        @ cp -pr $(srcdir)/bitmaps ${HYPER}
        @ cp -pr $(srcdir)/viewports $(axiom_target_datadir)
  
--- 287,294 ----
                        > ${HYPER}/pages/`basename $$A`; \
             done
        @ rm -f ${HYPER}/pages/ht.db ; \
!           rm -f ${HYPER}/pages/*~ ; AXIOM=$(AXIOM) \
!         ${HTADD} -s ${HYPER}/pages/*.ht ${HYPER}/pages/*.pht
        @ cp -pr $(srcdir)/bitmaps ${HYPER}
        @ cp -pr $(srcdir)/viewports $(axiom_target_datadir)
  
*** src/sman/Makefile.in        (revision 15444)
--- src/sman/Makefile.in        (local)
*************** bin_PROGRAMS = session$(EXEEXT) \
*** 17,29 ****
  session_sources = session.c
  session_SOURCES = $(addsuffix .pamphlet, $(session_sources))
  session_objects = $(session_sources:.c=.$(OBJEXT))
! session_LDADD = -L$(build_libdir) -lspad
  session_DEPENDENCIES =
  
  spadclient_sources = spadclient.c
  spadclient_SOURCES = $(addsuffix .pamphlet, $(spadclient_sources))
  spadclient_objects = $(spadclient_sources:.c=.$(OBJEXT))
! spadclient_LDADD = -L$(build_libdir) -lspad
  spadclient_DEPENDENCIES =
  
  sman_sources = sman.c
--- 17,29 ----
  session_sources = session.c
  session_SOURCES = $(addsuffix .pamphlet, $(session_sources))
  session_objects = $(session_sources:.c=.$(OBJEXT))
! session_LDADD = -L$(build_libdir) -lspad @axiom_c_runtime_extra@
  session_DEPENDENCIES =
  
  spadclient_sources = spadclient.c
  spadclient_SOURCES = $(addsuffix .pamphlet, $(spadclient_sources))
  spadclient_objects = $(spadclient_sources:.c=.$(OBJEXT))
! spadclient_LDADD = -L$(build_libdir) -lspad @axiom_c_runtime_extra@
  spadclient_DEPENDENCIES =
  
  sman_sources = sman.c
*** src/sman/Makefile.pamphlet  (revision 15444)
--- src/sman/Makefile.pamphlet  (local)
*************** bin_PROGRAMS = session$(EXEEXT) \
*** 35,47 ****
  session_sources = session.c
  session_SOURCES = $(addsuffix .pamphlet, $(session_sources))
  session_objects = $(session_sources:.c=.$(OBJEXT))
! session_LDADD = -L$(build_libdir) -lspad
  session_DEPENDENCIES =
  
  spadclient_sources = spadclient.c
  spadclient_SOURCES = $(addsuffix .pamphlet, $(spadclient_sources))
  spadclient_objects = $(spadclient_sources:.c=.$(OBJEXT))
! spadclient_LDADD = -L$(build_libdir) -lspad
  spadclient_DEPENDENCIES =
  
  sman_sources = sman.c
--- 35,47 ----
  session_sources = session.c
  session_SOURCES = $(addsuffix .pamphlet, $(session_sources))
  session_objects = $(session_sources:.c=.$(OBJEXT))
! session_LDADD = -L$(build_libdir) -lspad @axiom_c_runtime_extra@
  session_DEPENDENCIES =
  
  spadclient_sources = spadclient.c
  spadclient_SOURCES = $(addsuffix .pamphlet, $(spadclient_sources))
  spadclient_objects = $(spadclient_sources:.c=.$(OBJEXT))
! spadclient_LDADD = -L$(build_libdir) -lspad @axiom_c_runtime_extra@
  spadclient_DEPENDENCIES =
  
  sman_sources = sman.c




reply via email to

[Prev in Thread] Current Thread [Next in Thread]