Fedora 6 support

[tools/install.git] / config_files / med-2.2.3.sh

diff --git a/config_files/med-2.2.3.sh b/config_files/med-2.2.3.sh
index b642fdf21c1c8be11b3e1eb64be1bb02fdfea92a..45d3de5b3e9f66c62be53207d2c0a6a7b5c0cf45 100755 (executable)
--- a/config_files/med-2.2.3.sh
+++ b/config_files/med-2.2.3.sh
@@ -75,24 +75,26 @@ check_jb tar xfz ${SOURCE_DIR}/med_fichier2.2.3.src.tar.gz -C ${INSTALL_WORK}
 cd ${PRODUCT_WORK}
 makedir ${PRODUCT_DIR}
 
-#vsr: provide additional flags for f95 (Mandriva 2006.0, Fedora Core 4)
-is_mandriva=0
-is_fedora=0
-if [ -e /etc/redhat-release ] ; then
-  grep -e "Mandriva Linux release 2006.0" /etc/redhat-release > /dev/null
-  if [ $? == 0 ] ; then is_mandriva=1 ; fi
-  grep -e "Fedora Core release 4" /etc/redhat-release > /dev/null
-  if [ $? == 0 ] ; then is_fedora=1 ; fi
+# check if -ffixed-line-length-none option is supported
+is_fixed_length=0
+cat > ${PRODUCT_WORK}/__test.f <<EOF
+       program test
+       print *,'TEST'
+       end
+EOF
+
+gcc -c -ffixed-line-length-none ${PRODUCT_WORK}/__test.f >/dev/null 2>&1
+if [ $? == 0 ] ; then is_fixed_length=1 ; fi
+rm -f ${PRODUCT_WORK}/__test.*
+
+flags=""
+if test `uname -m` = "x86_64" ; then
+    flags="$flags CFLAGS=-m64 CXXFLAGS=-m64"
 fi
 
-if [ $is_mandriva == 1 ] || [ $is_fedora == 1 ] ; then
-    if test `uname -m` = "x86_64" ; then
-    echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} FFLAGS='-g -O2 -ffixed-line-length-none' CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG"
-    ./configure --prefix=${PRODUCT_DIR} FFLAGS="-g -O2 -ffixed-line-length-none" CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${INSTALL_WORK}/errlog
-    else
-    echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} FFLAGS='-g -O2 -ffixed-line-length-none' >> ${PRODUCT_DIR}/CONFIGURE.LOG"
-    ./configure --prefix=${PRODUCT_DIR} FFLAGS="-g -O2 -ffixed-line-length-none" >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${INSTALL_WORK}/errlog
-    fi
+if [ $is_fixed_length == 1 ] ; then
+    echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} FFLAGS='-g -O2 -ffixed-line-length-none' $flags >> ${PRODUCT_DIR}/CONFIGURE.LOG"
+    ./configure --prefix=${PRODUCT_DIR} FFLAGS="-g -O2 -ffixed-line-length-none" $flags >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${INSTALL_WORK}/errlog
     if [ "$?" -ne "0" ] ; then
       cat ${PRODUCT_DIR}/CONFIGURE.LOG
       cat ${INSTALL_WORK}/errlog >&2
@@ -100,7 +102,7 @@ if [ $is_mandriva == 1 ] || [ $is_fedora == 1 ] ; then
       exit 1
     fi
 else
-    check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix=${PRODUCT_DIR}
+    check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix=${PRODUCT_DIR} $flags
 fi
 
 GCC=`which gcc`