X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=configure.in;h=60e1e213c022de07b1b6f9719c5c911697b39be6;hb=47bec9232eb49a2f9b4e0e93fee1b22728d90207;hp=a12a3144515145de99604b0050d1fce6571716d7;hpb=e744aba97adfdbb22a1b39c3de436978e4f1aac6;p=captive.git

diff --git a/configure.in b/configure.in
index a12a314..60e1e21 100644
--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,9 @@
 AC_INIT(src/libcaptive/Makefile-libcaptive.am)
 dnl 2.53 for AM_GLIB_GNU_GETTEXT:
 AC_PREREQ(2.53)
-AM_INIT_AUTOMAKE(captive,1.0.2cvs)
+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
 dnl Call AC_PROG_CC before AC_ISC_POSIX.
@@ -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"