libgloss: use m4_foreach_w to simplify the logic a bit
It's functionally the same, but the configure.ac code is simpler and less boiler plate duplicated.
This commit is contained in:
parent
020fa7ed7b
commit
89f643e87b
|
@ -629,10 +629,10 @@ CPPFLAGS
|
||||||
LDFLAGS
|
LDFLAGS
|
||||||
CFLAGS
|
CFLAGS
|
||||||
CC
|
CC
|
||||||
CONFIG_LIBNOSYS_FALSE
|
|
||||||
CONFIG_LIBNOSYS_TRUE
|
|
||||||
CONFIG_WINCE_FALSE
|
CONFIG_WINCE_FALSE
|
||||||
CONFIG_WINCE_TRUE
|
CONFIG_WINCE_TRUE
|
||||||
|
CONFIG_LIBNOSYS_FALSE
|
||||||
|
CONFIG_LIBNOSYS_TRUE
|
||||||
CONFIG_IQ2000_FALSE
|
CONFIG_IQ2000_FALSE
|
||||||
CONFIG_IQ2000_TRUE
|
CONFIG_IQ2000_TRUE
|
||||||
CONFIG_BFIN_FALSE
|
CONFIG_BFIN_FALSE
|
||||||
|
@ -2958,7 +2958,7 @@ subdirs="$subdirs aarch64"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if test x$config_bfin = xtrue; then
|
if test x$config_bfin = xtrue; then
|
||||||
CONFIG_BFIN_TRUE=
|
CONFIG_BFIN_TRUE=
|
||||||
CONFIG_BFIN_FALSE='#'
|
CONFIG_BFIN_FALSE='#'
|
||||||
else
|
else
|
||||||
|
@ -2966,7 +2966,7 @@ else
|
||||||
CONFIG_BFIN_FALSE=
|
CONFIG_BFIN_FALSE=
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test x$config_iq2000 = xtrue; then
|
if test x$config_iq2000 = xtrue; then
|
||||||
CONFIG_IQ2000_TRUE=
|
CONFIG_IQ2000_TRUE=
|
||||||
CONFIG_IQ2000_FALSE='#'
|
CONFIG_IQ2000_FALSE='#'
|
||||||
else
|
else
|
||||||
|
@ -2974,7 +2974,15 @@ else
|
||||||
CONFIG_IQ2000_FALSE=
|
CONFIG_IQ2000_FALSE=
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test x$config_wince = xtrue; then
|
if test x$config_libnosys = xtrue; then
|
||||||
|
CONFIG_LIBNOSYS_TRUE=
|
||||||
|
CONFIG_LIBNOSYS_FALSE='#'
|
||||||
|
else
|
||||||
|
CONFIG_LIBNOSYS_TRUE='#'
|
||||||
|
CONFIG_LIBNOSYS_FALSE=
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test x$config_wince = xtrue; then
|
||||||
CONFIG_WINCE_TRUE=
|
CONFIG_WINCE_TRUE=
|
||||||
CONFIG_WINCE_FALSE='#'
|
CONFIG_WINCE_FALSE='#'
|
||||||
else
|
else
|
||||||
|
@ -2984,14 +2992,6 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if test x$config_libnosys = xtrue; then
|
|
||||||
CONFIG_LIBNOSYS_TRUE=
|
|
||||||
CONFIG_LIBNOSYS_FALSE='#'
|
|
||||||
else
|
|
||||||
CONFIG_LIBNOSYS_TRUE='#'
|
|
||||||
CONFIG_LIBNOSYS_FALSE=
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
ac_ext=c
|
ac_ext=c
|
||||||
ac_cpp='$CPP $CPPFLAGS'
|
ac_cpp='$CPP $CPPFLAGS'
|
||||||
|
@ -5195,14 +5195,14 @@ if test -z "${CONFIG_IQ2000_TRUE}" && test -z "${CONFIG_IQ2000_FALSE}"; then
|
||||||
as_fn_error $? "conditional \"CONFIG_IQ2000\" was never defined.
|
as_fn_error $? "conditional \"CONFIG_IQ2000\" was never defined.
|
||||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
if test -z "${CONFIG_WINCE_TRUE}" && test -z "${CONFIG_WINCE_FALSE}"; then
|
|
||||||
as_fn_error $? "conditional \"CONFIG_WINCE\" was never defined.
|
|
||||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
||||||
fi
|
|
||||||
if test -z "${CONFIG_LIBNOSYS_TRUE}" && test -z "${CONFIG_LIBNOSYS_FALSE}"; then
|
if test -z "${CONFIG_LIBNOSYS_TRUE}" && test -z "${CONFIG_LIBNOSYS_FALSE}"; then
|
||||||
as_fn_error $? "conditional \"CONFIG_LIBNOSYS\" was never defined.
|
as_fn_error $? "conditional \"CONFIG_LIBNOSYS\" was never defined.
|
||||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
|
if test -z "${CONFIG_WINCE_TRUE}" && test -z "${CONFIG_WINCE_FALSE}"; then
|
||||||
|
as_fn_error $? "conditional \"CONFIG_WINCE\" was never defined.
|
||||||
|
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||||
|
fi
|
||||||
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
|
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
|
||||||
as_fn_error $? "conditional \"AMDEP\" was never defined.
|
as_fn_error $? "conditional \"AMDEP\" was never defined.
|
||||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||||
|
|
|
@ -237,9 +237,13 @@ case "${target}" in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
AM_CONDITIONAL(CONFIG_BFIN, test x$config_bfin = xtrue)
|
dnl These subdirs have converted to non-recursive make. Hopefully someday all
|
||||||
AM_CONDITIONAL(CONFIG_IQ2000, test x$config_iq2000 = xtrue)
|
dnl the ports above will too!
|
||||||
AM_CONDITIONAL(CONFIG_WINCE, test x$config_wince = xtrue)
|
m4_foreach_w([SUBDIR], [
|
||||||
|
bfin iq2000 libnosys wince
|
||||||
|
], [dnl
|
||||||
|
AM_CONDITIONAL([CONFIG_]m4_toupper(SUBDIR), [test x$config_]SUBDIR = xtrue)
|
||||||
|
])
|
||||||
|
|
||||||
dnl For now, don't bother configuring testsuite
|
dnl For now, don't bother configuring testsuite
|
||||||
dnl
|
dnl
|
||||||
|
@ -247,8 +251,6 @@ dnl if test "${config_testsuite}" = "true";
|
||||||
dnl then AC_CONFIG_SUBDIRS([testsuite])
|
dnl then AC_CONFIG_SUBDIRS([testsuite])
|
||||||
dnl fi
|
dnl fi
|
||||||
|
|
||||||
AM_CONDITIONAL(CONFIG_LIBNOSYS, test x$config_libnosys = xtrue)
|
|
||||||
|
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
AM_PROG_AS
|
AM_PROG_AS
|
||||||
AM_PROG_AR
|
AM_PROG_AR
|
||||||
|
|
Loading…
Reference in New Issue