From d80bcb5330f0e7cc408c17032d4d035df6159821 Mon Sep 17 00:00:00 2001
From: michael <michael@82007160-df01-0410-b94d-b575c5fd34c7>
Date: Fri, 26 Dec 2014 14:11:07 +0000
Subject: [PATCH] - configure.ac: replaced AM_CONFIG_HEADER with
 AC_CONFIG_HEADER

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/trunk@5145 82007160-df01-0410-b94d-b575c5fd34c7
---
 aclocal.m4              | 29 -----------------------------
 configure               |  1 +
 configure.ac            |  2 +-
 src/libopm/aclocal.m4   | 29 -----------------------------
 src/libopm/configure    |  1 +
 src/libopm/configure.ac |  2 +-
 6 files changed, 4 insertions(+), 60 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 8f3a8fd..7eec604 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -9763,35 +9763,6 @@ else
 fi
 ])
 
-#  -*- Autoconf -*-
-# Obsolete and "removed" macros, that must however still report explicit
-# error messages when used, to smooth transition.
-#
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([AM_CONFIG_HEADER],
-[AC_DIAGNOSE([obsolete],
-['$0': this macro is obsolete.
-You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl
-AC_CONFIG_HEADERS($@)])
-
-AC_DEFUN([AM_PROG_CC_STDC],
-[AC_PROG_CC
-am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
-AC_DIAGNOSE([obsolete],
-['$0': this macro is obsolete.
-You should simply use the 'AC][_PROG_CC' macro instead.
-Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
-but upon 'ac_cv_prog_cc_stdc'.])])
-
-AC_DEFUN([AM_C_PROTOTYPES],
-         [AC_FATAL([automatic de-ANSI-fication support has been removed])])
-AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
-
 # Helper functions for option handling.                     -*- Autoconf -*-
 
 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
diff --git a/configure b/configure
index 47e1b45..9f430f7 100755
--- a/configure
+++ b/configure
@@ -13394,6 +13394,7 @@ DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
diff --git a/configure.ac b/configure.ac
index c15f5bb..7536469 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(hopm, [1.0.0beta1])
 AC_CONFIG_SRCDIR(src/opercmd.h)
-AM_CONFIG_HEADER(src/setup.h)
+AC_CONFIG_HEADER(src/setup.h)
 AM_INIT_AUTOMAKE()
 AC_PREFIX_DEFAULT([\${HOME}/hopm])
 AM_MAINTAINER_MODE
diff --git a/src/libopm/aclocal.m4 b/src/libopm/aclocal.m4
index 437f93e..e1e1051 100644
--- a/src/libopm/aclocal.m4
+++ b/src/libopm/aclocal.m4
@@ -9745,35 +9745,6 @@ else
 fi
 ])
 
-#  -*- Autoconf -*-
-# Obsolete and "removed" macros, that must however still report explicit
-# error messages when used, to smooth transition.
-#
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([AM_CONFIG_HEADER],
-[AC_DIAGNOSE([obsolete],
-['$0': this macro is obsolete.
-You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl
-AC_CONFIG_HEADERS($@)])
-
-AC_DEFUN([AM_PROG_CC_STDC],
-[AC_PROG_CC
-am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
-AC_DIAGNOSE([obsolete],
-['$0': this macro is obsolete.
-You should simply use the 'AC][_PROG_CC' macro instead.
-Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
-but upon 'ac_cv_prog_cc_stdc'.])])
-
-AC_DEFUN([AM_C_PROTOTYPES],
-         [AC_FATAL([automatic de-ANSI-fication support has been removed])])
-AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
-
 # Helper functions for option handling.                     -*- Autoconf -*-
 
 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
diff --git a/src/libopm/configure b/src/libopm/configure
index 7dfba94..93728a6 100755
--- a/src/libopm/configure
+++ b/src/libopm/configure
@@ -12867,6 +12867,7 @@ DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
diff --git a/src/libopm/configure.ac b/src/libopm/configure.ac
index 414248b..0387200 100644
--- a/src/libopm/configure.ac
+++ b/src/libopm/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(libopm, [0.1])
 AC_CONFIG_SRCDIR(src/libopm.h)
-AM_CONFIG_HEADER(src/setup.h)
+AC_CONFIG_HEADER(src/setup.h)
 AM_INIT_AUTOMAKE()
 AC_PREFIX_DEFAULT([/usr/local/libopm])
 AM_MAINTAINER_MODE
-- 
2.30.2