blob: 1e59578473ffb137c9f1d2d39e88c98fc9bb17cb (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
|
--- 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
|
GitWeb