X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fstdarg;h=44029cdc8ccdb2989567bd4416d648689a543c2d;hb=cd56634a4a8179fd5a4419fbb3e27211b042ab1c;hp=6cb1db86446f5a4ceffaa2c611f717d6ea844558;hpb=76d82d2d7f5ba1a69da6aaa71ff170f5a90a6c94;p=gnulib.git

diff --git a/modules/stdarg b/modules/stdarg
index 6cb1db864..44029cdc8 100644
--- a/modules/stdarg
+++ b/modules/stdarg
@@ -11,9 +11,9 @@ include_next
 configure.ac-early:
 dnl Some compilers (e.g., AIX 5.3 cc) need to be in c99 mode
 dnl for the builtin va_copy to work.  With Autoconf 2.60 or later,
-dnl AC_PROG_CC_STDC arranges for this.  With older Autoconf AC_PROG_CC_STDC
+dnl gl_PROG_CC_C99 arranges for this.  With older Autoconf gl_PROG_CC_C99
 dnl shouldn't hurt, though installers are on their own to set c99 mode.
-AC_REQUIRE([AC_PROG_CC_STDC])
+gl_PROG_CC_C99
 
 configure.ac:
 gl_STDARG_H
@@ -27,7 +27,8 @@ if GL_GENERATE_STDARG_H
 stdarg.h: stdarg.in.h $(top_builddir)/config.status
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \