--- configure.orig 2005-10-13 14:35:34.000000000 +0100 +++ configure 2005-10-13 16:38:06.000000000 +0100 @@ -52,6 +52,8 @@ ### ### Removing or attempting to bypass this section in the configure script ### is deemed as agreeing to the conditions outlined in $CCP4/conditions.txt +### unless the --onlylibs flag is passed. + agreed=no ans=n @@ -63,7 +65,20 @@ user=`whoami` fi -### has someone else we (know about) agreed to the ccp4 conditions before? + +# if --onlylibs has been specified, then set agreed to yes +# (a bit of a kludge, but it does the job). +for arg in $* +do + + case $arg in + -onlylibs | --onlylibs | --onlylib) + agreed=yes + ;; + esac +done + +### has someone else (we know about) agreed to the ccp4 conditions before? ### and if so make sure the the home dir has agreement file if test -f .agree2ccp4v6; then eval touch ${HOME}/.agree2ccp4v6; @@ -221,7 +236,8 @@ -onlylibs | --onlylibs | --onlylib | --onlyli | --onlyl | --onlyl | --only | \ --onl | --on | --o) src= ; dotsrc= ; unsupp= ; dotunsupp= ; dotunsuppsrc= ; - disable_mapslicer=yes ; disable_pdb_extract=yes ;; + disable_mapslicer=yes ; disable_pdb_extract=yes + onlylibs=yes ;; -tmpdir=* | --tmpdir=* | --tmpdi=* | --tmpd=* | --tmp=* | --tm=* | t=*) tmpdir=`echo $arg | sed 's/[-a-z_]*=//'` ;; @@ -363,6 +379,8 @@ configdir=${PWD} test "$tmpdir" && TMPDIR=${tmpdir} +echo srcdir bindir libdir $srcdir $bindir $libdir + export libdir RANLIB FC F77 FOPTIM COPTIM XFFLAGS XCFLAGS CC LNS M4 M4FLAGS export CXX XCXXFLAGS CXXOPTIM export SETFLAGS MAKE F INSTALL_PROGRAM INSTALL_DATA XLDFLAGS TMPDIR @@ -531,6 +549,8 @@ badvar=0 # set true if any of the checks fail # fixme: do we need to check BINSORT_MEM? +# Yes you do. +if test -z "$onlylibs" ; then for i in BINSORT_SCR CCP4_SCR CINCL CLIBD CCP4_OPEN PUBLIC_FONT84 \ # BINSORT_MEM do @@ -540,6 +560,7 @@ else true fi done +fi test $badvar -eq 1 && exit 1 || true @@ -552,31 +573,33 @@ # echo "! Beware -- the $system installation isn't properly tested." ; } syswarn='echo; echo "! Beware -- the $system installation is not properly tested."' -for i in CCP4_SCR BINSORT_SCR; do - if ( eval test -d \$$i || eval mkdir \$$i ) ; then : - else - eval echo "! No directory \$$i and can\'t create it." - echo " Check the value of $i." - badvar=1 - fi -done +if test -z $onlylibs ; then + for i in CCP4_SCR BINSORT_SCR; do + if ( eval test -d \$$i || eval mkdir \$$i ) ; then : + else + eval echo "! No directory \$$i and can\'t create it." + echo " Check the value of $i." + badvar=1 + fi + done -for i in libdir bindir; do - if ( eval test -d \$$i || eval mkdir \$$i ) ; then : - else - eval echo "! No directory \$$i and can\'t create it." - echo " Check the argument of --$i." - badvar=1 - fi -done + for i in libdir bindir; do + if ( eval test -d \$$i || eval mkdir \$$i ) ; then : + else + eval echo "! No directory \$$i and can\'t create it." + echo " Check the argument of --$i." + badvar=1 + fi + done -for i in $dotsrc $dotunsupp $dotunsuppsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do - if test -d $i || mkdir $i; then : - else - eval echo "! No directory $i and can\'t create it." - badvar=1 - fi -done + for i in $dotsrc $dotunsupp $dotunsuppsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do + if test -d $i || mkdir $i; then : + else + eval echo "! No directory $i and can\'t create it." + badvar=1 + fi + done +fi ### sanity checks @@ -588,16 +611,17 @@ else true fi -if touch $BINSORT_SCR/binsort$$ ; then - rm $BINSORT_SCR/binsort$$ -else - echo "! Can't create $BINSORT_SCR/binsort$$." - echo " Check the value of BINSORT_SCR." - badvar=1 +if test -z $onlylibs ; then + if touch $BINSORT_SCR/binsort$$ ; then + rm $BINSORT_SCR/binsort$$ + else + echo "! Can't create $BINSORT_SCR/binsort$$." + echo " Check the value of BINSORT_SCR." + badvar=1 + fi + test $badvar -eq 1 && exit 1 || true fi -test $badvar -eq 1 && exit 1 || true - ### Do specific things for each possible system. Note we preserve any ### supplied values of the variables with the ${...:-...} mechanism.