[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323

[Bernhard R. Link]

The following commit has been merged in the cleanedupstream branch:
commit d17ff12dbd0d3d1267bd809cc44f1ca0a705e6de
Author: Hans Schoenemann <hannes at mathematik.uni-kl.de>
Date:   Mon Feb 27 18:47:26 2012 +0100

    fix: callgfanlib must be build after factory

diff --git a/configure b/configure
index d5806f2..57a1a5d 100755
--- a/configure
+++ b/configure
@@ -2276,20 +2276,6 @@ fi
   fi
 fi
 
-echo $ac_n "checking whether to configure and build gfan lib""... $ac_c" 1>&6
-echo "configure:2286: checking whether to configure and build gfan lib" >&5
-if test "$enable_gfanlib" = yes; then
-  if test -d gfanlib; then
-    echo "$ac_t""yes" 1>&6
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS gfanlib callgfanlib"
-    BUILD1_SUBDIRS="$BUILD1_SUBDIRS gfanlib callgfanlib"
-  else
-    echo "$ac_t""no" 1>&6
-  fi
-else
-  echo "$ac_t""no" 1>&6
-fi
-
 # Check whether we have gmp
 if test "$ac_gmp_ok" != yes; then
   { echo "configure: error: can not find gmp" 1>&2; exit 1; }
@@ -2554,6 +2540,20 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
+echo $ac_n "checking whether to configure and build gfan lib""... $ac_c" 1>&6
+echo "configure:2286: checking whether to configure and build gfan lib" >&5
+if test "$enable_gfanlib" = yes; then
+  if test -d gfanlib; then
+    echo "$ac_t""yes" 1>&6
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS gfanlib callgfanlib"
+    BUILD1_SUBDIRS="$BUILD1_SUBDIRS gfanlib callgfanlib"
+  else
+    echo "$ac_t""no" 1>&6
+  fi
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 echo $ac_n "checking whether to configure and build sgroup lib""... $ac_c" 1>&6
 echo "configure:2603: checking whether to configure and build sgroup lib" >&5
 if test "$enable_sgroup" = yes; then
diff --git a/configure.in b/configure.in
index 5a6beb0..3253aa1 100644
--- a/configure.in
+++ b/configure.in
@@ -359,19 +359,6 @@ fi
   fi
 fi
 
-AC_MSG_CHECKING(whether to configure and build gfan lib)
-if test "$enable_gfanlib" = yes; then
-  if test -d gfanlib; then
-    AC_MSG_RESULT(yes)
-    CONFIG_SUBDIRS="$CONFIG_SUBDIRS gfanlib callgfanlib"
-    BUILD1_SUBDIRS="$BUILD1_SUBDIRS gfanlib callgfanlib"
-  else
-    AC_MSG_RESULT(no)
-  fi
-else
-  AC_MSG_RESULT(no)
-fi
-
 # Check whether we have gmp
 if test "$ac_gmp_ok" != yes; then
   AC_MSG_ERROR(can not find gmp)
@@ -506,6 +493,19 @@ else
   AC_MSG_RESULT(no)
 fi
 
+AC_MSG_CHECKING(whether to configure and build gfan lib)
+if test "$enable_gfanlib" = yes; then
+  if test -d gfanlib; then
+    AC_MSG_RESULT(yes)
+    CONFIG_SUBDIRS="$CONFIG_SUBDIRS gfanlib callgfanlib"
+    BUILD1_SUBDIRS="$BUILD1_SUBDIRS gfanlib callgfanlib"
+  else
+    AC_MSG_RESULT(no)
+  fi
+else
+  AC_MSG_RESULT(no)
+fi
+
 AC_MSG_CHECKING(whether to configure and build sgroup lib)
 dnl 
 dnl only sgroup if explicietely requested

-- 
an open source computer algebra system