/[ascend]/trunk/base/unixAC213/configure.in
ViewVC logotype

Diff of /trunk/base/unixAC213/configure.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 17 by aw0a, Fri Nov 19 15:08:44 2004 UTC revision 18 by aw0a, Tue Dec 7 20:53:37 2004 UTC
# Line 77  fi Line 77  fi
77  ##AWW   Current directory one is in:    /home/me/a4/asc4  ##AWW   Current directory one is in:    /home/me/a4/asc4
78  ##AWW   Directory containing configure: /home/me/a4/asc4  ##AWW   Directory containing configure: /home/me/a4/asc4
79  ##AWW   Command to invoke configure:    ./configure  ##AWW   Command to invoke configure:    ./configure
80  ##AWW   $ascpwd will be: /home/me/a4/asc4  ##AWW       $ascpwd will be: /home/me/a4/asc4
81  ##AWW   $srcdir will be: .  ##AWW       $srcdir will be: .
82  ##AWW  ##AWW
83  ##AWW   Example 2 (different directories, abs path for command)  ##AWW   Example 2 (different directories, abs path for command)
84  ##AWW   Current directory one is in:    /home/me/a4/tmp  ##AWW   Current directory one is in:    /home/me/a4/tmp
85  ##AWW   Directory containing configure: /home/me/a4/asc4  ##AWW   Directory containing configure: /home/me/a4/asc4
86  ##AWW   Command to invoke configure:    /home/me/a4/asc4/configure  ##AWW   Command to invoke configure:    /home/me/a4/asc4/configure
87  ##AWW   $ascpwd will be: /home/me/a4/tmp  ##AWW       $ascpwd will be: /home/me/a4/tmp
88  ##AWW   $srcdir will be: /home/me/a4/asc4  ##AWW       $srcdir will be: /home/me/a4/asc4
89  ##AWW  ##AWW
90  ##AWW   Example 3 (different directories, rel path for command)  ##AWW   Example 3 (different directories, rel path for command)
91  ##AWW   Same as Example 2  ##AWW   Same as Example 2
92  ##AWW   Command to invoke configure:    ../asc4/configure  ##AWW   Command to invoke configure:    ../asc4/configure
93  ##AWW   $ascpwd will be: /home/me/a4/tmp (same as in Example 2)  ##AWW       $ascpwd will be: /home/me/a4/tmp (same as in Example 2)
94  ##AWW   $srcdir will be: ../asc4  ##AWW       $srcdir will be: ../asc4
95    ##AWW
96    ##AWW   Key elements of the source tree are:
97    ##AWW       base/unixAC213/configure
98    ##AWW       base/generic
99    ##AWW       tcltk98
100    ##AWW   where $ascdir is pointing to base/unixAC213, the folder
101    ##AWW   containing "configure"
102    ##AWW
103    ##AWW   Configure is located at:
104    ##AWW       $srcdir/configure
105    ##AWW   while the .c/.h files one wants are in:
106    ##AWW       $srcdir/../generic/compiler
107    ##AWW       $srcdir/../generic/general
108    ##AWW       $srcdir/../generic/packages
109    ##AWW       $srcdir/../generic/solver
110    ##AWW       $srcdir/../generic/utilities
111    ##AWW       $srcdir/../../tcltk98/generic/interface
112    ##AWW
113    ##AWW   Each of these directories contain Makefiles and possible
114    ##AWW   need to find .h files in the other directories.  For example
115    ##AWW   the include statements are always of the form
116    ##AWW       #include compiler/slv3.h or
117    ##AWW       #include interface/SlvProc.h
118    ##AWW
119    ##AWW   A safe include path should assume one is a directory with any
120    ##AWW   of these .h and .c files and one needs to find a .h file in
121    ##AWW   any other of them.  The following paths should do it.  
122    ##AWW  
123    ##AWW   If in compiler, general, packages, solver, utilities
124    ##AWW       ..             for general, packages, etc
125    ##AWW       ../../../tcltk98  for interface
126    ##AWW   If in interface
127    ##AWW       ..             for interface
128    ##AWW       ../../base/generic  for compiler, general, packages, ...
129    ##AWW
130  #--------------------------------------------------------------------  #--------------------------------------------------------------------
131    
132  ascpwd=`pwd`  ascpwd=`pwd`
# Line 324  fi Line 359  fi
359  #   2. If `flex' was found, see if it understands -V.  If so,  #   2. If `flex' was found, see if it understands -V.  If so,
360  #      set `scanner_src' and `typer_src' to have `flex' generate  #      set `scanner_src' and `typer_src' to have `flex' generate
361  #      the C files from the flex input files  #      the C files from the flex input files
362  #      ascend4/compiler/scanner.l & ascend4/interface/typelex.l  #      base/generic/compiler/scanner.l & tcltk98/interface/typelex.l
363  #      We don't need to look for libfl.a since we define  #      We don't need to look for libfl.a since we define
364  #      yywrap() ourselves.  #      yywrap() ourselves.
365  #   3. If `flex' wasn't found or was found but isn't new enough:  #   3. If `flex' wasn't found or was found but isn't new enough:
# Line 352  fi Line 387  fi
387    
388  if test -z "$LEX" ; then  if test -z "$LEX" ; then
389      AC_MSG_WARN([Cannot find a flex lexer version 2.4.1 or greater.      AC_MSG_WARN([Cannot find a flex lexer version 2.4.1 or greater.
390      Using pregenerated C files for ascend4/compiler/scanner.l      Using pregenerated C files for base/generic/compiler/scanner.l
391      and ascend4/interface/typelex.l.  If you have flex 2.4.1      and tcltk98/interface/typelex.l.  If you have flex 2.4.1
392      or newer, set the LEX environment variable to its location      or newer, set the LEX environment variable to its location
393      and run configure again.])      and run configure again.])
394      scanner_src="scanner.c.from.c"      scanner_src="scanner.c.from.c"
# Line 1486  case "$with_fortran$with_blas" in Line 1521  case "$with_fortran$with_blas" in
1521      #  Fortran is enabled and the user specified --with-blas=build      #  Fortran is enabled and the user specified --with-blas=build
1522      #  For a search for BLAS source code and tell the Makefile      #  For a search for BLAS source code and tell the Makefile
1523      #  to build it; useful for testing configure.      #  to build it; useful for testing configure.
1524          blas_src_file="$srcdir/blas/dcopy.f"  #AWW20041206:        blas_src_file="$srcdir/blas/dcopy.f"
1525            blas_src_file="$srcdir/../../blas/dcopy.f"
1526          AC_MSG_CHECKING([for blas source file $blas_src_file ])          AC_MSG_CHECKING([for blas source file $blas_src_file ])
1527          if test -f $blas_src_file ; then          if test -f $blas_src_file ; then
1528              AC_MSG_RESULT(yes)              AC_MSG_RESULT(yes)
1529  #AWW20041119:            BLASLIB="$ascpwd/ascend4/archive/libascblas.a"  #AWW20041119:            BLASLIB="$ascpwd/ascend4/archive/libascblas.a"
1530              BLASLIB="$ascpwd/../generic/archive/libascblas.a"              BLASLIB="$ascpwd/../generic/archive/libascblas.a"
1531          make_blaslib='make-blaslib'          make_blaslib='make-blaslib'
1532          blaslib_makefile="blas/Makefile"  #AWW20041206:       blaslib_makefile="blas/Makefile"
1533              asc_subdirs="$asc_subdirs ../blas"          blaslib_makefile="../../blas/Makefile"
1534    #AWW20041206:            asc_subdirs="$asc_subdirs ../blas"
1535                asc_subdirs="$asc_subdirs ../../blas"
1536          else          else
1537              AC_MSG_RESULT(no)              AC_MSG_RESULT(no)
1538              AC_MSG_ERROR([User specified '--with-blas=build' but              AC_MSG_ERROR([User specified '--with-blas=build' but
# Line 1508  case "$with_fortran$with_blas" in Line 1546  case "$with_fortran$with_blas" in
1546      #  fails, look for BLAS source code; if that also fails,      #  fails, look for BLAS source code; if that also fails,
1547      #  disable all Fortran and print a warning.      #  disable all Fortran and print a warning.
1548          AC_PATH_PROGS(BLASLIB, libblas.a libascblas.a, , $asc_f77_support_dirs)          AC_PATH_PROGS(BLASLIB, libblas.a libascblas.a, , $asc_f77_support_dirs)
1549          blas_src_file="$srcdir/blas/dcopy.f"          blas_src_file="$srcdir/../../blas/dcopy.f"
1550          if test -z "$BLASLIB" -a -n "$blas_src_file" ; then          if test -z "$BLASLIB" -a -n "$blas_src_file" ; then
1551              AC_MSG_CHECKING([for blas source file $blas_src_file ])              AC_MSG_CHECKING([for blas source file $blas_src_file ])
1552              if test -f $blas_src_file ; then              if test -f $blas_src_file ; then
1553                  AC_MSG_RESULT(yes)                  AC_MSG_RESULT(yes)
1554  #AWW20031119:           BLASLIB="$ascpwd/ascend4/archive/libascblas.a"  #AWW20041119:           BLASLIB="$ascpwd/ascend4/archive/libascblas.a"
1555              BLASLIB="$ascpwd/../generic/archive/libascblas.a"              BLASLIB="$ascpwd/../generic/archive/libascblas.a"
1556              make_blaslib='make-blaslib'              make_blaslib='make-blaslib'
1557              blaslib_makefile="blas/Makefile"  #AWW20041206:           blaslib_makefile="blas/Makefile"
1558              asc_subdirs="$asc_subdirs ../blas"              blaslib_makefile="../../blas/Makefile"
1559    #AWW20041206:           asc_subdirs="$asc_subdirs ../blas"
1560                asc_subdirs="$asc_subdirs ../../blas"
1561              else              else
1562                  AC_MSG_RESULT(no)                  AC_MSG_RESULT(no)
1563              fi              fi
# Line 1564  case "$with_fortran$with_linpack" in Line 1604  case "$with_fortran$with_linpack" in
1604      #  Fortran is enabled and the user specified --with-linpack=build      #  Fortran is enabled and the user specified --with-linpack=build
1605      #  For a search for LINPACK source code and tell the Makefile      #  For a search for LINPACK source code and tell the Makefile
1606      #  to build it; useful for testing configure.      #  to build it; useful for testing configure.
1607          lpak_src_file="$srcdir/linpack/d1mach.f"          lpak_src_file="$srcdir/../../linpack/d1mach.f"
1608          AC_MSG_CHECKING([for linpack source file $lpak_src_file ])          AC_MSG_CHECKING([for linpack source file $lpak_src_file ])
1609          if test -f $lpak_src_file ; then          if test -f $lpak_src_file ; then
1610              AC_MSG_RESULT(yes)              AC_MSG_RESULT(yes)
1611  #AWW20041119:            LPAKLIB="$ascpwd/ascend4/archive/libasclpak.a"  #AWW20041119:            LPAKLIB="$ascpwd/ascend4/archive/libasclpak.a"
1612              LPAKLIB="$ascpwd/../generic/archive/libasclpak.a"              LPAKLIB="$ascpwd/../generic/archive/libasclpak.a"
1613          make_lpaklib='make-lpaklib'          make_lpaklib='make-lpaklib'
1614          lpaklib_makefile="linpack/Makefile"  #AWW20041206:       lpaklib_makefile="linpack/Makefile"
1615              asc_subdirs="$asc_subdirs ../linpack"          lpaklib_makefile="../../linpack/Makefile"
1616    #AWW20041206:            asc_subdirs="$asc_subdirs ../linpack"
1617                asc_subdirs="$asc_subdirs ../../linpack"
1618          else          else
1619              AC_MSG_RESULT(no)              AC_MSG_RESULT(no)
1620              AC_MSG_ERROR([User specified '--with-linpack=build' but              AC_MSG_ERROR([User specified '--with-linpack=build' but
# Line 1586  case "$with_fortran$with_linpack" in Line 1628  case "$with_fortran$with_linpack" in
1628      #  fails, look for LINPACK source code; if that also fails,      #  fails, look for LINPACK source code; if that also fails,
1629      #  disable all Fortran and print a warning.      #  disable all Fortran and print a warning.
1630          AC_PATH_PROGS(LPAKLIB, liblpak.a libasclpak.a, , $asc_f77_support_dirs)          AC_PATH_PROGS(LPAKLIB, liblpak.a libasclpak.a, , $asc_f77_support_dirs)
1631          lpak_src_file="$srcdir/linpack/d1mach.f"          lpak_src_file="$srcdir/../../linpack/d1mach.f"
1632          if test -z "$LPAKLIB" -a -n "$lpak_src_file" ; then          if test -z "$LPAKLIB" -a -n "$lpak_src_file" ; then
1633              AC_MSG_CHECKING([for linpack source file $lpak_src_file ])              AC_MSG_CHECKING([for linpack source file $lpak_src_file ])
1634              if test -f $lpak_src_file ; then              if test -f $lpak_src_file ; then
# Line 1594  case "$with_fortran$with_linpack" in Line 1636  case "$with_fortran$with_linpack" in
1636  #AWW20041119:           LPAKLIB="$ascpwd/ascend4/archive/libasclpak.a"  #AWW20041119:           LPAKLIB="$ascpwd/ascend4/archive/libasclpak.a"
1637              LPAKLIB="$ascpwd/../generic/archive/libasclpak.a"              LPAKLIB="$ascpwd/../generic/archive/libasclpak.a"
1638              make_lpaklib='make-lpaklib'              make_lpaklib='make-lpaklib'
1639              lpaklib_makefile="linpack/Makefile"  #AWW20041206:           lpaklib_makefile="linpack/Makefile"
1640              asc_subdirs="$asc_subdirs ../linpack"              lpaklib_makefile="../../linpack/Makefile"
1641    #AWW20041206:           asc_subdirs="$asc_subdirs ../linpack"
1642                asc_subdirs="$asc_subdirs ../../linpack"
1643              else              else
1644                  AC_MSG_RESULT(no)                  AC_MSG_RESULT(no)
1645              fi              fi
# Line 1641  case "$with_fortran$with_lsod" in Line 1685  case "$with_fortran$with_lsod" in
1685      #  Fortran is enabled and the user specified --with-lsod=build      #  Fortran is enabled and the user specified --with-lsod=build
1686      #  For a search for LSOD source code and tell the Makefile      #  For a search for LSOD source code and tell the Makefile
1687      #  to build it; useful for testing configure.      #  to build it; useful for testing configure.
1688          lsod_src_file="$srcdir/lsod/lsode.f"          lsod_src_file="$srcdir/../../lsod/lsode.f"
1689          AC_MSG_CHECKING([for lsod source file $lsod_src_file ])          AC_MSG_CHECKING([for lsod source file $lsod_src_file ])
1690          if test -f $lsod_src_file ; then          if test -f $lsod_src_file ; then
1691              AC_MSG_RESULT(yes)              AC_MSG_RESULT(yes)
1692  #AWW20041119:            LSODLIB="$ascpwd/ascend4/archive/libinteg.a"  #AWW20041119:            LSODLIB="$ascpwd/ascend4/archive/libinteg.a"
1693              LSODLIB="$ascpwd/../generic/archive/libinteg.a"              LSODLIB="$ascpwd/../generic/archive/libinteg.a"
1694          make_lsodlib='make-lsodlib'          make_lsodlib='make-lsodlib'
1695          lsodlib_makefile="lsod/Makefile"  #AWW20041206:       lsodlib_makefile="lsod/Makefile"
1696              asc_subdirs="$asc_subdirs ../lsod"          lsodlib_makefile="../../lsod/Makefile"
1697    #AWW20041206:            asc_subdirs="$asc_subdirs ../lsod"
1698                asc_subdirs="$asc_subdirs ../../lsod"
1699              HAVE_LSOD='-DSTATIC_LSOD'              HAVE_LSOD='-DSTATIC_LSOD'
1700          else          else
1701              AC_MSG_RESULT(no)              AC_MSG_RESULT(no)
# Line 1664  case "$with_fortran$with_lsod" in Line 1710  case "$with_fortran$with_lsod" in
1710      #  for LSOD source code; if that also fails, disable LSOD      #  for LSOD source code; if that also fails, disable LSOD
1711      #  and print a warning.      #  and print a warning.
1712          AC_PATH_PROGS(LSODLIB, libinteg.a libasclsod.a, , $asc_f77_support_dirs)          AC_PATH_PROGS(LSODLIB, libinteg.a libasclsod.a, , $asc_f77_support_dirs)
1713          lsod_src_file="$srcdir/lsod/lsode.f"          lsod_src_file="$srcdir/../../lsod/lsode.f"
1714          if test -z "$LSODLIB" -a -n "$lsod_src_file" ; then          if test -z "$LSODLIB" -a -n "$lsod_src_file" ; then
1715              AC_MSG_CHECKING([for lsod source file $lsod_src_file ])              AC_MSG_CHECKING([for lsod source file $lsod_src_file ])
1716              if test -f $lsod_src_file ; then              if test -f $lsod_src_file ; then
# Line 1672  case "$with_fortran$with_lsod" in Line 1718  case "$with_fortran$with_lsod" in
1718  #AWW20041119:           LSODLIB="$ascpwd/ascend4/archive/libinteg.a"  #AWW20041119:           LSODLIB="$ascpwd/ascend4/archive/libinteg.a"
1719              LSODLIB="$ascpwd/../generic/archive/libinteg.a"              LSODLIB="$ascpwd/../generic/archive/libinteg.a"
1720              make_lsodlib='make-lsodlib'              make_lsodlib='make-lsodlib'
1721              lsodlib_makefile="lsod/Makefile"  #AWW20041206:           lsodlib_makefile="lsod/Makefile"
1722              asc_subdirs="$asc_subdirs ../lsod"              lsodlib_makefile="../../lsod/Makefile"
1723    #AWW20041206:           asc_subdirs="$asc_subdirs ../lsod"
1724                asc_subdirs="$asc_subdirs ../../lsod"
1725              else              else
1726                  AC_MSG_RESULT(no)                  AC_MSG_RESULT(no)
1727              fi              fi
# Line 1761  AC_ARG_WITH(tkdir, Line 1809  AC_ARG_WITH(tkdir,
1809  if test ! "X$with_tkdir" = "Xno" ; then  if test ! "X$with_tkdir" = "Xno" ; then
1810      subdir_file_exists='AscendRC'      subdir_file_exists='AscendRC'
1811  #AWW20041117: FIXME next line  #AWW20041117: FIXME next line
1812      subdir_locations='ascend4/TK'  #AWW20041206:    subdir_locations='ascend4/TK'
1813        subdir_locations='../tcltk98/TK'
1814      subdir_output='      subdir_output='
1815      $subdir_root/Makefile      $subdir_root/Makefile
1816      $subdir_root/Makefile.Rules:$subdir_root/Makefile.Rules.in      $subdir_root/Makefile.Rules:$subdir_root/Makefile.Rules.in
# Line 1788  AC_ARG_WITH(models, Line 1837  AC_ARG_WITH(models,
1837  if test ! "X$with_models" = "Xno" ; then  if test ! "X$with_models" = "Xno" ; then
1838      subdir_file_exists='system.a4l'      subdir_file_exists='system.a4l'
1839  #AWW20041117: FIXME next line  #AWW20041117: FIXME next line
1840      subdir_locations='models ascend4/models'  #AWW20041206:    subdir_locations='models ascend4/models'
1841        subdir_locations='models ../../base/generic/models'
1842      subdir_output='      subdir_output='
1843      $subdir_root/Makefile      $subdir_root/Makefile
1844      $subdir_root/Makefile.Rules:$subdir_root/Makefile.Rules.in      $subdir_root/Makefile.Rules:$subdir_root/Makefile.Rules.in
# Line 1903  AC_SUBST(models_topbuilddir) Line 1953  AC_SUBST(models_topbuilddir)
1953  AC_SUBST(help_dir_root)  AC_SUBST(help_dir_root)
1954  AC_SUBST(help_topbuilddir)  AC_SUBST(help_topbuilddir)
1955    
1956  AC_OUTPUT(  #AWW20041129:   In the following macro, replace the following
1957    #AWW20041129:   in the call.
1958    #AWW20041129:
1959  #AWW20041113:   ascend4/ConfigAscend:ascend4/ConfigAscend.in  #AWW20041113:   ascend4/ConfigAscend:ascend4/ConfigAscend.in
1960  #AWW20041113:   ascend4/Makefile  #AWW20041113:   ascend4/Makefile
1961  #AWW20041113:   ascend4/bin/ascend4.sh  #AWW20041113:   ascend4/bin/ascend4.sh
# Line 1917  AC_OUTPUT( Line 1969  AC_OUTPUT(
1969  #AWW20041113:   ascend4/packages/Makefile  #AWW20041113:   ascend4/packages/Makefile
1970  #AWW20041113:   ascend4/solver/Makefile  #AWW20041113:   ascend4/solver/Makefile
1971  #AWW20041113:   ascend4/utilities/Makefile  #AWW20041113:   ascend4/utilities/Makefile
1972      ../generic/ConfigAscend:../generic/ConfigAscend.in  #AWW20041129:
1973      ../generic/Makefile  #AWW20041129:   and remove the following
1974      ../generic/bin/../generic.sh  #AWW20041129:
1975      ../generic/Makefile.Rules:../generic/Makefile.Rules.in  #AWW20041117:   $rsqplib_makefile
1976      ../generic/archive/Makefile  #AWW20041117:   $conoptlib_makefile
1977      ../generic/bin/Makefile  #AWW20041117:   $minoslib_makefile
1978      ../generic/compiler/Makefile  
1979      ../generic/general/Makefile  
1980      ../generic/interface/Makefile  AC_OUTPUT(
1981      ../generic/lib/Makefile      ../../base/generic/ConfigAscend:../../base/generic/ConfigAscend.in
1982      ../generic/packages/Makefile      ../../base/generic/Makefile
1983      ../generic/solver/Makefile      ../../base/generic/bin/ascend4.sh
1984      ../generic/utilities/Makefile      ../../base/generic/Makefile.Rules:../../base/generic/Makefile.Rules.in
1985        ../../base/generic/archive/Makefile
1986        ../../base/generic/bin/Makefile
1987        ../../base/generic/compiler/Makefile
1988        ../../base/generic/general/Makefile
1989        ../../tcltk98/generic/interface/Makefile
1990        ../../base/generic/lib/Makefile
1991        ../../base/generic/packages/Makefile
1992        ../../base/generic/solver/Makefile
1993        ../../base/generic/utilities/Makefile
1994      $tkdir_makefiles      $tkdir_makefiles
1995      $models_makefiles      $models_makefiles
1996      $help_makefiles      $help_makefiles
1997          $blaslib_makefile          $blaslib_makefile
1998      $lpaklib_makefile      $lpaklib_makefile
1999      $lsodlib_makefile      $lsodlib_makefile
 #AWW20041117:   $rsqplib_makefile  
 #AWW20041117:   $conoptlib_makefile  
 #AWW20041117:   $minoslib_makefile  
2000      )      )

Legend:
Removed from v.17  
changed lines
  Added in v.18

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22