[SCM] GNU Autoconf source repository branch, master, updated. v2.64-71-g59f2fea

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=59f2fea80a181fb80c0f3e61641080a09e349f45

The branch, master has been updated
       via  59f2fea80a181fb80c0f3e61641080a09e349f45 (commit)
       via  931ae9f43a15d2b9f79ba022da88315894295d90 (commit)
      from  81c80d1bf6c8ddf732d0b89f6fc5e306dac9705e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 59f2fea80a181fb80c0f3e61641080a09e349f45
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Oct 31 02:24:09 2009 +0100

    Fix AC_OPENMP for Fortran (F77 and FC).
    
    * lib/autoconf/fortran.m4 (AC_LANG_FUNC_LINK_TRY(Fortran): New.
    * tests/c.at (AC_C_RESTRICT and C++, AC_OPENMP and C)
    (AC_OPENMP and C++): New tests.
    * tests/fortran.at (AC_OPENMP and Fortran 77)
    (AC_OPENMP and Fortran): New tests.
    * THANKS: Update.
    Report by Bart Oldeman.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 931ae9f43a15d2b9f79ba022da88315894295d90
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Oct 31 02:22:04 2009 +0100

    Perl coverage convenience targets.
    
    * Makefile.am (PERL_COVERAGE_DB, PERL_COVERAGE_FLAGS)
    (PERL_COVER): New variables.
    (check-coverage, check-coverage-run, check-coverage-report)
    (clean-coverage): New phony targets.
    (clean-local): Depend on clean-coverage.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog               |   18 +++++++++
 Makefile.am             |   29 ++++++++++++++
 THANKS                  |    1 +
 lib/autoconf/fortran.m4 |    5 ++
 tests/c.at              |   97 +++++++++++++++++++++++++++++++++++++++++++++++
 tests/fortran.at        |   80 ++++++++++++++++++++++++++++++++++++++
 6 files changed, 230 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f688b26..296b307 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2009-10-31  Ralf Wildenhues  <address@hidden>
+
+       Fix AC_OPENMP for Fortran (F77 and FC).
+       * lib/autoconf/fortran.m4 (AC_LANG_FUNC_LINK_TRY(Fortran): New.
+       * tests/c.at (AC_C_RESTRICT and C++, AC_OPENMP and C)
+       (AC_OPENMP and C++): New tests.
+       * tests/fortran.at (AC_OPENMP and Fortran 77)
+       (AC_OPENMP and Fortran): New tests.
+       * THANKS: Update.
+       Report by Bart Oldeman.
+
+       Perl coverage convenience targets.
+       * Makefile.am (PERL_COVERAGE_DB, PERL_COVERAGE_FLAGS)
+       (PERL_COVER): New variables.
+       (check-coverage, check-coverage-run, check-coverage-report)
+       (clean-coverage): New phony targets.
+       (clean-local): Depend on clean-coverage.
+
 2009-10-28  Eric Blake  <address@hidden>
 
        Fix corner cases in AS_LITERAL_IF and AS_TR_SH.
diff --git a/Makefile.am b/Makefile.am
index 3c90657..7891612 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,3 +74,32 @@ dist-hook:
 # TODO remove this once automake vs. AC_CONFIG_LINKS issue is fixed.
 distclean-local:
        if test x"$(VPATH)" != x ; then rm -f GNUmakefile ; fi
+
+# Perl coverage statistics.
+PERL_COVERAGE_DB = `pwd`/cover_db
+PERL_COVERAGE_FLAGS = 
-MDevel::Cover=-db,$(PERL_COVERAGE_DB),-silent,on,-summary,off
+PERL_COVER = cover
+
+check-coverage-run: all
+       $(mkinstalldirs) $(PERL_COVERAGE_DB)
+       PERL5OPT="$(PERL_COVERAGE_FLAGS)"; export PERL5OPT; \
+       $(MAKE) $(AM_MAKEFLAGS) check
+
+check-coverage-report:
+       @if test ! -d $(PERL_COVERAGE_DB); then \
+         echo "No coverage database found in \`$(PERL_COVERAGE_DB)'." >&2; \
+         echo "Please run \`make check-coverage' first" >&2; \
+         exit 1; \
+       fi
+       $(PERL_COVER) $(PERL_COVERAGE_DB) $(PERL_COVER_FLAGS)
+
+# We don't use direct dependencies here because we'd like to be able
+# to invoke the report even after interrupted check-coverage.
+check-coverage: check-coverage-run
+       $(MAKE) $(AM_MAKEFLAGS) check-coverage-report
+
+clean-local: clean-coverage
+clean-coverage:
+       rm -rf $(PERL_COVERAGE_DB)
+
+.PHONY: check-coverage check-coverage-run check-coverage-report clean-coverage
diff --git a/THANKS b/THANKS
index b8c8936..eb643a7 100644
--- a/THANKS
+++ b/THANKS
@@ -42,6 +42,7 @@ Arto C. Nirkko              ?
 Artur Frysiak               address@hidden
 Assar Westerlund            address@hidden
 Axel Thimm                  address@hidden
+Bart Oldeman                address@hidden
 Ben Elliston                address@hidden
 Ben Pfaff                   address@hidden
 Bill Moseley                address@hidden
diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index d55981b..6cbcfa2 100644
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -207,6 +207,11 @@ m4_define([AC_LANG_CALL(Fortran 77)],
 [      call $2])])
 
 
+# AC_LANG_FUNC_LINK_TRY(Fortran 77)(FUNCTION)
+# -------------------------------------------
+m4_define([AC_LANG_FUNC_LINK_TRY(Fortran 77)],
+[AC_LANG_PROGRAM([],
+[      call $1])])
 
 ## ------------------------ ##
 ## 1b. Language selection.  ##
diff --git a/tests/c.at b/tests/c.at
index 8235be2..78edf45 100644
--- a/tests/c.at
+++ b/tests/c.at
@@ -320,3 +320,100 @@ AT_CHECK([${MAKE-make} cpp-works || exit 77], [], 
[ignore], [ignore])
 AT_CHECK([${MAKE-make}], [], [ignore], [ignore])
 
 AT_CLEANUP
+
+
+## ---------------- ##
+## AC_OPENMP and C. ##
+## ---------------- ##
+
+AT_SETUP([AC_OPENMP and C])
+
+AT_DATA([configure.ac],
+[[AC_INIT
+AC_PROG_CC
+AC_OPENMP
+if test "X$ac_cv_prog_c_openmp" = Xunsupported; then
+  AS_EXIT([77])
+fi
+CFLAGS="$CFLAGS $OPENMP_CFLAGS"
+CPPFLAGS="$CPPFLAGS $OPENMP_CFLAGS"
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+]])
+
+AT_DATA([Makefile.in],
address@hidden@: address@hidden@
+       @CC@ @CFLAGS@ @LDFLAGS@ -o $@ address@hidden@
+
address@hidden@: foo.c
+       @CC@ @CPPFLAGS@ @CFLAGS@ -c foo.c
+]])
+
+AT_DATA([foo.c],
+[[#ifdef _OPENMP
+#include <omp.h>
+#endif
+#include <stdio.h>
+
+int main ()
+{
+#ifdef _OPENMP
+#pragma omp parallel
+  {
+    int id = omp_get_thread_num ();
+    printf ("hello omp world from %d\n", id);
+  }
+#endif
+  return 0;
+}
+]])
+
+: ${MAKE=make}
+AT_CHECK([autoreconf -vi], [], [ignore], [ignore])
+AT_CHECK([./configure $configure_options], [], [ignore], [ignore])
+AT_CHECK([$MAKE], [], [ignore], [ignore])
+
+AT_CLEANUP
+
+
+## ------------------ ##
+## AC_OPENMP anc C++. ##
+## ------------------ ##
+
+AT_SETUP([AC_OPENMP and C++])
+
+AT_DATA([configure.ac],
+[[AC_INIT
+AC_PROG_CXX
+AC_LANG([C++])
+AC_OPENMP
+if test "X$ac_cv_prog_cxx_openmp" = Xunsupported; then
+  AS_EXIT([77])
+fi
+CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
+CPPFLAGS="$CPPFLAGS $OPENMP_CXXFLAGS"
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+]])
+
+AT_DATA([Makefile.in],
address@hidden@: address@hidden@
+       @CXX@ @CXXFLAGS@ @LDFLAGS@ -o $@ address@hidden@
+
address@hidden@: foo.cpp
+       @CXX@ @CPPFLAGS@ @CXXFLAGS@ -c foo.cpp
+]])
+
+AT_DATA([foo.cpp],
+[[int main ()
+{
+  return 0;
+}
+]])
+
+: ${MAKE=make}
+AT_CHECK([autoreconf -vi], [], [ignore], [ignore])
+AT_CHECK([./configure $configure_options], [], [ignore], [ignore])
+AT_CHECK([$MAKE], [], [ignore], [ignore])
+
+AT_CLEANUP
diff --git a/tests/fortran.at b/tests/fortran.at
index ed58ee7..151b13f 100644
--- a/tests/fortran.at
+++ b/tests/fortran.at
@@ -73,3 +73,83 @@ if test "$ac_compiler_gnu" = yes; then
   esac
 fi
 ]])
+
+
+## ------------------------- ##
+## AC_OPENMP and Fortran 77. ##
+## ------------------------- ##
+
+AT_SETUP([AC_OPENMP and Fortran 77])
+
+AT_DATA([configure.ac],
+[[AC_INIT
+AC_PROG_F77
+AC_LANG([Fortran 77])
+AC_OPENMP
+if test "X$ac_cv_prog_f77_openmp" = Xunsupported; then
+  AS_EXIT([77])
+fi
+FFLAGS="$FFLAGS $OPENMP_FFLAGS"
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+]])
+
+AT_DATA([Makefile.in],
address@hidden@: address@hidden@
+       @F77@ @FFLAGS@ @LDFLAGS@ -o $@ address@hidden@
+
address@hidden@: foo.f
+       @F77@ @FFLAGS@ -c foo.f
+]])
+
+AT_DATA([foo.f],
+[[       program main
+      end
+]])
+
+: ${MAKE=make}
+AT_CHECK([autoreconf -vi], [], [ignore], [ignore])
+AT_CHECK([./configure $configure_options], [], [ignore], [ignore])
+AT_CHECK([$MAKE], [], [ignore], [ignore])
+
+AT_CLEANUP
+
+
+## ---------------------- ##
+## AC_OPENMP and Fortran. ##
+## ---------------------- ##
+
+AT_SETUP([AC_OPENMP and Fortran])
+
+AT_DATA([configure.ac],
+[[AC_INIT
+AC_PROG_FC
+AC_LANG([Fortran])
+AC_OPENMP
+if test "X$ac_cv_prog_fc_openmp" = Xunsupported; then
+  AS_EXIT([77])
+fi
+FCFLAGS="$FCFLAGS $OPENMP_FCFLAGS"
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+]])
+
+AT_DATA([Makefile.in],
address@hidden@: address@hidden@
+       @FC@ @FCFLAGS@ @LDFLAGS@ -o $@ address@hidden@
+
address@hidden@: foo.f
+       @FC@ @FCFLAGS@ -c foo.f
+]])
+
+AT_DATA([foo.f],
+[[      program main
+      end
+]])
+
+: ${MAKE=make}
+AT_CHECK([autoreconf -vi], [], [ignore], [ignore])
+AT_CHECK([./configure $configure_options], [], [ignore], [ignore])
+AT_CHECK([$MAKE], [], [ignore], [ignore])
+
+AT_CLEANUP


hooks/post-receive
-- 
GNU Autoconf source repository