PR: packaging: from salome.smesh import smeshBuilder

[modules/smesh.git] / adm_local / unix / config_files / check_cgns.m4

diff --git a/adm_local/unix/config_files/check_cgns.m4 b/adm_local/unix/config_files/check_cgns.m4
index 75f85221ea04c452ce89f99fca186c7afdedadad..4e25e27c6e5c0ebe774a0c3009cb13764c49cf2e 100644 (file)
--- a/adm_local/unix/config_files/check_cgns.m4
+++ b/adm_local/unix/config_files/check_cgns.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+dnl Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 dnl
 dnl Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -44,32 +44,37 @@ cgns_ok=no
 LOCAL_INCLUDES=""
 LOCAL_LIBS="-lcgns $HDF5_LIBS"
 
-if test -z $CGNSHOME
-then
-   AC_MSG_WARN(undefined CGNSHOME variable which specify CGNS library installation directory)
-   AC_PATH_PROG(BINDIR, cgnsversion)
-   if test "x$BINDIR" != "x" ; then
-      CGNSHOME=$BINDIR
-      CGNSHOME=`echo ${CGNSHOME} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
-      CGNSHOME=`echo ${CGNSHOME} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
-   fi
-fi
-if test ! -z $CGNSHOME
-then
-   LOCAL_INCLUDES="-I$CGNSHOME/include"
-   if test "x$CGNSHOME" != "x/usr"; then
-     LOCAL_LIBS="-L$CGNSHOME/lib $LOCAL_LIBS"
-   fi
-fi
+if test "x$CGNSHOME" != "xno"; then
+    if test "x$CGNSHOME" == "xyes"; then
+        CGNSHOME=""
+    fi
+    if test -z $CGNSHOME
+    then
+        AC_MSG_WARN(undefined CGNSHOME variable which specify CGNS library installation directory)
+        AC_PATH_PROG(BINDIR, cgnsversion)
+        if test "x$BINDIR" != "x" ; then
+            CGNSHOME=$BINDIR
+            CGNSHOME=`echo ${CGNSHOME} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
+            CGNSHOME=`echo ${CGNSHOME} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
+        fi
+    fi
+    if test ! -z $CGNSHOME
+    then
+        LOCAL_INCLUDES="-I$CGNSHOME/include"
+        if test "x$CGNSHOME" != "x/usr"; then
+            LOCAL_LIBS="-L$CGNSHOME/lib $LOCAL_LIBS"
+        fi
+    fi
 
 dnl check cgnslib header
 
-CPPFLAGS_old=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES"
+    CPPFLAGS_old=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES"
 
-AC_CHECK_HEADER(cgnslib.h,cgns_ok=yes ,cgns_ok=no)
+    AC_CHECK_HEADER(cgnslib.h,cgns_ok=yes ,cgns_ok=no)
 
-CPPFLAGS=$CPPFLAGS_old
+    CPPFLAGS=$CPPFLAGS_old
+fi
 
 if  test "x$cgns_ok" = "xyes"
 then
@@ -88,11 +93,11 @@ if  test "x$cgns_ok" = "xyes"
 then
   CGNS_LIBS="$LOCAL_LIBS"
   CGNS_INCLUDES="$LOCAL_INCLUDES"
-  #CPPFLAGS="-DWITH_CGNS $CPPFLAGS"
+  CPPFLAGS="-DWITH_CGNS $CPPFLAGS"
 fi
 
 AC_MSG_RESULT(for CGNS: $cgns_ok)
 
-#AM_CONDITIONAL(WITH_CGNS, [test x"$cgns_ok" = xyes])
+AM_CONDITIONAL(WITH_CGNS, [test x"$cgns_ok" = xyes])
 
 ])dnl