Fix problem with compilation of CASCADE on Mandrake 10.1 : force search for DPS packa...

diff --git a/config_files/CAS-6.0.sh b/config_files/CAS-6.0.sh
index 3e8b4dae59c97496e0a3e6fb753efd7b6ecdad25..a21ac985517ff8923f005e5545fd3e2d18292599 100755 (executable)
--- a/config_files/CAS-6.0.sh
+++ b/config_files/CAS-6.0.sh
@@ -91,6 +91,8 @@ tcldir="`where_tcl`"
 if [ $? -eq 0 ] ; then flags="$flags --with-tcl=$tcldir"; fi
 tkdir="`where_tk`"
 if [ $? -eq 0 ] ; then flags="$flags --with-tk=$tkdir"; fi
+dpsdir="`where_dps`"
+if [ $? -eq 0 ] ; then flags="$flags --with-dps-include=$dpsdir/include --with-dps-library=$dpsdir/lib"; fi
 flags="$flags --disable-debug --enable-production"
 
 export CASROOT=${PRODUCT_WORK}

diff --git a/config_files/common.sh b/config_files/common.sh
index f48202c07f3f103e8f0e77fcf224dfa4af439ecc..a2d877c65d738093fa43d97d07883b3e98aba640 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -471,6 +471,19 @@ else
 fi
 }
 
+where_dps(){
+if test -f /usr/X11R6/include/DPS/dpsconfig.h ; then
+    echo "/usr/X11R6"
+    return 0
+fi
+if test -f /usr/include/DPS/dpsconfig.h ; then
+    echo "/usr"
+    return 0
+fi
+echo ""
+return 1
+}
+
 modif_la_files(){
 ldir=$1
 if [ -z "$ldir" ] || [ ! -d "$ldir" ]; then return 1; fi