summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/m68k/mvme162/tools
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-27 13:57:21 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-27 13:57:21 +0000
commit0134f4fbdf9f1ff0c09033b2a37a54ddef03a22a (patch)
tree3962014d67696fdbc7e110644ee6eb622c6cd98d /c/src/lib/libbsp/m68k/mvme162/tools
parent2000-10-27 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-0134f4fbdf9f1ff0c09033b2a37a54ddef03a22a.tar.bz2
2000-10-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.in, Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros. Switch to GNU canonicalization.
Diffstat (limited to '')
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/tools/ChangeLog7
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am9
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/tools/configure.in11
3 files changed, 22 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme162/tools/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/tools/ChangeLog
index 101734ce64..a264a66f5b 100644
--- a/c/src/lib/libbsp/m68k/mvme162/tools/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme162/tools/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros.
+ Switch to GNU canonicalization, conditionalize building sload.
+ * configure.in: Add checks to build sload, conditionalize building
+ sload.
+
2000-08-10 Joel Sherrill <joel@OARcorp.com>
* ChangeLog: New file.
diff --git a/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am
index 3eb08bee2d..f5a241305f 100644
--- a/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am
@@ -3,15 +3,16 @@
##
AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
-
-noinst_PROGRAMS = sload
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
sload_SOURCES = sload.c
+if SLOAD_BUILDABLE
+noinst_PROGRAMS = sload
+
## HACK: install to build-tree
install-exec-local: $(PROGRAMS)
$(mkinstalldirs) $(PROJECT_ROOT)/mvme162/bin
$(INSTALL_PROGRAM) $(PROGRAMS) $(PROJECT_ROOT)/mvme162/bin
-
+endif
include $(top_srcdir)/../../../../../../../automake/host.am
diff --git a/c/src/lib/libbsp/m68k/mvme162/tools/configure.in b/c/src/lib/libbsp/m68k/mvme162/tools/configure.in
index 514451c0bd..f96edd3650 100644
--- a/c/src/lib/libbsp/m68k/mvme162/tools/configure.in
+++ b/c/src/lib/libbsp/m68k/mvme162/tools/configure.in
@@ -14,10 +14,19 @@ AC_EXEEXT
AC_PROG_CC
+## FIXME: The checks below are probably incorrect and will not work for
+## those actually having sys/vme.h
+## Please report any errors related to it, otherwise we will not be able
+## to fix building/configuring sload
AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
+AC_CHECK_HEADERS(unistd.h sys/vme.h)
AC_FUNC_MMAP
+AM_CONDITIONAL(SLOAD_BUILDABLE,
+test "$ac_cv_header_sys_vme_h" = "yes" \
+-a "$ac_cv_header_unistd_h" = "yes" \
+-a "$ac_cv_header_stdc" = "yes" )
+
RTEMS_PROJECT_ROOT
RTEMS_TOOLPATHS