From 4c9d3aa7763e6cba9f6d1ee08d1b7abf32524a6f Mon Sep 17 00:00:00 2001
From: Yvan Fournier <yvan.fournier@noreply.code-saturne.org>
Date: Tue, 30 Jun 2015 09:40:55 +0000
Subject: [PATCH] Minor updates to build system.

git-svn-id: https://svn.isais.edf.fr/mfee/saturne/trunk@7777 e44c5d27-f830-0410-8ce8-974f7a764be6
---
 configure.ac   |  7 +++----
 sbin/bootstrap | 13 +++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 33880914d1..85d71014db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -308,8 +308,7 @@ fi
 # take effect whether the result is true or not (maybe due to a bug),
 # so we directly use autoconf's enable_shared variable.
 
-if test "x$cs_ibm_bg_type" = "xP" \
-   -o "$host_os" = mingw32 ; then
+if test "$host_os" = mingw32 ; then
    enable_shared=no
 fi
 AC_SUBST(enable_shared)
@@ -410,7 +409,7 @@ AC_ARG_ENABLE(long-gnum,
 )
 
 if test "x$cs_have_long_gnum" = "xyes"; then
-  AC_DEFINE([HAVE_LONG_GNUM],1,[Use 64-bit type if available for fvm_gnum_t.])
+  AC_DEFINE([HAVE_LONG_GNUM],1,[Use 64-bit type if available for cs_gnum_t.])
 fi
 AC_SUBST(cs_have_long_gnum)
 
@@ -1045,7 +1044,7 @@ if test x$cs_have_frontend = xno ; then
 else
   echo " use graphical user interface: "$cs_have_gui""
 fi
-echo " use long integers: "$cs_have_long_gnum""
+echo " use long global numbers: "$cs_have_long_gnum""
 echo " Zlib (gzipped file) support: "$cs_have_zlib""
 echo " MPI (Message Passing Interface) support: "$cs_have_mpi""
 if (test x$cs_have_mpi = xyes) ; then
diff --git a/sbin/bootstrap b/sbin/bootstrap
index c6cfc7af5c..ef139a6c85 100755
--- a/sbin/bootstrap
+++ b/sbin/bootstrap
@@ -12,14 +12,15 @@ ls preprocessor/*/*.c src/*/*.c* | grep -v user_examples > po/POTFILES.in
 
 # Remove unversioned files added by previous bootstrap
 
+for f in `ls ./build-aux` ; do
+  case $f in
+    *.py | catalyst) ;;
+    *) rm -rf $d/build-aux/*$ ;;
+  esac
+done
+
 for d in . libple
 do
-  for f in `ls $d/build-aux` ; do
-    case $f in
-      *.py | catalyst) ;;
-      *) rm -rf $d/build-aux/*$ ;;
-    esac
-  done
   rm -rf $d/m4/codeset.m4 $d/m4/fcntl-o.m4 $d/m4/gettext.m4 \
          $d/m4/glibc2.m4 $d/m4/glibc21.m4 $d/m4/iconv.m4 $d/m4/intdiv0.m4 \
          $d/m4/intl.m4 $d/m4/intldir.m4 $d/m4/intlmacosx.m4 $d/m4/intmax.m4 \