/[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 43 by ben.allan, Wed Feb 9 17:26:11 2005 UTC revision 44 by ben.allan, Thu Mar 3 07:19:05 2005 UTC
# Line 1361  asc_f77_support_dirs=" Line 1361  asc_f77_support_dirs="
1361  #AWW20041113:    $ascpwd/rsqp  #AWW20041113:    $ascpwd/rsqp
1362  #AWW20041113:    $ascpwd/minos  #AWW20041113:    $ascpwd/minos
1363  #AWW20041113:    $ascpwd/ascend4/archive  #AWW20041113:    $ascpwd/ascend4/archive
1364      $ascpwd/generic/archive      $ascpwd/archive
1365      /afs/cs/project/ascend/depot/@sys/lib      /afs/cs/project/ascend/depot/@sys/lib
1366      /afs/cs/project/ascend/depot/build/obj/conopt      /afs/cs/project/ascend/depot/build/obj/conopt
1367  "  "
# Line 1532  case "$with_fortran$with_blas" in Line 1532  case "$with_fortran$with_blas" in
1532          if test -f $blas_src_file ; then          if test -f $blas_src_file ; then
1533              AC_MSG_RESULT(yes)              AC_MSG_RESULT(yes)
1534  #AWW20041119:            BLASLIB="$ascpwd/ascend4/archive/libascblas.a"  #AWW20041119:            BLASLIB="$ascpwd/ascend4/archive/libascblas.a"
1535              BLASLIB="$ascpwd/../generic/archive/libascblas.a"              BLASLIB="$ascpwd/archive/libascblas.a"
1536          make_blaslib='make-blaslib'          make_blaslib='make-blaslib'
1537  #AWW20041206:       blaslib_makefile="blas/Makefile"  #AWW20041206:       blaslib_makefile="blas/Makefile"
1538          blaslib_makefile="../../blas/Makefile"          blaslib_makefile="blas/Makefile:../../blas/Makefile.in"
1539  #AWW20041206:            asc_subdirs="$asc_subdirs ../blas"  #AWW20041206:            asc_subdirs="$asc_subdirs ../blas"
1540              asc_subdirs="$asc_subdirs ../../blas"              asc_subdirs="$asc_subdirs blas"
1541          else          else
1542              AC_MSG_RESULT(no)              AC_MSG_RESULT(no)
1543              AC_MSG_ERROR([User specified '--with-blas=build' but              AC_MSG_ERROR([User specified '--with-blas=build' but
# Line 1557  case "$with_fortran$with_blas" in Line 1557  case "$with_fortran$with_blas" in
1557              if test -f $blas_src_file ; then              if test -f $blas_src_file ; then
1558                  AC_MSG_RESULT(yes)                  AC_MSG_RESULT(yes)
1559  #AWW20041119:           BLASLIB="$ascpwd/ascend4/archive/libascblas.a"  #AWW20041119:           BLASLIB="$ascpwd/ascend4/archive/libascblas.a"
1560              BLASLIB="$ascpwd/../generic/archive/libascblas.a"              BLASLIB="$ascpwd/archive/libascblas.a"
1561              make_blaslib='make-blaslib'              make_blaslib='make-blaslib'
1562  #AWW20041206:           blaslib_makefile="blas/Makefile"  #AWW20041206:           blaslib_makefile="blas/Makefile"
1563              blaslib_makefile="../../blas/Makefile"              blaslib_makefile="blas/Makefile:../../blas/Makefile.in"
1564  #AWW20041206:           asc_subdirs="$asc_subdirs ../blas"  #AWW20041206:           asc_subdirs="$asc_subdirs ../blas"
1565              asc_subdirs="$asc_subdirs ../../blas"              asc_subdirs="$asc_subdirs blas"
1566              else              else
1567                  AC_MSG_RESULT(no)                  AC_MSG_RESULT(no)
1568              fi              fi
# Line 1614  case "$with_fortran$with_linpack" in Line 1614  case "$with_fortran$with_linpack" in
1614          if test -f $lpak_src_file ; then          if test -f $lpak_src_file ; then
1615              AC_MSG_RESULT(yes)              AC_MSG_RESULT(yes)
1616  #AWW20041119:            LPAKLIB="$ascpwd/ascend4/archive/libasclpak.a"  #AWW20041119:            LPAKLIB="$ascpwd/ascend4/archive/libasclpak.a"
1617              LPAKLIB="$ascpwd/../generic/archive/libasclpak.a"              LPAKLIB="$ascpwd/archive/libasclpak.a"
1618          make_lpaklib='make-lpaklib'          make_lpaklib='make-lpaklib'
1619  #AWW20041206:       lpaklib_makefile="linpack/Makefile"  #AWW20041206:       lpaklib_makefile="linpack/Makefile"
1620          lpaklib_makefile="../../linpack/Makefile"          lpaklib_makefile="linpack/Makefile:../../linpack/Makefile.in"
1621  #AWW20041206:            asc_subdirs="$asc_subdirs ../linpack"  #AWW20041206:            asc_subdirs="$asc_subdirs ../linpack"
1622              asc_subdirs="$asc_subdirs ../../linpack"              asc_subdirs="$asc_subdirs linpack"
1623          else          else
1624              AC_MSG_RESULT(no)              AC_MSG_RESULT(no)
1625              AC_MSG_ERROR([User specified '--with-linpack=build' but              AC_MSG_ERROR([User specified '--with-linpack=build' but
# Line 1639  case "$with_fortran$with_linpack" in Line 1639  case "$with_fortran$with_linpack" in
1639              if test -f $lpak_src_file ; then              if test -f $lpak_src_file ; then
1640                  AC_MSG_RESULT(yes)                  AC_MSG_RESULT(yes)
1641  #AWW20041119:           LPAKLIB="$ascpwd/ascend4/archive/libasclpak.a"  #AWW20041119:           LPAKLIB="$ascpwd/ascend4/archive/libasclpak.a"
1642              LPAKLIB="$ascpwd/../generic/archive/libasclpak.a"              LPAKLIB="$ascpwd/archive/libasclpak.a"
1643              make_lpaklib='make-lpaklib'              make_lpaklib='make-lpaklib'
1644  #AWW20041206:           lpaklib_makefile="linpack/Makefile"  #AWW20041206:           lpaklib_makefile="linpack/Makefile"
1645              lpaklib_makefile="../../linpack/Makefile"              lpaklib_makefile="linpack/Makefile:../../linpack/Makefile.in"
1646  #AWW20041206:           asc_subdirs="$asc_subdirs ../linpack"  #AWW20041206:           asc_subdirs="$asc_subdirs ../linpack"
1647              asc_subdirs="$asc_subdirs ../../linpack"              asc_subdirs="$asc_subdirs linpack"
1648              else              else
1649                  AC_MSG_RESULT(no)                  AC_MSG_RESULT(no)
1650              fi              fi
# Line 1695  case "$with_fortran$with_lsod" in Line 1695  case "$with_fortran$with_lsod" in
1695          if test -f $lsod_src_file ; then          if test -f $lsod_src_file ; then
1696              AC_MSG_RESULT(yes)              AC_MSG_RESULT(yes)
1697  #AWW20041119:            LSODLIB="$ascpwd/ascend4/archive/libinteg.a"  #AWW20041119:            LSODLIB="$ascpwd/ascend4/archive/libinteg.a"
1698              LSODLIB="$ascpwd/../generic/archive/libinteg.a"              LSODLIB="$ascpwd/archive/libinteg.a"
1699          make_lsodlib='make-lsodlib'          make_lsodlib='make-lsodlib'
1700  #AWW20041206:       lsodlib_makefile="lsod/Makefile"  #AWW20041206:       lsodlib_makefile="lsod/Makefile"
1701          lsodlib_makefile="../../lsod/Makefile"          lsodlib_makefile="lsod/Makefile:../../lsod/Makefile.in"
1702  #AWW20041206:            asc_subdirs="$asc_subdirs ../lsod"  #AWW20041206:            asc_subdirs="$asc_subdirs ../lsod"
1703              asc_subdirs="$asc_subdirs ../../lsod"              asc_subdirs="$asc_subdirs lsod"
1704              HAVE_LSOD='-DSTATIC_LSOD'              HAVE_LSOD='-DSTATIC_LSOD'
1705          else          else
1706              AC_MSG_RESULT(no)              AC_MSG_RESULT(no)
# Line 1721  case "$with_fortran$with_lsod" in Line 1721  case "$with_fortran$with_lsod" in
1721              if test -f $lsod_src_file ; then              if test -f $lsod_src_file ; then
1722                  AC_MSG_RESULT(yes)                  AC_MSG_RESULT(yes)
1723  #AWW20041119:           LSODLIB="$ascpwd/ascend4/archive/libinteg.a"  #AWW20041119:           LSODLIB="$ascpwd/ascend4/archive/libinteg.a"
1724              LSODLIB="$ascpwd/../generic/archive/libinteg.a"              LSODLIB="$ascpwd/archive/libinteg.a"
1725              make_lsodlib='make-lsodlib'              make_lsodlib='make-lsodlib'
1726  #AWW20041206:           lsodlib_makefile="lsod/Makefile"  #AWW20041206:           lsodlib_makefile="lsod/Makefile"
1727              lsodlib_makefile="../../lsod/Makefile"              lsodlib_makefile="lsod/Makefile:../../lsod/Makefile.in"
1728  #AWW20041206:           asc_subdirs="$asc_subdirs ../lsod"  #AWW20041206:           asc_subdirs="$asc_subdirs ../lsod"
1729              asc_subdirs="$asc_subdirs ../../lsod"              asc_subdirs="$asc_subdirs lsod"
1730              else              else
1731                  AC_MSG_RESULT(no)                  AC_MSG_RESULT(no)
1732              fi              fi
# Line 1817  if test ! "X$with_tkdir" = "Xno" ; then Line 1817  if test ! "X$with_tkdir" = "Xno" ; then
1817      subdir_file_exists='AscendRC'      subdir_file_exists='AscendRC'
1818  #AWW20041117: FIXME next line  #AWW20041117: FIXME next line
1819  #AWW20041206:    subdir_locations='ascend4/TK'  #AWW20041206:    subdir_locations='ascend4/TK'
1820        subdir_target="TK"  
1821      subdir_locations='../../tcltk98/TK'      subdir_locations='../../tcltk98/TK'
1822      subdir_output='      subdir_output='
1823      $subdir_root/Makefile      $subdir_target/Makefile:$subdir_root/Makefile.in
1824      $subdir_root/Makefile.Rules:$subdir_root/Makefile.Rules.in      $subdir_target/Makefile.Rules:$subdir_root/Makefile.Rules.in
1825      $subdir_root/bitmaps/Makefile      $subdir_target/bitmaps/Makefile:$subdir_root/bitmaps/Makefile.in
1826      $subdir_root/templates/Makefile      $subdir_target/templates/Makefile:$subdir_root/templates/Makefile.in
1827      '      '
1828      for subdir_root in $subdir_locations ; do      for subdir_root in $subdir_locations ; do
1829          if test -f $fullpathsrcdir/$subdir_root/$subdir_file_exists ; then          if test -f $fullpathsrcdir/$subdir_root/$subdir_file_exists ; then
1830  #AWW20041208:       tkdir_root="../$subdir_root"  #AWW20041208:       tkdir_root="../$subdir_root"
1831          tkdir_root="$subdir_root"          tkdir_root=$subdir_target
1832              tkdir_makefiles=`eval echo $subdir_output`              tkdir_makefiles=`eval echo $subdir_output`
1833              tkdir_topbuilddir=`echo "$subdir_root" | sed 's,[[^/][^/]]*,..,g'`              tkdir_topbuilddir="$fullpathsrcdir/../../tcltk98/TK"
1834              break              break
1835          fi          fi
1836      done      done
# Line 1846  if test ! "X$with_models" = "Xno" ; then Line 1847  if test ! "X$with_models" = "Xno" ; then
1847      subdir_file_exists='system.a4l'      subdir_file_exists='system.a4l'
1848  #AWW20041117: FIXME next line  #AWW20041117: FIXME next line
1849  #AWW20041206:    subdir_locations='models ascend4/models'  #AWW20041206:    subdir_locations='models ascend4/models'
1850      subdir_locations='models ../../base/generic/models'      subdir_target="models"
1851        subdir_locations='models ../../models'
1852      subdir_output='      subdir_output='
1853      $subdir_root/Makefile      $subdir_target/Makefile:$subdir_root/Makefile.in
1854      $subdir_root/Makefile.Rules:$subdir_root/Makefile.Rules.in      $subdir_target/Makefile.Rules:$subdir_root/Makefile.Rules.in
1855          $subdir_root/ben/Makefile          $subdir_target/ben/Makefile:$subdir_root/ben/Makefile.in
1856      '      '
1857      ## $subdir_root/examples/Makefile      ## $subdir_root/examples/Makefile
1858      ## $subdir_root/examples/abbott/Makefile      ## $subdir_root/examples/abbott/Makefile
# Line 1863  if test ! "X$with_models" = "Xno" ; then Line 1865  if test ! "X$with_models" = "Xno" ; then
1865      for subdir_root in $subdir_locations ; do      for subdir_root in $subdir_locations ; do
1866          if test -f $fullpathsrcdir/$subdir_root/$subdir_file_exists ; then          if test -f $fullpathsrcdir/$subdir_root/$subdir_file_exists ; then
1867  #AWW20041208:       models_dir_root="../$subdir_root"  #AWW20041208:       models_dir_root="../$subdir_root"
1868          models_dir_root="$subdir_root"          models_dir_root="$subdir_target"
1869              models_makefiles=`eval echo $subdir_output`              models_makefiles=`eval echo $subdir_output`
1870              models_topbuilddir=`echo "$subdir_root" | sed 's,[[^/][^/]]*,..,g'`              models_topbuilddir="$fullpathsrcdir/../../models"
1871              break              break
1872          fi          fi
1873      done      done
# Line 1996  AC_OUTPUT( Line 1998  AC_OUTPUT(
1998         bin/Makefile:../../base/generic/bin/Makefile.in         bin/Makefile:../../base/generic/bin/Makefile.in
1999         compiler/Makefile:../../base/generic/compiler/Makefile.in         compiler/Makefile:../../base/generic/compiler/Makefile.in
2000         general/Makefile:../../base/generic/general/Makefile.in         general/Makefile:../../base/generic/general/Makefile.in
2001         ../../tcltk98/generic/interface/Makefile:../../tcltk98/generic/interface/Makefile.in         interface/Makefile:../../tcltk98/generic/interface/Makefile.in
2002         lib/Makefile:../../base/generic/lib/Makefile.in         lib/Makefile:../../base/generic/lib/Makefile.in
2003         packages/Makefile:../../base/generic/packages/Makefile.in         packages/Makefile:../../base/generic/packages/Makefile.in
2004         solver/Makefile:../../base/generic/solver/Makefile.in         solver/Makefile:../../base/generic/solver/Makefile.in

Legend:
Removed from v.43  
changed lines
  Added in v.44

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