2004-01-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* configure.ac, aclocal/enable-bare.m4,
	aclocal/enable-inlines.m4, aclocal/enable-itron.m4,
	aclocal/enable-multiprocessing.m4, aclocal/enable-networking.m4,
	aclocal/enable-posix.m4, aclocal/enable-rtems-debug.m4, aclocal/multi.m4,
	aclocal/multilib.m4: Use AS_HELP_STRING instead of AC_HELP_STRING
	(deprecated in autoconf-2.59)
	* automake/local.am: Remove clean-local, depend-gcc.

9 files changed, 11 insertions, 15 deletions

diff --git a/cpukit/aclocal/enable-bare.m4 b/cpukit/aclocal/enable-bare.m4
index 7b9353cb50..339290b3f7 100644
--- a/cpukit/aclocal/enable-bare.m4
+++ b/cpukit/aclocal/enable-bare.m4
@@ -1,7 +1,7 @@
 AC_DEFUN([RTEMS_ENABLE_BARE],
 [
 AC_ARG_ENABLE(bare-cpu-cflags,
-AC_HELP_STRING([--enable-bare-cpu-cflags],[specify a particular cpu cflag (bare bsp specific)]),
+AS_HELP_STRING(--enable-bare-cpu-cflags,specify a particular cpu cflag (bare bsp specific)),
 [case "${enableval}" in
   no) BARE_CPU_CFLAGS="" ;;
   *)    BARE_CPU_CFLAGS="${enableval}" ;;
@@ -9,7 +9,7 @@ esac],
 [BARE_CPU_CFLAGS=""])
 
 AC_ARG_ENABLE(bare-cpu-model,
-AC_HELP_STRING([--enable-bare-cpu-model],[specify a particular cpu model (bare bsp specific)]),
+AS_HELP_STRING(--enable-bare-cpu-model,specify a particular cpu model (bare bsp specific)),
 [case "${enableval}" in
   no)   BARE_CPU_MODEL="" ;;
   *)    BARE_CPU_MODEL="${enableval}" ;;
diff --git a/cpukit/aclocal/enable-inlines.m4 b/cpukit/aclocal/enable-inlines.m4
index 9852005e06..2c79538dce 100644
--- a/cpukit/aclocal/enable-inlines.m4
+++ b/cpukit/aclocal/enable-inlines.m4
@@ -2,7 +2,7 @@ dnl $Id$
 
 AC_DEFUN([RTEMS_ENABLE_INLINES],
 [AC_ARG_ENABLE(rtems-inlines,
-AC_HELP_STRING([--enable-rtems-inlines],[enable RTEMS inline functions (default:enabled, disable to use macros)]),
+AS_HELP_STRING(--enable-rtems-inlines,enable RTEMS inline functions (default:enabled, disable to use macros)),
 [case "${enableval}" in
   yes) enable_rtems_inlines=yes ;;
   no) enable_rtems_inlines=no ;;
diff --git a/cpukit/aclocal/enable-itron.m4 b/cpukit/aclocal/enable-itron.m4
index a4eff0e8d6..552e8df267 100644
--- a/cpukit/aclocal/enable-itron.m4
+++ b/cpukit/aclocal/enable-itron.m4
@@ -5,7 +5,7 @@ AC_DEFUN([RTEMS_ENABLE_ITRON],
 ## AC_BEFORE([$0], [RTEMS_CHECK_ITRON_API])dnl
 
 AC_ARG_ENABLE(itron,
-AC_HELP_STRING([--enable-itron],[enable itron interface]),
+AS_HELP_STRING(--enable-itron,enable itron interface),
 [case "${enableval}" in 
   yes) RTEMS_HAS_ITRON_API=yes ;;
   no) RTEMS_HAS_ITRON_API=no ;;
diff --git a/cpukit/aclocal/enable-multiprocessing.m4 b/cpukit/aclocal/enable-multiprocessing.m4
index 13807b4a34..f664800e40 100644
--- a/cpukit/aclocal/enable-multiprocessing.m4
+++ b/cpukit/aclocal/enable-multiprocessing.m4
@@ -3,7 +3,7 @@ dnl $Id$
 AC_DEFUN([RTEMS_ENABLE_MULTIPROCESSING],
 [
 AC_ARG_ENABLE(multiprocessing,
-AC_HELP_STRING([--enable-multiprocessing],[enable multiprocessing interface]),
+AS_HELP_STRING(--enable-multiprocessing,enable multiprocessing interface),
 [case "${enable_multiprocessing}" in 
   yes) ;;
   no) ;;
diff --git a/cpukit/aclocal/enable-networking.m4 b/cpukit/aclocal/enable-networking.m4
index 00a4b6258c..a7be7b4df7 100644
--- a/cpukit/aclocal/enable-networking.m4
+++ b/cpukit/aclocal/enable-networking.m4
@@ -5,7 +5,7 @@ AC_DEFUN([RTEMS_ENABLE_NETWORKING],
 ## AC_BEFORE([$0], [RTEMS_CHECK_NETWORKING])dnl
 
 AC_ARG_ENABLE(networking,
-AC_HELP_STRING([--enable-networking],[enable TCP/IP stack]),
+AS_HELP_STRING(--enable-networking,enable TCP/IP stack),
 [case "${enableval}" in
   yes) RTEMS_HAS_NETWORKING=yes ;;
   no) RTEMS_HAS_NETWORKING=no ;;
diff --git a/cpukit/aclocal/enable-posix.m4 b/cpukit/aclocal/enable-posix.m4
index 473b477c41..fe0f314e76 100644
--- a/cpukit/aclocal/enable-posix.m4
+++ b/cpukit/aclocal/enable-posix.m4
@@ -5,7 +5,7 @@ AC_DEFUN([RTEMS_ENABLE_POSIX],
 ## AC_BEFORE([$0], [RTEMS_CHECK_POSIX_API])dnl
 
 AC_ARG_ENABLE(posix,
-AC_HELP_STRING([--enable-posix],[enable posix interface]),
+AS_HELP_STRING(--enable-posix,enable posix interface),
 [case "${enableval}" in 
   yes) RTEMS_HAS_POSIX_API=yes ;;
   no) RTEMS_HAS_POSIX_API=no ;;
diff --git a/cpukit/aclocal/enable-rtems-debug.m4 b/cpukit/aclocal/enable-rtems-debug.m4
index 2f03a837b6..ada9fe30f4 100644
--- a/cpukit/aclocal/enable-rtems-debug.m4
+++ b/cpukit/aclocal/enable-rtems-debug.m4
@@ -3,7 +3,7 @@
 AC_DEFUN([RTEMS_ENABLE_RTEMS_DEBUG],
 [
 AC_ARG_ENABLE(rtems-debug,
-AC_HELP_STRING([--enable-rtems-debug],[enable RTEMS_DEBUG]),
+AS_HELP_STRING(--enable-rtems-debug,enable RTEMS_DEBUG),
 [case "${enable_rtems_debug}" in
   yes) enable_rtems_debug=yes ;;
   no)  enable_rtems_debug=no ;;
diff --git a/cpukit/aclocal/multi.m4 b/cpukit/aclocal/multi.m4
index 2ba316d837..d629840d25 100644
--- a/cpukit/aclocal/multi.m4
+++ b/cpukit/aclocal/multi.m4
@@ -3,8 +3,7 @@
 AC_DEFUN([AC_ENABLE_MULTILIB],
 [
 AC_ARG_ENABLE(multilib,
-AC_HELP_STRING([--enable-multilib],
-[build many library versions (default=no)]),
+AS_HELP_STRING(--enable-multilib,build many library versions (default=no)),
 [case "${enableval}" in
   yes) multilib=yes ;;
   no)  multilib=no ;;
diff --git a/cpukit/aclocal/multilib.m4 b/cpukit/aclocal/multilib.m4
index d76c71d26f..90e6217780 100644
--- a/cpukit/aclocal/multilib.m4
+++ b/cpukit/aclocal/multilib.m4
@@ -1,17 +1,14 @@
 dnl This provides configure definitions used for multilib support
 
-dnl parts of these macros are derived from newlib-1.8.2's multilib support
-
 AC_DEFUN([RTEMS_ENABLE_MULTILIB],
 [
 AC_ARG_ENABLE(multilib,
-AC_HELP_STRING([--enable-multilib],
-[build many library versions (default=no)]),
+AS_HELP_STRING(--enable-multilib,build many library versions (default=no)),
 [case "${enableval}" in
   yes) multilib=yes ;;
   no)  multilib=no ;;
   *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
  esac], [multilib=no])dnl
 
-AM_CONDITIONAL(MULTILIB,test x"${multilib}" = x"yes")
+AM_CONDITIONAL([MULTILIB],[test x"${multilib}" = x"yes"])
 ])