Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > 8ad34ae091162226fd4d1de7b1eb562d > files > 12

salome-5.1.3-7mdv2010.1.src.rpm

--- src5.1.3/KERNEL_SRC_5.1.3/salome_adm/unix/config_files/check_cas.m4.orig	2010-02-18 19:27:40.672065271 -0200
+++ src5.1.3/KERNEL_SRC_5.1.3/salome_adm/unix/config_files/check_cas.m4	2010-02-18 19:29:11.032227672 -0200
@@ -48,31 +48,6 @@
 occ_ok=no
 config_h=no
 
-dnl libraries directory location
-case $host_os in
-   linux*)
-      casdir=Linux
-      ;;
-   freebsd*)
-      casdir=Linux
-      ;;
-   irix5.*)
-      casdir=Linux
-      ;;
-   irix6.*)
-      casdir=Linux
-      ;;
-   osf*)
-      casdir=Linux
-      ;;
-   solaris2.*)
-      casdir=Linux
-      ;;
-   *)
-      casdir=Linux
-      ;;
-esac
-
 AC_MSG_CHECKING(for OpenCascade directories)
 
 if test -z "$CASROOT"; then
@@ -87,16 +62,11 @@
   done
 fi
 
-if test -d ${CASROOT}/${casdir}/lib; then
-  CAS_LDPATH="-L$CASROOT/$casdir/lib "
+if test -d ${CASROOT}/lib; then
+  CAS_LDPATH="-L$CASROOT/lib "
   AC_MSG_RESULT(yes)
 else
-  if test -d ${CASROOT}/lib; then
-    CAS_LDPATH="-L$CASROOT/lib "
-    AC_MSG_RESULT(yes)
-  else
-    AC_MSG_RESULT(no)
-  fi
+  AC_MSG_RESULT(no)
 fi
 
 
@@ -206,7 +176,7 @@
   CAS_KERNEL="$CAS_LDPATH -lTKernel"
   CAS_MATH="$CAS_LDPATH -lTKMath"
 
-  if test -f $CASROOT/$casdir/lib/libStdPlugin.so ; then
+  if test -f $CASROOT/lib/libStdPlugin.so ; then
     # this libraries are only for CASCADE 5.2.3
     CAS_STDPLUGIN="StdPlugin"
   fi