11 files changed, 11 insertions, 61 deletions
diff --git a/aclocal/cygwin.m4 b/aclocal/cygwin.m4
deleted file mode 100644
index 62b07ae4fd..0000000000
--- a/aclocal/cygwin.m4
+++ /dev/null
@@ -1,21 +0,0 @@
-dnl
-dnl  $Id$
-dnl 
-dnl Detect the Cygwin32 environment (unix under Win32)
-dnl
-dnl 98/06/16 David Fiddes   	(D.J.Fiddes@hw.ac.uk)
-dnl				Hacked from automake-1.3
-
-# Check to see if we're running under Cygwin32, without using
-# AC_CANONICAL_*.  If so, set output variable CYGWIN32 to "yes".
-# Otherwise set it to "no".
-
-dnl RTEMS_CYGWIN32()
-AC_DEFUN(RTEMS_CYGWIN32,
-[AC_CACHE_CHECK(for Cygwin32 environment, rtems_cv_cygwin32,
-[AC_TRY_COMPILE(,[return __CYGWIN32__;],
-rtems_cv_cygwin32=yes, rtems_cv_cygwin32=no)
-rm -f conftest*])
-CYGWIN32=
-test "$rtems_cv_cygwin32" = yes && CYGWIN32=yes])
-
diff --git a/aclocal/enable-gmake-print.m4 b/aclocal/enable-gmake-print.m4
index ab3c0b7282..3c2973db29 100644
--- a/aclocal/enable-gmake-print.m4
+++ b/aclocal/enable-gmake-print.m4
@@ -12,4 +12,5 @@ AC_ARG_ENABLE(gmake-print-directory,
   *)  AC_MSG_ERROR(bad value ${enableval} for gmake-print-directory option)
 ;;
 esac],[RTEMS_USE_OWN_PDIR=yes])
+AC_SUBST(RTEMS_USE_OWN_PDIR)dnl
 ])
diff --git a/aclocal/enable-hwapi.m4 b/aclocal/enable-hwapi.m4
index f639f29c5f..ce6ef3f3a1 100644
--- a/aclocal/enable-hwapi.m4
+++ b/aclocal/enable-hwapi.m4
@@ -11,4 +11,5 @@ AC_ARG_ENABLE(hwapi, \
     no)  RTEMS_HAS_HWAPI=no ;;
     *)  AC_MSG_ERROR(bad value ${enableval} for hwapi option) ;;
   esac],[RTEMS_HAS_HWAPI=no])
+AC_SUBST(RTEMS_HAS_HWAPI)dnl
 ])dnl
diff --git a/aclocal/enable-inlines.m4 b/aclocal/enable-inlines.m4
index 4456bb1634..f4d00c39d2 100644
--- a/aclocal/enable-inlines.m4
+++ b/aclocal/enable-inlines.m4
@@ -9,4 +9,5 @@ AC_DEFUN(RTEMS_ENABLE_INLINES,
   no) RTEMS_USE_MACROS=yes ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for disable-rtems-inlines option) ;;
 esac],[RTEMS_USE_MACROS=no])
+AC_SUBST(RTEMS_USE_MACROS)dnl
 ])
diff --git a/aclocal/enable-libcdir.m4 b/aclocal/enable-libcdir.m4
index a3195dfd3a..892070522b 100644
--- a/aclocal/enable-libcdir.m4
+++ b/aclocal/enable-libcdir.m4
@@ -6,4 +6,5 @@ AC_ARG_ENABLE(libcdir,
 [  --enable-libcdir=directory           set the directory for the C library],
 [ RTEMS_LIBC_DIR="${enableval}" ; \
 test -d ${enableval} || AC_MSG_ERROR("$enableval is not a directory" ) ] )
+AC_SUBST(RTEMS_LIBC_DIR)dnl
 ])
diff --git a/aclocal/enable-multiprocessing.m4 b/aclocal/enable-multiprocessing.m4
index a53f7e07f7..b04b7ee524 100644
--- a/aclocal/enable-multiprocessing.m4
+++ b/aclocal/enable-multiprocessing.m4
@@ -9,4 +9,5 @@ AC_ARG_ENABLE(multiprocessing,
   no) RTEMS_HAS_MULTIPROCESSING=no ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-multiprocessing option) ;;
 esac],[RTEMS_HAS_MULTIPROCESSING=no])
+AC_SUBST(RTEMS_HAS_MULTIPROCESSING)dnl
 ])
diff --git a/aclocal/enable-networking.m4 b/aclocal/enable-networking.m4
index bb0fd76717..5bc5b55498 100644
--- a/aclocal/enable-networking.m4
+++ b/aclocal/enable-networking.m4
@@ -9,4 +9,5 @@ AC_ARG_ENABLE(networking,
   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
 ])
diff --git a/aclocal/enable-posix.m4 b/aclocal/enable-posix.m4
index a027f86e43..9384ea3a7d 100644
--- a/aclocal/enable-posix.m4
+++ b/aclocal/enable-posix.m4
@@ -9,6 +9,7 @@ AC_ARG_ENABLE(posix,
   no) RTEMS_HAS_POSIX_API=no ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-posix option) ;;
 esac],[RTEMS_HAS_POSIX_API=yes]) 
+AC_SUBST(RTEMS_HAS_POSIX_API)
 
 changequote(,)dnl
 case "${target}" in
diff --git a/aclocal/enable-rdbg.m4 b/aclocal/enable-rdbg.m4
index b3dc42f471..927a3428bf 100644
--- a/aclocal/enable-rdbg.m4
+++ b/aclocal/enable-rdbg.m4
@@ -9,4 +9,5 @@ AC_ARG_ENABLE(rdbg,
   no) RTEMS_HAS_RDBG=no ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-rdbg option) ;;
 esac],[RTEMS_HAS_RDBG=no])
+AC_SUBST(RTEMS_HAS_RDBG)dnl
 ])
diff --git a/aclocal/exeext.m4 b/aclocal/exeext.m4
deleted file mode 100644
index 546351e66b..0000000000
--- a/aclocal/exeext.m4
+++ /dev/null
@@ -1,38 +0,0 @@
-dnl
-dnl  $Id$
-dnl 
-dnl Set the EXE extension
-dnl
-dnl 98/06/16 David Fiddes   	(D.J.Fiddes@hw.ac.uk)
-dnl				Hacked from automake-1.3
-
-# Check to see if we're running under Win32, without using
-# AC_CANONICAL_*.  If so, set output variable EXEEXT to ".exe".
-# Otherwise set it to "".
-
-dnl RTEMS_EXEEXT()
-dnl This knows we add .exe if we're building in the Cygwin32
-dnl environment. But if we're not, then it compiles a test program
-dnl to see if there is a suffix for executables.
-AC_DEFUN(RTEMS_EXEEXT,
-[AC_REQUIRE([RTEMS_CYGWIN32])
-AC_MSG_CHECKING([for executable suffix])
-AC_CACHE_VAL(rtems_cv_exeext,
-[if test "$CYGWIN32" = yes; then
-rtems_cv_exeext=.exe
-else
-cat > rtems_c_test.c << 'EOF'
-int main() {
-/* Nothing needed here */
-}
-EOF
-${CC-cc} -o rtems_c_test $CFLAGS $CPPFLAGS $LDFLAGS rtems_c_test.c $LIBS 1>&5
-rtems_cv_exeext=`echo rtems_c_test.* | grep -v rtems_c_test.c | sed -e s/rtems_c_test//`
-rm -f rtems_c_test*])
-test x"${rtems_cv_exeext}" = x && rtems_cv_exeext=no
-fi
-EXEEXT=""
-test x"${rtems_cv_exeext}" != xno && EXEEXT=${rtems_cv_exeext}
-AC_MSG_RESULT(${rtems_cv_exeext})
-AC_SUBST(EXEEXT)])
-
diff --git a/aclocal/i386-gas-code16.m4 b/aclocal/i386-gas-code16.m4
index 507d18d80e..ec0314980e 100644
--- a/aclocal/i386-gas-code16.m4
+++ b/aclocal/i386-gas-code16.m4
@@ -6,7 +6,7 @@ dnl check for i386 gas supporting 16 bit mode
 dnl     - binutils 2.9.1.0.7 and higher
 
 AC_DEFUN(RTEMS_I386_GAS_CODE16,
-  if test "${target_cpu}" = "i386"; then
+[ if test "${target_cpu}" = "i386"; then
     AC_CACHE_CHECK([for 16 bit mode assembler support],
       rtems_cv_prog_gas_code16,
       [cat > conftest.s << EOF
@@ -22,5 +22,6 @@ EOF
       fi])
     RTEMS_GAS_CODE16="$rtems_cv_prog_gas_code16"
   fi
-)
+  AC_SUBST(RTEMS_GAS_CODE16)
+])