Merge branch 'wip/term' of git@gnuradio.org:jcorgan

[debian/gnuradio] / config / gr_fortran.m4

diff --git a/config/gr_fortran.m4 b/config/gr_fortran.m4
index e0fc96ebe34d69254727b17d0f1d30ff4610adc5..03105204304b5e1f0e28c3eec121aa54b1ef1702 100644 (file)
--- a/config/gr_fortran.m4
+++ b/config/gr_fortran.m4
@@ -4,7 +4,7 @@ dnl This file is part of GNU Radio
 dnl 
 dnl GNU Radio is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2, or (at your option)
+dnl the Free Software Foundation; either version 3, or (at your option)
 dnl any later version.
 dnl 
 dnl GNU Radio is distributed in the hope that it will be useful,
@@ -20,7 +20,8 @@ dnl Boston, MA 02110-1301, USA.
 AC_DEFUN([GR_FORTRAN],[
     dnl if you want to generate a different table of interpolator taps, you need fortran.
     dnl we default to off, since almost no one wants to do this.
-    AC_ARG_ENABLE(fortran, [  --enable-fortran        enable fortran (no)], [], [enable_fortran=no])
+    AC_ARG_ENABLE(fortran, AC_HELP_STRING([--enable-fortran],[enable fortran (no)]),
+                 [], [enable_fortran=no])
     AM_CONDITIONAL(ENABLE_FORTRAN, test "x$enable_fortran" = xyes)
 
     if test "x$enable_fortran" = xyes
@@ -28,4 +29,5 @@ AC_DEFUN([GR_FORTRAN],[
         AC_PROG_F77
         AC_F77_LIBRARY_LDFLAGS
     fi
+    AC_PROG_CC dnl bux fix to restore $ac_ext
 ])