--- configure	2009-08-07 12:11:28.000000000 +0200
+++ configure.new.nolib	2009-08-17 22:30:39.000000000 +0200
@@ -3113,41 +3113,6 @@
     RX_L="$configdir/lib/rxdispencer/rx"
     export RX_H RX_L
   fi
-  echo 
-  echo "Running separate configure for CCIF library."
-  echo
-  cd lib/ccif
-  echo "Updating modification times for configuration files"
-  echo "Please wait..."
-  for i in configure.in aclocal.m4 configure Makefile.in; do
-    touch $i && sleep 1   
-  done
-  echo "...done."      
-
-  if [ "X$LIBFOPTIM" != "X" ]; then
-    FOPTIM_save=$FOPTIM
-    FOPTIM=$LIBFOPTIM
-    FFLAGS="${FOPTIM} ${XFFLAGS}"
-  fi
-  if [ "X$LIBCOPTIM" != "X" ]; then
-    COPTIM_save=$COPTIM
-    COPTIM=$LIBCOPTIM
-    CFLAGS="${COPTIM} ${XCFLAGS}"
-  fi
-  ( touch /tmp/$$.cache_file 2>/dev/null && \
-    cat /dev/null > /tmp/$$.cache_file && \
-    ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif --cache-file=/tmp/$$.cache_file ) || \
-    ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif
-  rm -f /tmp/$$.cache_file
-  if [ "X$LIBFOPTIM" != "X" ]; then
-    FOPTIM=$FOPTIM_save
-    FFLAGS="${FOPTIM} ${XFFLAGS}"
-  fi
-  if [ "X$LIBCOPTIM" != "X" ]; then
-    COPTIM=$COPTIM_save
-    CFLAGS="${COPTIM} ${XCFLAGS}"
-  fi
-  cd ../..
   echo
   echo "Returning to main configure."
   echo
@@ -5094,53 +5059,6 @@
   echo "configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}"
   ./configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir} 
   echo
-  echo "CCP4 configure: Running separate configure for libjwc_c library."
-  echo
-  cd ${srcdir}/${xwindir}/libjwc/libjwc_c
-  echo "Updating modification times for configuration files in libjwc_c"
-  echo "Please wait..."
-  for i in configure.in Makefile.am aclocal.m4 configure Makefile.in ltconfig ltmain.sh; do
-    touch $i && sleep 1
-  done
-  echo "...done."
-  echo
-  echo "configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}"
-  ( touch /tmp/$$.cache_file 2>/dev/null && \
-    cat /dev/null > /tmp/$$.cache_file && \
-    ./configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir} --cache-file=/tmp/$$.cache_file ) || \
-    ./configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}
-  rm -f /tmp/$$.cache_file
-  echo
-  echo "CCP4 configure: Running separate configure for libjwc_f library."
-  echo
-  cd ${srcdir}/${xwindir}/libjwc/libjwc_f
-  # for g77 3.1 some builds do not have no-common for system libs,
-  # so disable for now
-  echo "Updating modification times for configuration files in libjwc_f"
-  echo "Please wait..."
-  for i in configure.in Makefile.am aclocal.m4 configure Makefile.in ltconfig ltmain.sh; do
-    touch $i && sleep 1
-  done
-  echo "...done."
-  echo
-  # for g77 3.1 some builds do not have no-common for system libs,
-  # so disable for now
-  case $system in
-  Darwin* )
-    echo "configure --disable-shared --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}"
-    ( touch /tmp/$$.cache_file 2>/dev/null && \
-      cat /dev/null > /tmp/$$.cache_file && \
-      ./configure --disable-shared --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir} --cache-file=/tmp/$$.cache_file ) || \
-      ./configure --disable-shared --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}
-    ;;
-  * )
-    echo "configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}"
-    ( touch /tmp/$$.cache_file 2>/dev/null && \
-      cat /dev/null > /tmp/$$.cache_file && \
-      ./configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir} --cache-file=/tmp/$$.cache_file ) || \
-      ./configure $xopts --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}
-  esac
-  rm -f /tmp/$$.cache_file
 
   if test "$non_shared" = yes; then
 #this is a bit of a cheat/fudge but that's life!
@@ -5210,12 +5128,6 @@
   fi
 
   echo
-  echo "CCP4 configure: Running separate configure for Mosflm"
-  echo
-  cd ${srcdir}/${mosflmdir}
-  echo "configure $xopts --with-ccp4-prefix=${prefix} --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}"
-  ./configure $xopts --with-ccp4-prefix=${prefix} --exec_prefix=${prefix} --prefix=${prefix} --bindir=${bindir} --libdir=${libdir}
-  echo
   cd ../..
   echo "Returning to main configure."
   echo