use new macro names.

diff --git a/autoheader.in b/autoheader.in
index f8daf37e31309827a8ffd51d65925dea9e29360d..3c8f39556c4895e6360357b14d57139d2863f3d5 100644 (file)
--- a/autoheader.in
+++ b/autoheader.in
@@ -70,7 +70,8 @@ done
 
 TEMPLATES="${AC_MACRODIR}/acconfig.h"
 test -r acconfig.h && TEMPLATES="${TEMPLATES} acconfig.h"
-MACROFILES="${AC_MACRODIR}/acgeneral.m4 ${AC_MACRODIR}/acspecific.m4"
+MACROFILES="${AC_MACRODIR}/acgeneral.m4 ${AC_MACRODIR}/acspecific.m4 \
+${AC_MACRODIR}/acoldnames.m4"
 test -r ${AC_MACRODIR}/aclocal.m4 \
    && MACROFILES="${MACROFILES} ${AC_MACRODIR}/aclocal.m4"
 test -r aclocal.m4 && MACROFILES="${MACROFILES} aclocal.m4"
@@ -95,26 +96,30 @@ frob='define([AC_DEFINE],[#
 define([AC_SIZEOF_TYPE],[#
 @@@types="$types,$1"@@@
 ])dnl
-define([AC_HAVE_FUNCS],[#
+define([AC_CHECK_FUNCS],[#
 @@@funcs="$funcs $1"@@@
 ])dnl
-define([AC_HAVE_HEADERS],[#
+define([AC_CHECK_HEADERS],[#
 @@@headers="$headers $1"@@@
 ])dnl
 define([AC_CONFIG_HEADER],[#
 @@@config_h=$1@@@
 ])dnl
-define([AC_HAVE_LIBRARY], [#
+define([AC_CHECK_LIB], [#
 changequote(/,/)dnl
 define(/libname/, dnl
 patsubst(patsubst($1, /lib\([^\.]*\)\.a/, /\1/), /-l/, //))dnl
 changequote([,])dnl
+  ifelse([$2], , [
 @@@libs="$libs libname"@@@
+], [
 # If it was found, we do:
 $2
 # If it was not found, we do:
 $3
+])
 ])dnl
+dnl
 '
 
 config_h=config.h

diff --git a/autoheader.sh b/autoheader.sh
index f8daf37e31309827a8ffd51d65925dea9e29360d..3c8f39556c4895e6360357b14d57139d2863f3d5 100644 (file)
--- a/autoheader.sh
+++ b/autoheader.sh
@@ -70,7 +70,8 @@ done
 
 TEMPLATES="${AC_MACRODIR}/acconfig.h"
 test -r acconfig.h && TEMPLATES="${TEMPLATES} acconfig.h"
-MACROFILES="${AC_MACRODIR}/acgeneral.m4 ${AC_MACRODIR}/acspecific.m4"
+MACROFILES="${AC_MACRODIR}/acgeneral.m4 ${AC_MACRODIR}/acspecific.m4 \
+${AC_MACRODIR}/acoldnames.m4"
 test -r ${AC_MACRODIR}/aclocal.m4 \
    && MACROFILES="${MACROFILES} ${AC_MACRODIR}/aclocal.m4"
 test -r aclocal.m4 && MACROFILES="${MACROFILES} aclocal.m4"
@@ -95,26 +96,30 @@ frob='define([AC_DEFINE],[#
 define([AC_SIZEOF_TYPE],[#
 @@@types="$types,$1"@@@
 ])dnl
-define([AC_HAVE_FUNCS],[#
+define([AC_CHECK_FUNCS],[#
 @@@funcs="$funcs $1"@@@
 ])dnl
-define([AC_HAVE_HEADERS],[#
+define([AC_CHECK_HEADERS],[#
 @@@headers="$headers $1"@@@
 ])dnl
 define([AC_CONFIG_HEADER],[#
 @@@config_h=$1@@@
 ])dnl
-define([AC_HAVE_LIBRARY], [#
+define([AC_CHECK_LIB], [#
 changequote(/,/)dnl
 define(/libname/, dnl
 patsubst(patsubst($1, /lib\([^\.]*\)\.a/, /\1/), /-l/, //))dnl
 changequote([,])dnl
+  ifelse([$2], , [
 @@@libs="$libs libname"@@@
+], [
 # If it was found, we do:
 $2
 # If it was not found, we do:
 $3
+])
 ])dnl
+dnl
 '
 
 config_h=config.h

diff --git a/bin/autoheader.in b/bin/autoheader.in
index f8daf37e31309827a8ffd51d65925dea9e29360d..3c8f39556c4895e6360357b14d57139d2863f3d5 100644 (file)
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -70,7 +70,8 @@ done
 
 TEMPLATES="${AC_MACRODIR}/acconfig.h"
 test -r acconfig.h && TEMPLATES="${TEMPLATES} acconfig.h"
-MACROFILES="${AC_MACRODIR}/acgeneral.m4 ${AC_MACRODIR}/acspecific.m4"
+MACROFILES="${AC_MACRODIR}/acgeneral.m4 ${AC_MACRODIR}/acspecific.m4 \
+${AC_MACRODIR}/acoldnames.m4"
 test -r ${AC_MACRODIR}/aclocal.m4 \
    && MACROFILES="${MACROFILES} ${AC_MACRODIR}/aclocal.m4"
 test -r aclocal.m4 && MACROFILES="${MACROFILES} aclocal.m4"
@@ -95,26 +96,30 @@ frob='define([AC_DEFINE],[#
 define([AC_SIZEOF_TYPE],[#
 @@@types="$types,$1"@@@
 ])dnl
-define([AC_HAVE_FUNCS],[#
+define([AC_CHECK_FUNCS],[#
 @@@funcs="$funcs $1"@@@
 ])dnl
-define([AC_HAVE_HEADERS],[#
+define([AC_CHECK_HEADERS],[#
 @@@headers="$headers $1"@@@
 ])dnl
 define([AC_CONFIG_HEADER],[#
 @@@config_h=$1@@@
 ])dnl
-define([AC_HAVE_LIBRARY], [#
+define([AC_CHECK_LIB], [#
 changequote(/,/)dnl
 define(/libname/, dnl
 patsubst(patsubst($1, /lib\([^\.]*\)\.a/, /\1/), /-l/, //))dnl
 changequote([,])dnl
+  ifelse([$2], , [
 @@@libs="$libs libname"@@@
+], [
 # If it was found, we do:
 $2
 # If it was not found, we do:
 $3
+])
 ])dnl
+dnl
 '
 
 config_h=config.h