From c5421b77f287df256b90e99a2a57591bb9413aef Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 6 Feb 2006 14:10:26 +0000 Subject: [PATCH] Fix problem with compilation of CASCADE on Mandrake 10.1 : force search for DPS package installation --- config_files/CAS-6.0.sh | 2 ++ config_files/common.sh | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/config_files/CAS-6.0.sh b/config_files/CAS-6.0.sh index 3e8b4da..a21ac98 100755 --- 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 f48202c..a2d877c 100755 --- 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 -- 2.39.2