casa-mp-base

--- configure.in.orig

+++ configure.in

@@ -60,7 +60,7 @@ dnl The alpha architecture needs special

 case "$target" in

     alpha*-*-linux*)

    if test x$ac_cv_prog_gcc = xyes; then

-            CFLAGS="$CFLAGS -mcpu=ev4 -Wa,-mall"

+            EXTRA_CFLAGS="$EXTRA_CFLAGS -mcpu=ev4 -Wa,-mall"

         fi

         ;;

     sparc*-*-solaris*)

@@ -102,17 +102,17 @@ AC_ARG_ENABLE(debug,

               , enable_debug=yes)

 if test x$enable_debug != xyes; then

     if test x$ac_cv_prog_gcc = xyes; then

-        CFLAGS="$CFLAGS -fexpensive-optimizations -fomit-frame-pointer"

+        EXTRA_CFLAGS="$EXTRA_CFLAGS -fexpensive-optimizations -fomit-frame-pointer"

     fi

     case "$target" in

         i486-*-*)  # Yeah right. :)

             if test x$ac_cv_prog_gcc = xyes; then

-                CFLAGS="$CFLAGS -march=486"

+                EXTRA_CFLAGS="$EXTRA_CFLAGS -march=486"

             fi

             ;;

         i?86-*-*)

             if test x$ac_cv_prog_gcc = xyes; then

-                CFLAGS="$CFLAGS -march=pentium -mcpu=pentiumpro"

+                EXTRA_CFLAGS="$EXTRA_CFLAGS -march=pentium -mcpu=pentiumpro"

             fi

             ;;

     esac

@@ -124,7 +124,7 @@ AM_PATH_SDL($SDL_VERSION,

             :,

        AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])

 )

-CFLAGS="$CFLAGS $SDL_CFLAGS"

+EXTRA_CFLAGS="$EXTRA_CFLAGS $SDL_CFLAGS"

 LIBS="$LIBS $SDL_LIBS"

 dnl See if we need to pass -lm for the math library

@@ -145,7 +145,7 @@ if test x$enable_mmx = xyes; then

     AC_MSG_RESULT($use_mmx)

     if test x$use_mmx = xyes; then

-        CFLAGS="$CFLAGS -DUSE_MMX"

+        EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_MMX"

     fi

 fi

@@ -162,7 +162,7 @@ if test x$enable_ati = xyes; then

     AC_MSG_RESULT($use_ati)

     if test x$use_ati = xyes; then

-        CFLAGS="$CFLAGS -DUSE_ATI"

+       EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_ATI"

     fi

 fi

@@ -171,7 +171,7 @@ AC_ARG_ENABLE(timestamp-sync,

 [  --enable-timestamp-sync  enable system timestamp sync [default=yes]],

               , enable_timestamp_sync=no)

 if test x$enable_timestamp_sync = xyes; then