Fixes to allow compilation on older OS's (Centos 6).

code-saturne · Sep 22, 2019 · fe53eff · fe53eff
1 parent 1f826cf
commit fe53eff
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/configure.ac b/configure.ac
@@ -645,7 +645,11 @@ if test "x$cs_have_dlloader" = "xyes" ; then
 
 fi
 
-# Use long global numbers ?
+# Use RTLD_GLOBAL for dlopen ?
+
+# Note setting enable_dlopen_rtld_global in the last statement is not
+# useful on modern systems but avoids error due to empty else on Centos 6...
+
 AC_ARG_ENABLE(dlopen-rtld-global,
   [AS_HELP_STRING([--enable-dlopen-rtld-global], [add RTLD_GLOBAL to dlopen flags])],
   [
@@ -656,7 +660,7 @@ AC_ARG_ENABLE(dlopen-rtld-global,
       *)   AC_MSG_ERROR([bad value ${enableval} for --enable-dlopen-rtld-global]) ;;
     esac
   ],
-  [ ]
+  [ enable_dlopen_rtld_global=no ]
 )
 
 #------------------------------------------------------------------------------

diff --git a/libple/sbin/bootstrap b/libple/sbin/bootstrap
@@ -26,6 +26,7 @@ case $cs_gettext_version in
   0.17* | 0.18*)
     cp -p configure.ac configure.ac.tmp
     sed -e s/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION\(\[$cs_gettext_version\]\)/g ./configure.ac.tmp > configure.ac
+    rm configure.ac.tmp
     ;;
   *)
     ;;
@@ -80,13 +81,5 @@ else
 
 fi
 
-case $cs_gettext_version in
-  0.17* | 0.18*)
-    \mv configure.ac.tmp configure.ac
-    ;;
-  *)
-    ;;
-esac
-
 # Remove cache directory
 \rm -rf autom4te.cache
diff --git a/sbin/bootstrap b/sbin/bootstrap
@@ -46,6 +46,7 @@ case $cs_gettext_version in
   0.17* | 0.18*)
     cp -p configure.ac configure.ac.tmp
     sed -e s/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION\(\[$cs_gettext_version\]\)/g ./configure.ac.tmp > configure.ac
+    rm configure.ac.tmp
     ;;
   *)
     ;;
@@ -100,14 +101,6 @@ else
 
 fi
 
-case $cs_gettext_version in
-  0.17* | 0.18*)
-    \mv configure.ac.tmp configure.ac
-    ;;
-  *)
-    ;;
-esac
-
 # Remove cache directory
 \rm -rf autom4te.cache