summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnathan Corgan2009-09-03 17:12:40 -0700
committerJohnathan Corgan2009-09-03 17:12:40 -0700
commitacdf13612f55c3a4abd4f2f05d759a4fd2fdf7d0 (patch)
treefc7668290679d9f6ef76a68c63c07248a6933548
parent7467db4fdde61a67553e7257347a14f8487598ab (diff)
downloadgnuradio-acdf13612f55c3a4abd4f2f05d759a4fd2fdf7d0.tar.gz
gnuradio-acdf13612f55c3a4abd4f2f05d759a4fd2fdf7d0.tar.bz2
gnuradio-acdf13612f55c3a4abd4f2f05d759a4fd2fdf7d0.zip
Better fix for broken AC_PROG_F77 macro
* Move AC_PROG_CC into GR_FORTRAN macro definition
-rw-r--r--config/gr_fortran.m41
-rw-r--r--configure.ac1
2 files changed, 1 insertions, 1 deletions
diff --git a/config/gr_fortran.m4 b/config/gr_fortran.m4
index b5b0470f4..a558b2f7e 100644
--- a/config/gr_fortran.m4
+++ b/config/gr_fortran.m4
@@ -28,5 +28,6 @@ AC_DEFUN([GR_FORTRAN],[
then
AC_PROG_F77
AC_F77_LIBRARY_LDFLAGS
+ AC_PROG_CC dnl bux fix to restore $ac_ext
fi
])
diff --git a/configure.ac b/configure.ac
index 4b90b723c..2bb37935e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,7 +125,6 @@ AC_ENABLE_SHARED dnl do build shared libraries
AC_DISABLE_STATIC dnl don't build static libraries
m4_ifdef([LT_INIT],[LT_INIT],[AC_PROG_LIBTOOL])
GR_FORTRAN
-AC_PROG_CC dnl ensure $ac_ext set correctly after Fortran test
GR_NO_UNDEFINED dnl do we need the -no-undefined linker flag
GR_SCRIPTING