Changeset 13801

Timestamp:

05/21/12 11:26:28 (13 years ago)

Author:

tbretz

Message:

Fixed a problem in the ac_check_package macro which made all following macros fail

Location:

trunk/FACT++

Files:

• .macro_dir/ac_check_package.m4 (modified) (1 diff)
• configure (modified) (7 diffs)

trunk/FACT++/.macro_dir/ac_check_package.m4

@@ -57 +57 @@
         fi
 
+        no_good=no
+
         AC_CHECK_HEADER($4,,no_good=yes)
         AC_CHECK_LIB($3,$2,,no_good=yes)

trunk/FACT++/configure

@@ -19640 +19640 @@
         fi
 
+        no_good=no
+
         ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
 if test "x$ac_cv_header_zlib_h" = xyes; then :
@@ -19756 +19758 @@
         fi
 
+        no_good=no
+
         ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default"
 if test "x$ac_cv_header_GL_gl_h" = xyes; then :
@@ -19870 +19874 @@
         fi
 
+        no_good=no
+
         ac_fn_c_check_header_mongrel "$LINENO" "GL/glu.h" "ac_cv_header_GL_glu_h" "$ac_includes_default"
 if test "x$ac_cv_header_GL_glu_h" = xyes; then :
@@ -19986 +19992 @@
         fi
 
+        no_good=no
+
         ac_fn_c_check_header_mongrel "$LINENO" "libnova/julian_day.h" "ac_cv_header_libnova_julian_day_h" "$ac_includes_default"
 if test "x$ac_cv_header_libnova_julian_day_h" = xyes; then :
@@ -20113 +20121 @@
         fi
 
+        no_good=no
+
         ac_fn_c_check_header_mongrel "$LINENO" "fitsio.h" "ac_cv_header_fitsio_h" "$ac_includes_default"
 if test "x$ac_cv_header_fitsio_h" = xyes; then :
@@ -20239 +20249 @@
                 CFLAGS="$CFLAGS -I${ccfits_include}"
         fi
+
+        no_good=no
 
         ac_fn_cxx_check_header_mongrel "$LINENO" "CCfits/CCfits" "ac_cv_header_CCfits_CCfits" "$ac_includes_default"
@@ -23625 +23637 @@
 
                 cat > conftest.$ac_ext <<EOF
-#line 23627 "configure"
+#line 23639 "configure"
 #include "confdefs.h"
 #include <qglobal.h>