diff --git a/ChangeLog b/ChangeLog
index e7526c783..0a75adc11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-03-02  Pavel Roskin  <proski@gnu.org>
 
+	* aclocal.m4 (MC_HPUX_PROG_CC_STDC): Remove, it's obsolete.
+	* configure.in: Use AC_PROG_CC_STDC instead.
+
 	* lib/mc.ext.in: Recognize files ending by `.lslR' and `.ls-lR'.
 	Suggested by Christian Gennerat.
 
diff --git a/acinclude.m4 b/acinclude.m4
index 1d5c6d6e4..defc287a2 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -455,73 +455,6 @@ fi
 AC_SUBST([GNU_MAKE])dnl
 ])
 
-dnl 
-dnl Local additions to Autoconf macros.
-dnl Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
-dnl François Pinard <pinard@iro.umontreal.ca>, 1992.
-
-dnl ## ----------------------------------------- ##
-dnl ## ANSIfy the C compiler whenever possible.  ##
-dnl ## ----------------------------------------- ##
-
-dnl @defmac AC_PROG_CC_STDC
-dnl @maindex PROG_CC_STDC
-dnl @ovindex CC
-dnl If the C compiler in not in ANSI C mode by default, try to add an option
-dnl to output variable @code{CC} to make it so.  This macro tries various
-dnl options that select ANSI C on some system or another.  It considers the
-dnl compiler to be in ANSI C mode if it defines @code{__STDC__} to 1 and
-dnl handles function prototypes correctly.
-dnl 
-dnl If you use this macro, you should check after calling it whether the C
-dnl compiler has been set to accept ANSI C; if not, the shell variable
-dnl @code{ac_cv_prog_cc_stdc} is set to @samp{no}.  If you wrote your source
-dnl code in ANSI C, you can make an un-ANSIfied copy of it by using the
-dnl program @code{ansi2knr}, which comes with Ghostscript.
-dnl @end defmac
-
-dnl Unixware 2.1 defines __STDC__ to 1 only when some useful extensions are
-dnl turned off. They are on by default and turned off with the option -Xc. 
-dnl The consequence is that __STDC__ is defined but e.g. struct sigaction
-dnl is not defined. -- Norbert 
-
-dnl Below all tests but the one for HP-UX are removed. They caused more
-dnl problems than they soved, sigh. -- Norbert
-
-AC_DEFUN([MC_HPUX_PROG_CC_STDC],
-[AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C])
-AC_CACHE_VAL(ac_cv_prog_cc_stdc,
-[ac_cv_prog_cc_stdc=no
-ac_save_CFLAGS="$CFLAGS"
-dnl Don't try gcc -ansi; that turns off useful extensions and
-dnl breaks some systems' header files.
-dnl AIX			-qlanglvl=ansi      (removed -- Norbert)
-dnl Ultrix and OSF/1	-std1               (removed -- Norbert)
-dnl HP-UX		-Aa -D_HPUX_SOURCE
-dnl SVR4		-Xc                 (removed -- Norbert)
-for ac_arg in "" "-Aa -D_HPUX_SOURCE" 
-do
-  CFLAGS="$ac_save_CFLAGS $ac_arg"
-  AC_TRY_COMPILE(
-[#include <signal.h>
-#if !defined(__STDC__) || __STDC__ != 1
-choke me
-#endif	
-], [int test (int i, double x);
-struct sigaction sa;
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};],
-[ac_cv_prog_cc_stdc="$ac_arg"; break])
-done
-CFLAGS="$ac_save_CFLAGS"
-])
-AC_MSG_RESULT([$ac_cv_prog_cc_stdc])
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno) ;;
-  *) CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-])
-
 AC_DEFUN([AC_USE_SUNOS_CURSES], [
 	search_ncurses=false
 	screen_manager="SunOS 4.x /usr/5include curses"
diff --git a/configure.in b/configure.in
index 9e1febca8..23da2fc45 100644
--- a/configure.in
+++ b/configure.in
@@ -36,7 +36,7 @@ AC_PROG_GNU_MAKE
 AC_AIX
 AC_MINIX
 AC_ISC_POSIX
-MC_HPUX_PROG_CC_STDC
+AC_PROG_CC_STDC
 AC_HEADER_MAJOR
 AC_C_CONST
 AC_PATH_PROG(AR, ar, ar)