summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am1
-rw-r--r--aclocal/config-subdirs.m434
3 files changed, 5 insertions, 35 deletions
diff --git a/ChangeLog b/ChangeLog
index 573da1a23b..a8de0d4898 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2003-10-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+ * aclocal/config-subdirs.m4: Remove.
+ * Makefile.am: Reflect changes above.
+
+2003-10-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
* aclocal/canonical-host.m4: Remove.
* Makefile.am: Reflect changes above.
diff --git a/Makefile.am b/Makefile.am
index 1f5955e504..b9af5c720d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,6 @@ ACLOCAL_FILES += aclocal/bsp-alias.m4
ACLOCAL_FILES += aclocal/canonical-target-name.m4
ACLOCAL_FILES += aclocal/check-bsps.m4
ACLOCAL_FILES += aclocal/check-custom-bsp.m4
-ACLOCAL_FILES += aclocal/config-subdirs.m4
ACLOCAL_FILES += aclocal/enable-bare.m4
ACLOCAL_FILES += aclocal/enable-cxx.m4
ACLOCAL_FILES += aclocal/enable-inlines.m4
diff --git a/aclocal/config-subdirs.m4 b/aclocal/config-subdirs.m4
deleted file mode 100644
index 6f9360bc80..0000000000
--- a/aclocal/config-subdirs.m4
+++ /dev/null
@@ -1,34 +0,0 @@
-dnl $Id$
-
-dnl
-dnl Misc utility macros for subdir handling to work around missing abilities
-dnl in autoconf, automake and structural issues with RTEMS
-dnl
-dnl Contains parts derived from autoconf-2.13 AC_OUTPUT_SUBDIRS and Cygnus'
-dnl configure.in.
-dnl
-
-dnl
-dnl _AC_DOTS(PATH)
-dnl
-AC_DEFUN(_AC_DOTS,[
-# A "../" for each directory in $1.
- ac_dots=`echo $1 | \
- sed -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'`
-])
-
-dnl
-dnl _RTEMS_ADJUST_SRCDIR(REVAR,CONFIG_DIR[,TARGET_SUBDIR])
-dnl
-AC_DEFUN(_RTEMS_ADJUST_SRCDIR,[
- _AC_DOTS(ifelse([$3], ,[$2],[$3/$2]))
-
- case "$srcdir" in
- .) # No --srcdir option. We are building in place.
- $1=$srcdir ;;
- [[\\/]]* | ?:[[\\/]]*) # Absolute path.
- $1=$srcdir/$2 ;;
- *) # Relative path.
- $1=$ac_dots$srcdir/$2 ;;
- esac
-])