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
|
Author: Alastair McKinstry <mckinstry@debian.org>
Description: Fixes needed for autoreconf to work on Debian
When autoreconf is run, VL_LIB_READLINE is lost from aclocal, so included in config/
Also include AX_CHECK_COMPLER_FLAG() which is not in autoconf (just autoconf-archive)
AX_CHECK_COMPILER_FLAGS() is obsolete
Last-Updated: 2011-09-05
Forwarded: no
Index: silo-llnl-4.8/configure.ac
===================================================================
--- silo-llnl-4.8.orig/configure.ac 2011-09-09 20:02:41.000000000 +0100
+++ silo-llnl-4.8/configure.ac 2011-09-09 21:14:41.000000000 +0100
@@ -362,6 +362,9 @@
dnl
dnl Alastair McKinstry, Fri Aug 25 17:24:00 BST 2011
dnl Add version script support.
+dnl
+dnl Alastair McKinstry Mon Sep 5 09:55:00 IST 2011
+dnl Add AC_PROG_F77 needed for autoreconf to work.
dnl --------------------------------------------------------------------------
dnl
@@ -409,6 +412,8 @@
dnl This allows multiple src-dir builds within one host.
AC_PREFIX_DEFAULT("SILO_TOP_SRC_DIR")
+AC_PROG_F77
+
dnl
dnl Handle the python module right away to determine if we need shared libs.
dnl Ordinarily, we default to static libs
@@ -772,10 +777,10 @@
# it is an argument to the -D argument. So, I think this is
# just totally bogus!
# Default to large file support
-AX_CHECK_COMPILER_FLAGS("-D_LARGEFILE_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE";)
-AX_CHECK_COMPILER_FLAGS("-D_LARGEFILE64_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE";)
-AX_CHECK_COMPILER_FLAGS("-D_FILE_OFFSET_BITS=64",CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64";)
-AX_CHECK_COMPILER_FLAGS("-Wdeclaration-after-statement",CFLAGS="$CFLAGS -Wdeclaration-after-statement";)
+AX_CHECK_COMPILE_FLAG("-D_LARGEFILE_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE";)
+AX_CHECK_COMPILE_FLAG("-D_LARGEFILE64_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE";)
+AX_CHECK_COMPILE_FLAG("-D_FILE_OFFSET_BITS=64",CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64";)
+AX_CHECK_COMPILE_FLAG("-Wdeclaration-after-statement",CFLAGS="$CFLAGS -Wdeclaration-after-statement";)
#
# Note: regardless of what the stuff above regarding large file support
@@ -1463,12 +1468,12 @@
tools/silex/Makefile
tools/silock/Makefile
silo.pc])
-if test -n "$HZIP"; then
- AC_CONFIG_FILES([src/hzip/Makefile])
-fi
-if test -n "$FPZIP"; then
- AC_CONFIG_FILES([src/fpzip/Makefile])
-fi
+#if test -n "$HZIP"; then
+# AC_CONFIG_FILES([src/hzip/Makefile])
+#fi
+#if test -n "$FPZIP"; then
+# AC_CONFIG_FILES([src/fpzip/Makefile])
+#fi
if test -n "$HDF5_DRV"; then
AC_CONFIG_FILES([src/libsiloh5.settings])
else
Index: silo-llnl-4.8/src/Makefile.am
===================================================================
--- silo-llnl-4.8.orig/src/Makefile.am 2011-09-09 20:02:41.000000000 +0100
+++ silo-llnl-4.8/src/Makefile.am 2011-09-09 20:02:41.000000000 +0100
@@ -75,17 +75,17 @@
DRIVER_DIRS += taurus
DRIVER_LIBS += taurus/libsilo_taurus.la
endif
-if HZIP_NEEDED
-DRIVER_DIRS += hzip
-DRIVER_LIBS += hzip/libsilo_hzip.la
-endif
-if FPZIP_NEEDED
-DRIVER_DIRS += fpzip
-DRIVER_LIBS += fpzip/libsilo_fpzip.la
-endif
+#if HZIP_NEEDED
+#DRIVER_DIRS += hzip
+#DRIVER_LIBS += hzip/libsilo_hzip.la
+#endif
+#if FPZIP_NEEDED
+#DRIVER_DIRS += fpzip
+#DRIVER_LIBS += fpzip/libsilo_fpzip.la
+#endif
SUBDIRS = score pdb silo debug \
$(DRIVER_DIRS) unknown filters .
-DIST_SUBDIRS = . debug filters hdf5_drv hzip netcdf \
+DIST_SUBDIRS = . debug filters hdf5_drv netcdf \
pdb pdb_drv pdbp_drv score silo taurus unknown
MAKESETTINGS = make.settings
|