diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | acinclude.m4 | 10 | ||||
| -rw-r--r-- | aclocal/prog-cc.m4 | 7 |
3 files changed, 17 insertions, 7 deletions
@@ -1,3 +1,10 @@ +2002-11-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * acinclude.m4: Add CXX_FOR_*, CXXFLAGS_FOR_*. + Fix stupid typo (continue/configure). + * aclocal/prog-cc.m4: Remove obsolete comments. + Acknowledge CFLAGS. + 2002-11-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * acinclude.m4: _RTEMS_OUTPUT_SUBDIRS: Move ac_subconfigure_vars to the diff --git a/acinclude.m4 b/acinclude.m4 index c5b4add5b6..2dc9691262 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -164,6 +164,10 @@ _RTEMS_ARG_VAR([CC_FOR_$2], [c-compiler to be used for $1 subdirs (default: auto-detected)]) _RTEMS_ARG_VAR([CFLAGS_FOR_$2], [c-flags to be used for $1 subdirs (default: provided by autoconf)]) +_RTEMS_ARG_VAR([CXX_FOR_$2], + [c++-compiler to be used for $1 subdirs (default: auto-detected)]) +_RTEMS_ARG_VAR([CXXFLAGS_FOR_$2], + [c++-flags to be used for $1 subdirs (default: provided by autoconf)]) if test "$no_recursion" != yes; then if test -n "${$2_SUBDIRS}"; then @@ -229,8 +233,12 @@ if test "$no_recursion" != yes; then ac_sub_configure_vars= test -n "[$]CC_FOR_$2" && \ ac_sub_configure_vars="'CC=[$]CC_FOR_$2'" + test -n "[$]CXX_FOR_$2" && \ + ac_sub_configure_vars="$ac_sub_configure_vars 'CXX=[$]CXX_FOR_$2'" test -n "[$]CFLAGS_FOR_$2" && \ ac_sub_configure_vars="$ac_sub_configure_vars 'CFLAGS=[$]CFLAGS_FOR_$2'" + test -n "[$]CXXFLAGS_FOR_$2" && \ + ac_sub_configure_vars="$ac_sub_configure_vars 'CXXFLAGS=[$]CXXFLAGS_FOR_$2'" AC_MSG_NOTICE([running $ac_sub_configure $ac_sub_configure_args $ac_sub_configure_vars]) eval $ac_sub_configure $ac_sub_configure_args $ac_sub_configure_vars || @@ -261,7 +269,7 @@ AC_DEFUN([_RTEMS_CONFIGURE_ARGS_PRUNE], for ac_arg in m4_if([$3],,[$ac_configure_args],[[$]$3]); do if test -n "$ac_prev"; then ac_prev= - configure + continue fi # the eval casts away sh quotes case `eval echo $ac_arg` in diff --git a/aclocal/prog-cc.m4 b/aclocal/prog-cc.m4 index 11b47d4610..7404bd2f8e 100644 --- a/aclocal/prog-cc.m4 +++ b/aclocal/prog-cc.m4 @@ -27,18 +27,13 @@ dnl check if the compiler supports --specs RTEMS_GCC_SPECS dnl check if the target compiler may use --pipe RTEMS_GCC_PIPE -dnl check if the compiler supports --specs if gcc28 is requested -# if test "$rtems_cv_gcc_specs" = "no"; then -# AC_MSG_WARN([*** disabling --enable-gcc28]) -# RTEMS_USE_GCC272=yes -# fi test "$rtems_cv_gcc_pipe" = "yes" && CC="$CC --pipe" if test "$GCC" = yes; then ] m4_if([$1],,[],[CPPFLAGS="$CPPFLAGS $1"]) [ -CFLAGS="-g -Wall" +CFLAGS=${CFLAGS--g -Wall} fi dnl FIXME: HACK for egcs/cygwin mixing '\\' and '/' in gcc -print-* |