diff options
| -rw-r--r-- | c/src/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/aclocal/rtems-ampolish.m4 | 10 | ||||
| -rw-r--r-- | c/src/configure.ac | 5 | ||||
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/aclocal/rtems-ampolish.m4 | 10 | ||||
| -rw-r--r-- | cpukit/configure.ac | 4 |
6 files changed, 32 insertions, 7 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 79b9b7d37b..e642a8e3b4 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,8 @@ +2006-05-16 Ralf Corsépius <ralf.corsepius@rtems.org> + + * aclocal/rtems-ampolish.m4: New. + * configure.ac: Use RTEMS_AMPOLISH3. + 2006-04-18 Joel Sherrill <joel@OARcorp.com> * aclocal/version.m4: Updated to rtems-4.6.99.3. diff --git a/c/src/aclocal/rtems-ampolish.m4 b/c/src/aclocal/rtems-ampolish.m4 new file mode 100644 index 0000000000..9413045509 --- /dev/null +++ b/c/src/aclocal/rtems-ampolish.m4 @@ -0,0 +1,10 @@ +# $Id$ + +AC_DEFUN([RTEMS_AMPOLISH3], +[ +AC_PATH_PROG([AMPOLISH3],[ampolish3],[]) +AM_CONDITIONAL([AMPOLISH3], +[test x"$USE_MAINTAINER_MODE" = x"yes" \ + && test -n "$AMPOLISH3"]) +]) + diff --git a/c/src/configure.ac b/c/src/configure.ac index ca32f2c22c..647d684e4b 100644 --- a/c/src/configure.ac +++ b/c/src/configure.ac @@ -251,10 +251,7 @@ AM_CONDITIONAL(RTEMS_ADA,[test x"$enable_ada" = x"yes" \ && test x"$rtems_cv_HAS_POSIX_API" = x"yes"]) RTEMS_PROJECT_ROOT - -AC_PATH_PROG([AMPOLISH3],[ampolish3],[]) -AM_CONDITIONAL([AMPOLISH3],[test x"$USE_MAINTAINER_MODE" = x"yes" \ - && test -n "$AMPOLISH3"]) +RTEMS_AMPOLISH3 # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile], diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index f75813d4e0..a4f24efa12 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2006-05-16 Ralf Corsépius <ralf.corsepius@rtems.org> + + * aclocal/rtems-ampolish.m4: New. + * configure.ac: Use RTEMS_AMPOLISH3. + 2006-04-27 Eric Norum <norume@aps.anl.gov> * telnetd/pty.c: Accept <CR><NUL> as equivalent to <CR><LF>. diff --git a/cpukit/aclocal/rtems-ampolish.m4 b/cpukit/aclocal/rtems-ampolish.m4 new file mode 100644 index 0000000000..9413045509 --- /dev/null +++ b/cpukit/aclocal/rtems-ampolish.m4 @@ -0,0 +1,10 @@ +# $Id$ + +AC_DEFUN([RTEMS_AMPOLISH3], +[ +AC_PATH_PROG([AMPOLISH3],[ampolish3],[]) +AM_CONDITIONAL([AMPOLISH3], +[test x"$USE_MAINTAINER_MODE" = x"yes" \ + && test -n "$AMPOLISH3"]) +]) + diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 67e0a2f8dd..f3430034ed 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -275,9 +275,7 @@ AM_CONDITIONAL([NEED_SYS_QUEUE_H],[test x"$NEED_SYS_QUEUE_H" = x"yes"]) AM_CONDITIONAL([LIBSHELL],[test x"$HAVE_ASSIGNABLE_STDIO" = x"yes"]) AM_CONDITIONAL([LIBSERDBG],[test x"$rtems_cv_cc_attribute_weak" = x"yes"]) -AC_PATH_PROG([AMPOLISH3],[ampolish3],[]) -AM_CONDITIONAL([AMPOLISH3],[test x"$USE_MAINTAINER_MODE" = x"yes" \ - && test -n "$AMPOLISH3"]) +RTEMS_AMPOLISH3 AC_CONFIG_HEADER(config.h) |