/[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 20 by aw0a, Tue Dec 7 20:53:37 2004 UTC revision 21 by aw0a, Thu Dec 9 02:03:34 2004 UTC
# Line 1783  esac Line 1783  esac
1783  #   $fullpathsrcdir is the full path to the source directory.  If  #   $fullpathsrcdir is the full path to the source directory.  If
1784  #   that file exists, we  #   that file exists, we
1785  #   * Set <package>_dir_root to ../$subdir_root.  The "../" is  #   * Set <package>_dir_root to ../$subdir_root.  The "../" is
1786  #     needed since this value is used in the `ascend4' directory  #AWW20041208:#    needed since this value is used in the `ascend4' directory
1787  #     and $subdir_root is relative to the parent of `ascend4'.  #     needed since this value is used in the `generic' directory
1788    #AWW20041208:#    and $subdir_root is relative to the parent of `ascend4'.
1789    #     and $subdir_root is relative to the parent of `generic'.
1790  #   * Substitute the value of $subdir_root into `subdir_output'  #   * Substitute the value of $subdir_root into `subdir_output'
1791  #     and set the result to <package>_makefiles: the list of  #     and set the result to <package>_makefiles: the list of
1792  #     Makefiles for configure to generate.  #     Makefiles for configure to generate.
# Line 1810  if test ! "X$with_tkdir" = "Xno" ; then Line 1812  if test ! "X$with_tkdir" = "Xno" ; then
1812      subdir_file_exists='AscendRC'      subdir_file_exists='AscendRC'
1813  #AWW20041117: FIXME next line  #AWW20041117: FIXME next line
1814  #AWW20041206:    subdir_locations='ascend4/TK'  #AWW20041206:    subdir_locations='ascend4/TK'
1815      subdir_locations='../tcltk98/TK'      subdir_locations='../../tcltk98/TK'
1816      subdir_output='      subdir_output='
1817      $subdir_root/Makefile      $subdir_root/Makefile
1818      $subdir_root/Makefile.Rules:$subdir_root/Makefile.Rules.in      $subdir_root/Makefile.Rules:$subdir_root/Makefile.Rules.in
# Line 1819  if test ! "X$with_tkdir" = "Xno" ; then Line 1821  if test ! "X$with_tkdir" = "Xno" ; then
1821      '      '
1822      for subdir_root in $subdir_locations ; do      for subdir_root in $subdir_locations ; do
1823          if test -f $fullpathsrcdir/$subdir_root/$subdir_file_exists ; then          if test -f $fullpathsrcdir/$subdir_root/$subdir_file_exists ; then
1824          tkdir_root="../$subdir_root"  #AWW20041208:       tkdir_root="../$subdir_root"
1825            tkdir_root="$subdir_root"
1826              tkdir_makefiles=`eval echo $subdir_output`              tkdir_makefiles=`eval echo $subdir_output`
1827              tkdir_topbuilddir=`echo "$subdir_root" | sed 's,[[^/][^/]]*,..,g'`              tkdir_topbuilddir=`echo "$subdir_root" | sed 's,[[^/][^/]]*,..,g'`
1828              break              break
# Line 1854  if test ! "X$with_models" = "Xno" ; then Line 1857  if test ! "X$with_models" = "Xno" ; then
1857      ## $subdir_root/pending/libraries/Makefile      ## $subdir_root/pending/libraries/Makefile
1858      for subdir_root in $subdir_locations ; do      for subdir_root in $subdir_locations ; do
1859          if test -f $fullpathsrcdir/$subdir_root/$subdir_file_exists ; then          if test -f $fullpathsrcdir/$subdir_root/$subdir_file_exists ; then
1860          models_dir_root="../$subdir_root"  #AWW20041208:       models_dir_root="../$subdir_root"
1861            models_dir_root="$subdir_root"
1862              models_makefiles=`eval echo $subdir_output`              models_makefiles=`eval echo $subdir_output`
1863              models_topbuilddir=`echo "$subdir_root" | sed 's,[[^/][^/]]*,..,g'`              models_topbuilddir=`echo "$subdir_root" | sed 's,[[^/][^/]]*,..,g'`
1864              break              break
Legend:
Removed from v.20  
changed lines
  Added in v.21
john.pye@anu.edu.au
 ViewVC Help
Powered by ViewVC 1.1.22