Fixed automatic rebuild of 'configure' by its 'configure.in' dependency.

diff --git a/Makefile.am b/Makefile.am
index 0ef706a..747f11a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
 include $(top_srcdir)/Makefile-head.am
 
 AUTOMAKE_OPTIONS=gnu
+ACLOCAL_AMFLAGS=-I macros
 SUBDIRS=macros src doc po
 ## to automatically rebuild aclocal.m4 if any of the macros in
 ## `macros/' change

diff --git a/configure.in b/configure.in
index b59261c..60e1e21 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -19,6 +19,8 @@
 AC_INIT(src/libcaptive/Makefile-libcaptive.am)
 dnl 2.53 for AM_GLIB_GNU_GETTEXT:
 AC_PREREQ(2.53)
+dnl Not yet present in: Red Hat autoconf-2.57-3
+dnl AC_CONFIG_MACRO_DIR(macros)
 AM_INIT_AUTOMAKE(captive,1.0.3cvs)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
@@ -383,11 +385,16 @@ GLADE_W_INIT([
                        have_libntfs_includes=true
                        AC_CHECK_HEADERS
                        # '#include "config.h"' may be required by <ntfs/*> include files.
-                       test -r config.h || touch config.h
+                       # "config.h" may be already present while not yet being compilable.
+                       rm -f config.h-ntfs_save
+                       mv -f config.h config.h-ntfs_save 2>/dev/null
+                       touch config.h
                        captive_save_CPPFLAGS="$CPPFLAGS"
                        CPPFLAGS="$CPPFLAGS -I."        # for "config.h" touched above
                        AC_CHECK_HEADERS(ntfs/types.h ntfs/volume.h,,[ have_libntfs_includes=false ])
                        CPPFLAGS="$captive_save_CPPFLAGS"
+                       rm -f config.h
+                       mv -f config.h-ntfs_save config.h 2>/dev/null
                        if $have_libntfs_includes;then
 
                                captive_save_CPPFLAGS="$CPPFLAGS"