diff options
| -rw-r--r-- | configure.in | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/configure.in b/configure.in index 9b3191494..4431fa525 100644 --- a/configure.in +++ b/configure.in @@ -60,8 +60,9 @@ if test "x$uname" = xIRIX64; then uname="IRIX" fi if test "x$uname" = x; then - # MingW doesn't provide any output when uname is run, even with "-s"... - uname="CYGWIN" + # Older MinGW doesn't provide any output when uname is run, even with "-s". + # Current MinGW (as of Jan. 2011) however does, so this is not necessary anymore... + uname="MINGW" fi dnl Do not automatically add "-g" to compiler options... @@ -87,14 +88,13 @@ if test "x$cross_compiling" != xno ; then fi dnl OS-specific pre-tests... -dnl uname_GUI equals $uname unless we target cygwin -dnl in combination with X11. +dnl uname_GUI equals $uname unless we target Cygwin in combination with X11. uname_GUI=$uname case $uname in - CYGWIN* | MINGW*) + CYGWIN*) # Handle Cygwin option *first*, before all other tests. - AC_ARG_ENABLE(cygwin, [ --enable-cygwin use the CygWin libraries [(default=no)]]) - AC_ARG_ENABLE(x11, [ --enable-x11 use CygWin with X11 [(default=no)]]) + AC_ARG_ENABLE(cygwin, [ --enable-cygwin use the Cygwin libraries [(default=no)]]) + AC_ARG_ENABLE(x11, [ --enable-x11 use Cygwin with X11 [(default=no)]]) if test x$enable_cygwin != xyes; then # NOTE: We can't use ARCHFLAGS for this, since it does not work # with some of the function tests - Cygwin uses a @@ -105,7 +105,7 @@ case $uname in LDFLAGS="$LDFLAGS -mno-cygwin" DSOFLAGS="$DSOFLAGS -mno-cygwin" else - # we target cygwin in combination with X11 + # we target Cygwin in combination with X11 if test x$enable_x11 = xyes; then uname_GUI="X11$uname" fi @@ -815,7 +815,7 @@ case $uname_GUI in DSOFLAGS="-mwindows $DSOFLAGS" LIBS="$LIBS -lole32 -luuid -lcomctl32" if test "x$with_optim" = x; then - dnl Avoid -Os optimization on Cygwin/Mingw + dnl Avoid -Os optimization on Cygwin/MinGW with_optim="-O3" fi @@ -882,7 +882,7 @@ case $uname_GUI in *) # All others are UNIX/X11... - # This includes cygwin target combined with X11 + # This includes Cygwin target combined with X11 if test x$have_pthread = xyes; then AC_DEFINE(HAVE_PTHREAD) THREADS="threads$EXEEXT" @@ -1000,7 +1000,7 @@ case $uname_GUI in fi # Make symlinks since UNIX/Linux is case sensitive, - # but cygwin in general not. + # but Cygwin in general not. case $uname in CYGWIN*) HLINKS="#" |