Changeset 287cc8 in git for ntl/src/DoConfig

Timestamp:

Jan 5, 2010, 5:51:13 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

3c38b3810fd61108b01f123f5a91e13ccff52b20

Parents:

1d43d184dd871d77c1ba8e095d768f22a0fbe92f

Message:

ntl 5.5.2

git-svn-id: file:///usr/local/Singular/svn/trunk@12402 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• ntl/src/DoConfig (modified) (3 diffs)

ntl/src/DoConfig

@@ -86 +86 @@
 
 
+%Variable = ();
+
+
 foreach $arg (@ARGV) {
 
@@ -94 +97 @@
 
    if (($name, $val) = ($arg =~ /(.*?)=(.*)/)) {
+
+      $Variable{$name} = 0;
       
       if (exists($MakeFlag{$name}) && ($val =~ 'on|off')) {
@@ -139 +144 @@
 }
 
-# a special MakeVal value that is determined by NTL_GMP_LIP 
-# and NTL_GMP_HACK
-
+# special GMP variables
+
+$MakeVal{'GMPI'} = '# ';
+$MakeVal{'GMPL'} = '# ';
+$MakeVal{'GMP'} =  '# ';
 
 if ($ConfigFlag{'NTL_GMP_LIP'} eq 'on' || $ConfigFlag{'NTL_GMP_HACK'} eq 'on') {
    $MakeVal{'GMP'} = '';
-}
-else {
-   $MakeVal{'GMP'} = '# ';
-}
-
-# a special MakeVal value that is determined by NTL_GF2X_LIB
+   if (exists($Variable{'DEF_PREFIX'}) ||
+       exists($Variable{'GMP_PREFIX'}) ||
+       exists($Variable{'GMP_INCDIR'})) {
+      $MakeVal{'GMPI'} = '';
+   }
+   if (exists($Variable{'DEF_PREFIX'}) ||
+       exists($Variable{'GMP_PREFIX'}) ||
+       exists($Variable{'GMP_LIBDIR'})) {
+      $MakeVal{'GMPL'} = '';
+   }
+}
+
+# special GF2X variables
+
+
+$MakeVal{'GF2XI'} = '# ';
+$MakeVal{'GF2XL'} = '# ';
+$MakeVal{'GF2X'} =  '# ';
 
 
 if ($ConfigFlag{'NTL_GF2X_LIB'} eq 'on') {
    $MakeVal{'GF2X'} = '';
-}
-else {
-   $MakeVal{'GF2X'} = '# ';
+   if (exists($Variable{'DEF_PREFIX'}) ||
+       exists($Variable{'GF2X_PREFIX'}) ||
+       exists($Variable{'GF2X_INCDIR'})) {
+      $MakeVal{'GF2XI'} = '';
+   }
+   if (exists($Variable{'DEF_PREFIX'}) ||
+       exists($Variable{'GF2X_PREFIX'}) ||
+       exists($Variable{'GF2X_LIBDIR'})) {
+      $MakeVal{'GF2XL'} = '';
+   }
 }