diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index c1e01460a5c..d3e4752f772 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-06  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* aclocal.m4 (AC_DEFINE_NOAUTOHEADER): Remove.
+	* configure.ac: Replace any AC_DEFINE_NOAUTOHEADER with AC_DEFINE.
+	* configure: Regenerate.
+
 2005-05-06  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* configure.ac: Use AC_C_BIGENDIAN instead of AC_C_BIGENDIAN_CROSS.
diff --git a/libiberty/aclocal.m4 b/libiberty/aclocal.m4
index 99b50564065..0b49d032122 100644
--- a/libiberty/aclocal.m4
+++ b/libiberty/aclocal.m4
@@ -119,15 +119,6 @@ if test $libiberty_cv_decl_needed_$1 = yes; then
 fi
 ])dnl
 
-# Work around a bug in autoheader.  This can go away when we switch to
-# autoconf >2.50.  The use of define instead of AC_DEFUN is
-# deliberate.
-define(AC_DEFINE_NOAUTOHEADER,
-[cat >> confdefs.h <<\EOF
-[#define] $1 ifelse($#, 2, [$2], $#, 3, [$2], 1)
-EOF
-])
-
 # We always want a C version of alloca() compiled into libiberty,
 # because native-compiler support for the real alloca is so !@#$%
 # unreliable that GCC has decided to use it only when being compiled
diff --git a/libiberty/configure b/libiberty/configure
index 5745eb5c163..b7d3e5b5ce8 100755
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -5404,9 +5404,9 @@ _ACEOF
     # dont have to check them here.
 
     # Of the functions in $checkfuncs, newlib only has strerror.
-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF
 #define HAVE_STRERROR 1
-EOF
+_ACEOF
 
 
     setobjs=yes
@@ -5448,13 +5448,13 @@ fi
 
 case "${host}" in
   *-*-cygwin* | *-*-mingw*)
-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF
 #define HAVE_SYS_ERRLIST 1
-EOF
+_ACEOF
 
-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF
 #define HAVE_SYS_NERR 1
-EOF
+_ACEOF
 
     ;;
 esac
@@ -5566,9 +5566,9 @@ _ACEOF
     # don't have to check them here.
 
     # Of the functions in $checkfuncs, VxWorks only has strerror.
-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF
 #define HAVE_STRERROR 1
-EOF
+_ACEOF
 
 
     setobjs=yes
diff --git a/libiberty/configure.ac b/libiberty/configure.ac
index 46a80d1ba8b..b11fafbcae9 100644
--- a/libiberty/configure.ac
+++ b/libiberty/configure.ac
@@ -328,7 +328,7 @@ if test -n "${with_target_subdir}"; then
     # dont have to check them here.
 
     # Of the functions in $checkfuncs, newlib only has strerror.
-    AC_DEFINE_NOAUTOHEADER(HAVE_STRERROR)
+    AC_DEFINE(HAVE_STRERROR)
 
     setobjs=yes
 
@@ -367,8 +367,8 @@ AC_SUBST(target_header_dir)
 
 case "${host}" in
   *-*-cygwin* | *-*-mingw*)
-    AC_DEFINE_NOAUTOHEADER(HAVE_SYS_ERRLIST)
-    AC_DEFINE_NOAUTOHEADER(HAVE_SYS_NERR)
+    AC_DEFINE(HAVE_SYS_ERRLIST)
+    AC_DEFINE(HAVE_SYS_NERR)
     ;;
 esac
 
@@ -406,7 +406,7 @@ if test -z "${setobjs}"; then
     # don't have to check them here.
 
     # Of the functions in $checkfuncs, VxWorks only has strerror.
-    AC_DEFINE_NOAUTOHEADER(HAVE_STRERROR)
+    AC_DEFINE(HAVE_STRERROR)
 
     setobjs=yes
     ;;