Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'play-with-config'

  • Loading branch information...
commit 3434dfc911dedf8fcbaf5124afbaa5bab31bd5d3 2 parents fa3880e + e45efe0
@andreww authored
Showing with 1,077 additions and 1,323 deletions.
  1. +4 −0 RELEASE
  2. +15 −4 config/aclocal.m4
  3. +15 −4 config/m4/fortran.m4
  4. +1,037 −1,315 configure
  5. +6 −0 release.sh
View
4 RELEASE
@@ -7,8 +7,12 @@ DoX/Versioning.md
wcml/test/test_cmlEndCml_2.xml
& on the webpage
+Regenerate configure script - make in config/
+
Check dates in license
Update Changelog
+Commit state to SCM system
+
release.sh
View
19 config/aclocal.m4
@@ -4084,7 +4084,10 @@ if eval '$ac_fpp_command conftest.$ac_ext > conftest.log 2>/dev/null'; then
if test -z "$ac_tmp"; then
ac_tmp=conftest.log
ac_fpp_free_out=' > conftest.f90'
- ac_fpp_out=' > conftest.f90'
+# Note that the CPP tests only use fixed format
+# so we need to use a .f extension to make the tests
+# work.
+ ac_fpp_out=' > conftest.f'
fi
if grep '^ REAL A' $ac_tmp >/dev/null 2>&1; then
# we have Fortran! That worked...
@@ -4140,9 +4143,13 @@ if test -z "$ac_cv_prog_fpp"; then
# We try the "best" preprocessors first. We know that $FC can't preprocess
# by itself, but there is a small chance that F77 can be persuaded to
# preprocess, so we try that.
- for ac_j in 'fpp' "$CPP" "$CPP -x c" 'cpp' '/lib/cpp' '/usr/ccs/lib/cpp' \
- 'g77 -E' '$CC -E' '$CC -E -x c' \
- "$FC -F" "$FC -E" "$F77 -F" "$F77 -E"; do
+# FIXME: The comment above does not agree with the code below - $FC etc.
+# is being checked late, not early?
+ for ac_j in 'fpp' "$CPP -x f95-cpp-input" "$CPP -x f77-cpp-input" \
+ "$CPP -C -x c" "$CPP -x c" "$CPP" 'cpp' '/lib/cpp' '/usr/ccs/lib/cpp' \
+ 'g77 -E' '$CC -E -x f95-cpp-input' '$CC -E -x f77-cpp-input' \
+ '$CC -E -x c -C' '$CC -E -x c' '$CC -E' \
+ "$FC -F" "$FC -E" "$F77 -F" "$F77 -E" ; do
_AC_TEST_FPP_FREE([$ac_j])
test -n "$ac_cv_prog_fpp" && break;
done
@@ -4792,6 +4799,10 @@ AC_CACHE_CHECK([whether $FPP fulfils requested features],
ac_cv_fpp_build_rule=indirect
+if test ac_fpp_ok == no; then
+ AC_MSG_ERROR([Cannot find a Fortran preprocessor with the requested features])
+fi
+
fi # test ac_fpp_ok != yes
# We have all necessary information.
View
19 config/m4/fortran.m4
@@ -2392,7 +2392,10 @@ if eval '$ac_fpp_command conftest.$ac_ext > conftest.log 2>/dev/null'; then
if test -z "$ac_tmp"; then
ac_tmp=conftest.log
ac_fpp_free_out=' > conftest.f90'
- ac_fpp_out=' > conftest.f90'
+# Note that the CPP tests only use fixed format
+# so we need to use a .f extension to make the tests
+# work.
+ ac_fpp_out=' > conftest.f'
fi
if grep '^ REAL A' $ac_tmp >/dev/null 2>&1; then
# we have Fortran! That worked...
@@ -2448,9 +2451,13 @@ if test -z "$ac_cv_prog_fpp"; then
# We try the "best" preprocessors first. We know that $FC can't preprocess
# by itself, but there is a small chance that F77 can be persuaded to
# preprocess, so we try that.
- for ac_j in 'fpp' "$CPP" "$CPP -x c" 'cpp' '/lib/cpp' '/usr/ccs/lib/cpp' \
- 'g77 -E' '$CC -E' '$CC -E -x c' \
- "$FC -F" "$FC -E" "$F77 -F" "$F77 -E"; do
+# FIXME: The comment above does not agree with the code below - $FC etc.
+# is being checked late, not early?
+ for ac_j in 'fpp' "$CPP -x f95-cpp-input" "$CPP -x f77-cpp-input" \
+ "$CPP -C -x c" "$CPP -x c" "$CPP" 'cpp' '/lib/cpp' '/usr/ccs/lib/cpp' \
+ 'g77 -E' '$CC -E -x f95-cpp-input' '$CC -E -x f77-cpp-input' \
+ '$CC -E -x c -C' '$CC -E -x c' '$CC -E' \
+ "$FC -F" "$FC -E" "$F77 -F" "$F77 -E" ; do
_AC_TEST_FPP_FREE([$ac_j])
test -n "$ac_cv_prog_fpp" && break;
done
@@ -3100,6 +3107,10 @@ AC_CACHE_CHECK([whether $FPP fulfils requested features],
ac_cv_fpp_build_rule=indirect
+if test ac_fpp_ok == no; then
+ AC_MSG_ERROR([Cannot find a Fortran preprocessor with the requested features])
+fi
+
fi # test ac_fpp_ok != yes
# We have all necessary information.
View
2,352 configure
1,037 additions, 1,315 deletions not shown
View
6 release.sh
@@ -8,6 +8,8 @@ if test x$VN != x\'$1\'; then
fi
git-archive --format=tar --prefix=FoX-$1/ HEAD | gzip -9 > ../FoX-$1-full.tar.gz
+openssl dgst -md5 ../FoX-$1-full.tar.gz > ../FoX-$1-digest
+openssl dgst -sha1 ../FoX-$1-full.tar.gz >> ../FoX-$1-digest
mkdir tmpFoX
cd tmpFoX
@@ -17,6 +19,8 @@ tar xzf ../../FoX-$1-full.tar.gz
make cutdown
)
tar czf ../../FoX-$1.tar.gz FoX-$1
+openssl dgst -md5 ../../FoX-$1.tar.gz >> ../../FoX-$1-digest
+openssl dgst -sha1 ../../FoX-$1.tar.gz >> ../../FoX-$1-digest
rm -rf FoX-$1
for i in wxml wcml sax dom
@@ -33,6 +37,8 @@ do
make cutdown-$i
)
tar czf FoX-$1-$i.tar.gz FoX-$1
+ openssl dgst -md5 FoX-$1-$i.tar.gz >> ../../FoX-$1-digest
+ openssl dgst -sha1 FoX-$1-$i.tar.gz >> ../../FoX-$1-digest
rm -rf FoX-$1
done
Please sign in to comment.
Something went wrong with that request. Please try again.