Some changes in mms-bitfield detection.

 Modified Files:
    configure configure.in

diff --git a/configure b/configure
index 078811d..74d3418 100755 (executable)
--- a/configure
+++ b/configure
@@ -9092,9 +9092,9 @@ _ACEOF
 
 fi
 
-
-case "x${CC}${CFLAGS}" in
-*-mno-cygwin*)
+if test "x$CYGNUS" = xyes || test "x$MINGW" = xyes; then
+       case "x${CC}" in
+       "xgcc"*)
                msnative_struct=''
            echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5
 echo $ECHO_N "checking how to get MSVC-compatible struct packing... $ECHO_C" >&6
@@ -9126,46 +9126,11 @@ echo "$as_me: WARNING: produced binary will be incompatible with windows' GUI "
                        echo "$as_me:$LINENO: result: ${msnative_struct}" >&5
 echo "${ECHO_T}${msnative_struct}" >&6
                fi
-       ;;
-"xgcc"*)
-       if test "x$MINGW" = xyes; then
-               msnative_struct=''
-           echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5
-echo $ECHO_N "checking how to get MSVC-compatible struct packing... $ECHO_C" >&6
-           if test -z "$ac_cv_prog_CC"; then
-                       our_gcc="$CC"
-               else
-                       our_gcc="$ac_cv_prog_CC"
-               fi
-               case `$our_gcc --version | sed -e 's,\..*,.,' -e q` in
-                       2.)
-               if $our_gcc -v --help 2>/dev/null | grep fnative-struct >/dev/null; then
-                       msnative_struct='-fnative-struct'
-               fi
                ;;
-                       *)
-               if $our_gcc -v --help 2>/dev/null | grep ms-bitfields >/dev/null; then
-                       msnative_struct='-mms-bitfields'
-               fi
+       *)
                ;;
-               esac
-               if test x"$msnative_struct" = x ; then
-                       echo "$as_me:$LINENO: result: no way" >&5
-echo "${ECHO_T}no way" >&6
-                       { echo "$as_me:$LINENO: WARNING: produced binary will be incompatible with windows' GUI " >&5
-echo "$as_me: WARNING: produced binary will be incompatible with windows' GUI " >&2;}
-               else
-                       CFLAGS="$CFLAGS $msnative_struct"
-                       CPPFLAGS="$CPPFLAGS $msnative_struct"
-                       echo "$as_me:$LINENO: result: ${msnative_struct}" >&5
-echo "${ECHO_T}${msnative_struct}" >&6
-               fi
-       fi
-       ;;
-*)
-       ;;
-esac
-
+       esac
+fi
 if test "x$CYGNUS" = xyes || test "x$MINGW" = xyes; then
   echo "$as_me:$LINENO: checking Cygwin new mmsystem" >&5
 echo $ECHO_N "checking Cygwin new mmsystem... $ECHO_C" >&6

diff --git a/configure.in b/configure.in
index 0233e26..93b477c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -429,9 +429,9 @@ if test $timidity_cv_type_union_semun = yes; then
 fi
 
 dnl Cygnus and Mingw memory struct optiontest
-
-case "x${CC}${CFLAGS}" in
-*-mno-cygwin*) 
+if test "x$CYGNUS" = xyes || test "x$MINGW" = xyes; then
+       case "x${CC}" in
+       "xgcc"*) 
                msnative_struct=''
            AC_MSG_CHECKING([how to get MSVC-compatible struct packing])
            if test -z "$ac_cv_prog_CC"; then
@@ -459,42 +459,11 @@ case "x${CC}${CFLAGS}" in
                        CPPFLAGS="$CPPFLAGS $msnative_struct"
                        AC_MSG_RESULT([${msnative_struct}])
                fi
-       ;;
-"xgcc"*) 
-       if test "x$MINGW" = xyes; then
-               msnative_struct=''
-           AC_MSG_CHECKING([how to get MSVC-compatible struct packing])
-           if test -z "$ac_cv_prog_CC"; then
-                       our_gcc="$CC"
-               else
-                       our_gcc="$ac_cv_prog_CC"
-               fi
-               case `$our_gcc --version | sed -e 's,\..*,.,' -e q` in
-                       2.)
-               if $our_gcc -v --help 2>/dev/null | grep fnative-struct >/dev/null; then
-                       msnative_struct='-fnative-struct'
-               fi
                ;;
-                       *)
-               if $our_gcc -v --help 2>/dev/null | grep ms-bitfields >/dev/null; then
-                       msnative_struct='-mms-bitfields'
-               fi
+       *) 
                ;;
-               esac
-               if test x"$msnative_struct" = x ; then
-                       AC_MSG_RESULT([no way])
-                       AC_MSG_WARN([produced binary will be incompatible with windows' GUI ])
-               else
-                       CFLAGS="$CFLAGS $msnative_struct"
-                       CPPFLAGS="$CPPFLAGS $msnative_struct"
-                       AC_MSG_RESULT([${msnative_struct}])
-               fi
-       fi
-       ;;
-*) 
-       ;;
-esac
-
+       esac
+fi
 dnl Cygnus Mingw32 mmsystem check
 if test "x$CYGNUS" = xyes || test "x$MINGW" = xyes; then
   AC_CACHE_CHECK(Cygwin new mmsystem,timidity_cv_header_new_mmsystem,