diff --git a/build/generic/configure.in b/build/generic/configure.in
index 41657af..7348b66 100644
--- a/build/generic/configure.in
+++ b/build/generic/configure.in
@@ -144,6 +144,12 @@ AC_PROG_RANLIB
 AC_CHECK_TOOL([AR], [ar], [ar-not-found])

 dnl ==========================================================================
+dnl Check for the grep
+dnl ==========================================================================
+
+AC_PROG_GREP
+
+dnl ==========================================================================
 dnl
 dnl This part looks for:
 dnl
@@ -438,8 +444,16 @@ if test "$ARCHITECTURE" = "IA32" -o "$ARCHITECTURE" = "X86_64" ; then
                    AC_MSG_RESULT([win32])
                    NASM_FORMAT="win32"
                fi
-          PREFIX="-DWINDOWS"
-          MARK_FUNCS=""
+               PREFIX="-DWINDOWS"
+               if test "$GCC" = "yes" ; then
+                   echo 'int main(void) {return 0;}' > conftest.c
+                   $CC -S -o conftest conftest.c
+                   if test `$GREP -c '_main:' conftest` -eq 0 ; then
+                       PREFIX="$PREFIX -DNO_PREFIX"
+                   fi
+                   rm -f conftest*
+               fi
+               MARK_FUNCS=""
                ;;
            *darwin*)
                if test "$ARCHITECTURE" = "X86_64" ; then