diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2006-01-11 04:43:46 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2006-01-11 04:43:46 +0000 |
| commit | cce0948f76539d1d2759dd46e0230b36087ede25 (patch) | |
| tree | b69ac41b4fac4a1087fde2b12a493bf877c573ea /c/src | |
| parent | 2006-01-11 Ralf Corsepius <ralf.corsepius@freenet.de> (diff) | |
| download | rtems-cce0948f76539d1d2759dd46e0230b36087ede25.tar.bz2 | |
2006-01-11 Ralf Corsepius <ralf.corsepius@rtems.org>
* aclocal/bsp-configure.m4: Add ampolish3.
New header guards.
Diffstat (limited to 'c/src')
| -rw-r--r-- | c/src/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/aclocal/bsp-configure.m4 | 15 |
2 files changed, 16 insertions, 4 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index b517f12d98..68b9acaf0c 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,8 @@ +2006-01-11 Ralf Corsepius <ralf.corsepius@rtems.org> + + * aclocal/bsp-configure.m4: Add ampolish3. + New header guards. + 2006-01-09 Ralf Corsepius <ralf.corsepius@rtems.org> * libchip/network/open_eth.c, libchip/network/open_eth.h: diff --git a/c/src/aclocal/bsp-configure.m4 b/c/src/aclocal/bsp-configure.m4 index 1a8e7bfb1d..bcd0d88aed 100644 --- a/c/src/aclocal/bsp-configure.m4 +++ b/c/src/aclocal/bsp-configure.m4 @@ -8,18 +8,25 @@ AC_DEFUN([RTEMS_BSP_CONFIGURE], AM_MAINTAINER_MODE RTEMS_ENV_RTEMSBSP + AC_PATH_PROG([AMPOLISH3],[ampolish3],[]) + AM_CONDITIONAL([AMPOLISH3],[test x"$USE_MAINTAINER_MODE" = x"yes" \ + && test -n "$AMPOLISH3"]) + RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) AC_CONFIG_HEADERS([include/bspopts.tmp:include/bspopts.h.in],[ echo "/* BSP dependent options file */" >$tmp/config.h echo "/* automatically generated -- DO NOT EDIT!! */" >>$tmp/config.h echo >>$tmp/config.h -echo "#ifndef __BSP_OPTIONS_h" >>$tmp/config.h -echo "#define __BSP_OPTIONS_h" >>$tmp/config.h +echo "#ifndef __BSP_OPTIONS_H" >>$tmp/config.h +echo "#define __BSP_OPTIONS_H" >>$tmp/config.h echo >>$tmp/config.h -sed -e '/.*PACKAGE.*/d' include/bspopts.tmp >> $tmp/config.h +sed \ + -e '/.*PACKAGE.*/d' \ + -e '/\/\* Define to.*this package.*\*\//d' \ +include/bspopts.tmp >> $tmp/config.h echo >>$tmp/config.h -echo "#endif" >>$tmp/config.h +echo "#endif /* __BSP_OPTIONS_H */" >>$tmp/config.h AS_IF([cmp -s include/bspopts.h $tmp/config.h 2>/dev/null],[ AC_MSG_NOTICE([include/bspopts.h is unchanged]) rm -f $tmp/config.h],[ |