2001-10-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* aclocal.m4: Regenerated.
	* configure.ac, include/Makefile.am, irq/Makefile.am,
	vectors/Makefile.am: Updated to autoconf 2.52.
	* include/.cvsignore: Added newly generated files.
	* include/bsp.h: Added include of bspopts.h.

8 files changed, 104 insertions, 74 deletions

diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
index 583832236a..aeeaad931e 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal.m4: Regenerated.
+	* configure.ac, include/Makefile.am, irq/Makefile.am,
+	vectors/Makefile.am: Updated to autoconf 2.52.
+	* include/.cvsignore: Added newly generated files.
+	* include/bsp.h: Added include of bspopts.h.
+
 2001-10-22	Joel Sherrill <joel@OARcorp.com>
 
 	* .cvsignore, configure.ac, configure.in, console/.cvsignore,
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/aclocal.m4 b/c/src/lib/libbsp/powerpc/mpc8260ads/aclocal.m4
index bee4d5b3a9..8a806db981 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/aclocal.m4
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/aclocal.m4
@@ -773,21 +773,6 @@ fi
 
 dnl $Id$
 
-AC_DEFUN(RTEMS_ENABLE_NETWORKING,
-[
-
-AC_ARG_ENABLE(networking,
-AC_HELP_STRING([--enable-networking],[enable TCP/IP stack]),
-[case "${enableval}" in
-  yes) RTEMS_HAS_NETWORKING=yes ;;
-  no) RTEMS_HAS_NETWORKING=no ;;
-  *)  AC_MSG_ERROR(bad value ${enableval} for enable-networking option) ;;
-esac],[RTEMS_HAS_NETWORKING=yes])
-AC_SUBST(RTEMS_HAS_NETWORKING)dnl
-])
-
-dnl $Id$
-
 dnl Pass a single BSP via an environment variable
 dnl used by per BSP configure scripts
 AC_DEFUN(RTEMS_ENV_RTEMSBSP,
@@ -984,36 +969,6 @@ AC_SUBST(RTEMS_BSP_FAMILY)
 ])dnl
 
 dnl $Id$
-dnl
-AC_DEFUN(RTEMS_CHECK_NETWORKING,
-[dnl
-AC_REQUIRE([RTEMS_CHECK_CPU])dnl
-AC_REQUIRE([RTEMS_ENABLE_NETWORKING])dnl
-
-AC_CACHE_CHECK([whether BSP supports networking],
-  rtems_cv_HAS_NETWORKING,
-  [dnl
-    case "$RTEMS_CPU" in
-    unix*)
-      rtems_cv_HAS_NETWORKING="no"
-      ;;
-    *)
-      if test "${RTEMS_HAS_NETWORKING}" = "yes"; then
-        rtems_cv_HAS_NETWORKING="yes";
-      else
-        rtems_cv_HAS_NETWORKING="disabled";
-      fi
-      ;;
-    esac])
-if test "$rtems_cv_HAS_NETWORKING" = "yes"; then
-  HAS_NETWORKING="yes";
-else
-  HAS_NETWORKING="no";
-fi
-AC_SUBST(HAS_NETWORKING)dnl
-])
-
-dnl $Id$
 
 AC_DEFUN(RTEMS_CANONICAL_HOST,
 [dnl
@@ -1039,3 +994,70 @@ esac
 AC_SUBST(RTEMS_HOST)
 ])dnl
 
+# Like AC_CONFIG_HEADER, but automatically create stamp file.
+
+# serial 3
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  We must strip everything past the first ":",
+# and everything past the last "/".
+
+AC_PREREQ([2.12])
+
+AC_DEFUN([AM_CONFIG_HEADER],
+[ifdef([AC_FOREACH],dnl
+	 [dnl init our file count if it isn't already
+	 m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0]))
+	 dnl prepare to store our destination file list for use in config.status
+	 AC_FOREACH([_AM_File], [$1],
+		    [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*]))
+		    m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index))
+		    dnl and add it to the list of files AC keeps track of, along
+		    dnl with our hook
+		    AC_CONFIG_HEADERS(_AM_File,
+dnl COMMANDS, [, INIT-CMDS]
+[# update the timestamp
+echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index["
+][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS
+		    m4_popdef([_AM_Dest])])],dnl
+[AC_CONFIG_HEADER([$1])
+  AC_OUTPUT_COMMANDS(
+   ifelse(patsubst([$1], [[^ ]], []),
+	  [],
+	  [test -z "$CONFIG_HEADERS" || echo timestamp >dnl
+	   patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl
+[am_indx=1
+for am_file in $1; do
+  case " \$CONFIG_HEADERS " in
+  *" \$am_file "*)
+    am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\`
+    if test -n "\$am_dir"; then
+      am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\`
+      for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do
+        am_tmpdir=\$am_tmpdir\$am_subdir/
+        if test ! -d \$am_tmpdir; then
+          mkdir \$am_tmpdir
+        fi
+      done
+    fi
+    echo timestamp > "\$am_dir"stamp-h\$am_indx
+    ;;
+  esac
+  am_indx=\`expr \$am_indx + 1\`
+done])
+])]) # AM_CONFIG_HEADER
+
+# _AM_DIRNAME(PATH)
+# -----------------
+# Like AS_DIRNAME, only do it during macro expansion
+AC_DEFUN([_AM_DIRNAME],
+       [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
+	      m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1,
+		    m4_if(m4_regexp([$1], [^/.*]), -1,
+			  [.],
+			  m4_patsubst([$1], [^\(/\).*], [\1])),
+		    m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
+	      m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
+]) # _AM_DIRNAME
+
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac b/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac
index 3737693eca..034783a749 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac
@@ -2,8 +2,9 @@
 ## 
 ## $Id$
 
-AC_PREREQ(2.13)
-AC_INIT(bsp_specs)
+AC_PREREQ(2.52)
+AC_INIT
+AC_CONFIG_SRCDIR([bsp_specs])
 RTEMS_TOP(../../../../../..)
 AC_CONFIG_AUX_DIR(../../../../../..)
 
@@ -11,23 +12,21 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc-mpc8260,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_PROG_CC_FOR_TARGET
+RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
 RTEMS_CANONICALIZE_TOOLS
-RTEMS_ENABLE_LIBCDIR
-RTEMS_ENABLE_NETWORKING
 
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
-RTEMS_CHECK_NETWORKING
 RTEMS_CANONICAL_HOST
 
+AM_CONFIG_HEADER(include/bspopts.h)
+
 RTEMS_PROJECT_ROOT
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 
 # Explicitly list a Makefile here 
-AC_OUTPUT( 
-Makefile
+AC_CONFIG_FILES([Makefile
 clock/Makefile
 console/Makefile
 include/Makefile
@@ -36,4 +35,5 @@ irq/Makefile
 vectors/Makefile
 start/Makefile
 startup/Makefile
-wrapup/Makefile)
+wrapup/Makefile])
+AC_OUTPUT
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/include/.cvsignore b/c/src/lib/libbsp/powerpc/mpc8260ads/include/.cvsignore
index 282522db03..52af989c62 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/include/.cvsignore
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/include/.cvsignore
@@ -1,2 +1,4 @@
 Makefile
 Makefile.in
+bspopts.h*
+stamp-h*
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/include/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/include/Makefile.am
index c10ba294ff..44f8daa26b 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/include/Makefile.am
@@ -4,9 +4,7 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = bsp.h coverhd.h
-
-BSP_H_FILES =
+include_HEADERS = bsp.h bspopts.h coverhd.h
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
@@ -14,17 +12,12 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/bsp: 
 	$(mkinstalldirs) $@
 
-$(PROJECT_INCLUDE)/bsp.h: bsp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/coverhd.h: coverhd.h
+$(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-
-
-PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp \
-	$(PROJECT_INCLUDE)/bsp.h \
-	$(PROJECT_INCLUDE)/coverhd.h
+PREINSTALL_FILES = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp \
+	$(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \
+	$(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%)
 
 all-local: $(PREINSTALL_FILES)
 
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h b/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h
index 7fc940cbe5..84c29ca559 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h
@@ -21,6 +21,8 @@
 extern "C" {
 #endif
 
+#include <bspopts.h>
+
 #include <rtems.h>
 #include <console.h>
 #include <clockdrv.h>
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am
index 4b5bc87fe4..b168985a3c 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am
@@ -4,10 +4,12 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
+include_bspdir = $(includedir)/bsp
+
 C_FILES = irq.c irq_init.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
-H_FILES = irq.h
+include_bsp_HEADERS = irq.h
 
 S_FILES = irq_asm.S
 S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
@@ -18,6 +20,7 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../../automake/compile.am
 include $(top_srcdir)/../../../../../../automake/lib.am
 
+## FIXME: WTF is this?
 SORDID_HACK:
 	rm -f $(PROJECT_INCLUDE)/bsp/irq.h
 
@@ -27,8 +30,8 @@ $(PROJECT_INCLUDE)/bsp:
 $(PROJECT_INCLUDE)/bsp/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp \
-    $(H_FILES:%.h=$(PROJECT_INCLUDE)/bsp/%.h)
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \
+    $(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/Makefile.am
index d3a237fee4..8114c5c8da 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/Makefile.am
@@ -4,12 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-VPATH = @srcdir@:
-
 C_FILES = vectors_init.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
-H_FILES = vectors.h
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS = vectors.h   
 
 S_FILES = vectors.S
 S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
@@ -30,10 +29,11 @@ $(PGM): $(OBJS)
 $(PROJECT_INCLUDE)/bsp:
 	$(mkinstalldirs) $@
 
-$(PROJECT_INCLUDE)/bsp/vectors.h: vectors.h
+$(PROJECT_INCLUDE)/bsp/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp $(PROJECT_INCLUDE)/bsp/vectors.h
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \
+   $(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%)
 
 all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS)