/[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 568 by ben.allan, Thu Apr 27 03:14:08 2006 UTC revision 569 by johnpye, Tue May 9 00:10:03 2006 UTC
# Line 92  fi Line 92  fi
92  ##AWW   Key elements of the source tree are:  ##AWW   Key elements of the source tree are:
93  ##AWW       code/trunk/trunk/base/unixAC213/configure  ##AWW       code/trunk/trunk/base/unixAC213/configure
94  ##AWW       code/trunk/trunk/base/generic  ##AWW       code/trunk/trunk/base/generic
95  ##AWW       code/trunk/tcltk98  ##AWW       code/trunk/tcltk
96  ##AWW   where $srcdir is pointing to /home/me/trunk/base/unixAC213, the folder  ##AWW   where $srcdir is pointing to /home/me/trunk/base/unixAC213, the folder
97  ##AWW   containing "configure"  ##AWW   containing "configure"
98  ##AWW  ##AWW
# Line 104  fi Line 104  fi
104  ##AWW       $srcdir/../generic/packages  ##AWW       $srcdir/../generic/packages
105  ##AWW       $srcdir/../generic/solver  ##AWW       $srcdir/../generic/solver
106  ##AWW       $srcdir/../generic/utilities  ##AWW       $srcdir/../generic/utilities
107  ##AWW       $srcdir/../../tcltk98/generic/interface  ##AWW       $srcdir/../../tcltk/generic/interface
108  ##AWW  ##AWW
109  ##AWW   Each of these directories contain Makefiles and possible  ##AWW   Each of these directories contain Makefiles and possible
110  ##AWW   need to find .h files in the other directories.  For example  ##AWW   need to find .h files in the other directories.  For example
# Line 118  fi Line 118  fi
118  ##AWW    ##AWW  
119  ##AWW   If in compiler, general, packages, solver, utilities  ##AWW   If in compiler, general, packages, solver, utilities
120  ##AWW       ..                        for general, packages, etc  ##AWW       ..                        for general, packages, etc
121  ##AWW       ../../../tcltk98/generic  for interface  ##AWW       ../../../tcltk/generic  for interface
122  ##AWW   If in interface  ##AWW   If in interface
123  ##AWW       ..                        for interface  ##AWW       ..                        for interface
124  ##AWW       ../../../base/generic        for compiler, general, ..  ##AWW       ../../../base/generic        for compiler, general, ..
# Line 297  AC_SUBST(parser_src) Line 297  AC_SUBST(parser_src)
297  #   2. If `flex' was found, see if it understands -V.  If so,  #   2. If `flex' was found, see if it understands -V.  If so,
298  #      set `scanner_src' and `typer_src' to have `flex' generate  #      set `scanner_src' and `typer_src' to have `flex' generate
299  #      the C files from the flex input files  #      the C files from the flex input files
300  #      base/generic/compiler/scanner.l & tcltk98/interface/typelex.l  #      base/generic/compiler/scanner.l & tcltk/interface/typelex.l
301  #      We don't need to look for libfl.a since we define  #      We don't need to look for libfl.a since we define
302  #      yywrap() ourselves.  #      yywrap() ourselves.
303  #   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 327  fi Line 327  fi
327  if test -z "$LEX" ; then  if test -z "$LEX" ; then
328      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.
329      Using pregenerated C files for base/generic/compiler/scanner.l      Using pregenerated C files for base/generic/compiler/scanner.l
330      and tcltk98/interface/typelex.l.  If you have flex 2.4.1      and tcltk/interface/typelex.l.  If you have flex 2.4.1
331      or newer, set the LEX environment variable to its location      or newer, set the LEX environment variable to its location
332      and run configure again.])      and run configure again.])
333      scanner_src="scanner.c.from.c"      scanner_src="scanner.c.from.c"
# Line 1370  if test ! "X$with_tkdir" = "Xno" ; then Line 1370  if test ! "X$with_tkdir" = "Xno" ; then
1370  #AWW20041117: FIXME next line  #AWW20041117: FIXME next line
1371  #AWW20041206:    subdir_locations='ascend4/TK'  #AWW20041206:    subdir_locations='ascend4/TK'
1372      subdir_target="TK"        subdir_target="TK"  
1373      subdir_locations='../../tcltk98/TK'      subdir_locations='../../tcltk/TK'
1374      subdir_output='      subdir_output='
1375      $subdir_target/Makefile:$subdir_root/Makefile.in      $subdir_target/Makefile:$subdir_root/Makefile.in
1376      $subdir_target/Makefile.Rules:$subdir_root/Makefile.Rules.in      $subdir_target/Makefile.Rules:$subdir_root/Makefile.Rules.in
# Line 1382  if test ! "X$with_tkdir" = "Xno" ; then Line 1382  if test ! "X$with_tkdir" = "Xno" ; then
1382  #AWW20041208:       tkdir_root="../$subdir_root"  #AWW20041208:       tkdir_root="../$subdir_root"
1383          tkdir_root=$subdir_target          tkdir_root=$subdir_target
1384              tkdir_makefiles=`eval echo $subdir_output`              tkdir_makefiles=`eval echo $subdir_output`
1385              tkdir_topbuilddir="$fullpathsrcdir/../../tcltk98/TK"              tkdir_topbuilddir="$fullpathsrcdir/../../tcltk/TK"
1386              break              break
1387          fi          fi
1388      done      done
# Line 1609  AC_OUTPUT( Line 1609  AC_OUTPUT(
1609         bin/Makefile:../../base/generic/bin/Makefile.in         bin/Makefile:../../base/generic/bin/Makefile.in
1610         compiler/Makefile:../../base/generic/compiler/Makefile.in         compiler/Makefile:../../base/generic/compiler/Makefile.in
1611         general/Makefile:../../base/generic/general/Makefile.in         general/Makefile:../../base/generic/general/Makefile.in
1612         interface/Makefile:../../tcltk98/generic/interface/Makefile.in         interface/Makefile:../../tcltk/generic/interface/Makefile.in
1613         lib/Makefile:../../base/generic/lib/Makefile.in         lib/Makefile:../../base/generic/lib/Makefile.in
1614         packages/Makefile:../../base/generic/packages/Makefile.in         packages/Makefile:../../base/generic/packages/Makefile.in
1615         solver/Makefile:../../base/generic/solver/Makefile.in         solver/Makefile:../../base/generic/solver/Makefile.in
1616         utilities/Makefile:../../base/generic/utilities/Makefile.in         utilities/Makefile:../../base/generic/utilities/Makefile.in
1617         utilities/config.h:../../base/generic/utilities/config.h.in         utilities/config.h:../../base/generic/utilities/config.h.in
1618         ../../jam/Jamrules         ../../jam/Jamrules
1619         ../../tcltk98/generic/Jamrules_tcltk98         ../../tcltk/generic/Jamrules_tcltk
1620         $tkdir_makefiles         $tkdir_makefiles
1621         $models_makefiles         $models_makefiles
1622         $help_makefiles         $help_makefiles

Legend:
Removed from v.568  
changed lines
  Added in v.569

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