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

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

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

revision 367 by johnpye, Wed Mar 8 05:23:02 2006 UTC revision 368 by johnpye, Fri Mar 10 08:39:24 2006 UTC
# Line 1083  if test "X$with_f77libs" = X_searching ; Line 1083  if test "X$with_f77libs" = X_searching ;
1083      #  based on the system type.      #  based on the system type.
1084      AC_MSG_RESULT([checking for fortran libraries based on system type])      AC_MSG_RESULT([checking for fortran libraries based on system type])
1085      case "$host" in      case "$host" in
         alpha-dec-osf*)  
             AC_CHECK_LIB(for, for_lle, [F77LIBS="$F77LIBS -lfor"], , $F77LIBS)  
             AC_CHECK_LIB(ots, _OtsFill, [F77LIBS="$F77LIBS -lots"], , $F77LIBS)  
             AC_CHECK_LIB(Ufor, etime_, [F77LIBS="$F77LIBS -lUfor"], , $F77LIBS)  
             ;;  
         mips-dec-ultrix*)  
             AC_CHECK_LIB(for, for_lle, [F77LIBS="$F77LIBS -lfor"], , $F77LIBS)  
             ;;  
1086          hppa1.1-hp-hpux*)          hppa1.1-hp-hpux*)
1087              AC_CHECK_LIB(cl, FTN_QATAN, [F77LIBS="$F77LIBS -lcl"], , $F77LIBS)              AC_CHECK_LIB(cl, FTN_QATAN, [F77LIBS="$F77LIBS -lcl"], , $F77LIBS)
1088              ;;              ;;
# Line 1544  dnl >>>>        fi Line 1536  dnl >>>>        fi
1536  dnl >>>>    done  dnl >>>>    done
1537  dnl >>>>fi  dnl >>>>fi
1538    
1539    #-----------------------------------------------
1540    # DYNAMIC_LINKING or STATIC_LINKING ?
1541    
1542    AC_MSG_CHECKING([for package linking])
1543    
1544    AC_ARG_ENABLE(dynamic-linking, AC_HELP_STRING([--enable-dynamic-packages],
1545        [Enable dynamic linking of ASCEND external packages (default is YES for Linux, Cygwin and MinGW; NO for any other platform)])
1546    ,
1547        if test $enableval; then
1548            dynlinking=1
1549        else
1550            dynlinking=0
1551        fi
1552    ,
1553        dynlinking="_def"
1554    )
1555    
1556    if test "X$dynlinking" = "X_def"; then
1557        case $host in
1558            *-*-cygwin* | *-*-mingw* | *linux* ) dynlinking=1;;
1559            *) dynlinking=0;;
1560        esac
1561    fi
1562    
1563    if test "X$dynlinking" = "X1"; then
1564        AC_MSG_RESULT([DYNAMIC])
1565        AC_DEFINE(DYNAMIC_PACKAGES)
1566    else
1567        AC_MSG_RESULT([STATIC])
1568    fi
1569    
1570    
1571  #--------------------------------------------------------------------  #--------------------------------------------------------------------
1572  #   The variables we substitute into the Makefile.in files  #   The variables we substitute into the Makefile.in files
# Line 1553  AC_SUBST(ascpwd) Line 1576  AC_SUBST(ascpwd)
1576  AC_SUBST(fullpathsrcdir)  AC_SUBST(fullpathsrcdir)
1577  AC_SUBST(asc_include)  AC_SUBST(asc_include)
1578  AC_SUBST(CC)  AC_SUBST(CC)
1579    AC_SUBST(DEFS)
1580  AC_SUBST(CFLAGS)  AC_SUBST(CFLAGS)
1581  AC_SUBST(LEX)  AC_SUBST(LEX)
1582  AC_SUBST(LEXLIB)  AC_SUBST(LEXLIB)
# Line 1607  AC_SUBST(models_topbuilddir) Line 1631  AC_SUBST(models_topbuilddir)
1631  AC_SUBST(help_dir_root)  AC_SUBST(help_dir_root)
1632  AC_SUBST(help_topbuilddir)  AC_SUBST(help_topbuilddir)
1633    
 #AWW20041129:   In the following macro, replace the following  
 #AWW20041129:   in the call.  
 #AWW20041129:  
 #AWW20041113:   ascend4/ConfigAscend:ascend4/ConfigAscend.in  
 #AWW20041113:   ascend4/Makefile  
 #AWW20041113:   ascend4/bin/ascend4.sh  
 #AWW20041113:   ascend4/Makefile.Rules:ascend4/Makefile.Rules.in  
 #AWW20041113:   ascend4/archive/Makefile  
 #AWW20041113:   ascend4/bin/Makefile  
 #AWW20041113:   ascend4/compiler/Makefile  
 #AWW20041113:   ascend4/general/Makefile  
 #AWW20041113:   ascend4/interface/Makefile  
 #AWW20041113:   ascend4/lib/Makefile  
 #AWW20041113:   ascend4/packages/Makefile  
 #AWW20041113:   ascend4/solver/Makefile  
 #AWW20041113:   ascend4/utilities/Makefile  
 #AWW20041129:  
 #AWW20041129:   and remove the following  
 #AWW20041129:  
 #AWW20041117:   $rsqplib_makefile  
 #AWW20041117:   $conoptlib_makefile  
 #AWW20041117:   $minoslib_makefile  
   
 #AWW20041216:   Mark suggested using the following - except for last  
 #AWW20041216:   except for last six items. Do they matter?  
1634  AC_OUTPUT(  AC_OUTPUT(
1635         ConfigAscend:../../base/generic/ConfigAscend.in         ConfigAscend:../../base/generic/ConfigAscend.in
1636         Makefile:../../base/generic/Makefile.in         Makefile:../../base/generic/Makefile.in
# Line 1655  AC_OUTPUT( Line 1654  AC_OUTPUT(
1654         $lpaklib_makefile         $lpaklib_makefile
1655         $lsodlib_makefile         $lsodlib_makefile
1656         )         )
   
 #AC_OUTPUT(  
 #   ../../base/generic/ConfigAscend:../../base/generic/ConfigAscend.in  
 #   ../../base/generic/Makefile  
 #   ../../base/generic/bin/ascend4.sh  
 #   ../../base/generic/Makefile.Rules:../../base/generic/Makefile.Rules.in  
 #   ../../base/generic/archive/Makefile  
 #   ../../base/generic/bin/Makefile  
 #   ../../base/generic/compiler/Makefile  
 #   ../../base/generic/general/Makefile  
 #   ../../tcltk98/generic/interface/Makefile  
 #   ../../base/generic/lib/Makefile  
 #   ../../base/generic/packages/Makefile  
 #   ../../base/generic/solver/Makefile  
 #   ../../base/generic/utilities/Makefile  
 #   $tkdir_makefiles  
 #   $models_makefiles  
 #   $help_makefiles  
 #        $blaslib_makefile  
 #   $lpaklib_makefile  
 #   $lsodlib_makefile  
 #   )  

Legend:
Removed from v.367  
changed lines
  Added in v.368

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