X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/590b1a4d628c79244ae8556ab3fe7d2a823ad322..2e09dc2dc80d5dd5c42a559c4dd4738ed006a276:/configure.in

diff --git a/configure.in b/configure.in
index 46605a0cd9..eebefc69e6 100644
--- a/configure.in
+++ b/configure.in
@@ -767,7 +767,7 @@ WX_ARG_ENABLE(permissive,    [  --enable-permissive     compile code disregardin
 WX_ARG_ENABLE(no_deps,       [  --enable-no_deps        create code without dependency information], wxUSE_NO_DEPS)
 
 WX_ARG_ENABLE(compat20,      [  --enable-compat20       enable wxWindows 2.0 compatibility], WXWIN_COMPATIBILITY_2)
-WX_ARG_ENABLE(compat22,      [  --enable-compat22       enable wxWindows 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)
+WX_ARG_ENABLE(compat22,      [  --disable-compat22      disable wxWindows 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)
 
 dnl ---------------------------------------------------------------------------
 dnl (small) optional non GUI classes
@@ -1229,7 +1229,7 @@ dnl does make support "-include" (only GNU make does AFAIK)?
 AC_CACHE_CHECK([if make is GNU make], wx_cv_prog_makeisgnu,
 [
     if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
-            egrep qs GNU > /dev/null); then
+            egrep -s GNU > /dev/null); then
         wx_cv_prog_makeisgnu="yes"
     else
         wx_cv_prog_makeisgnu="no"
@@ -3417,7 +3417,7 @@ if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
     WXWIN_COMPATIBILITY_2_2="yes"
 fi
 
-if test "$WXWIN_COMPATIBILITY_2_2" = "yes"; then
+if test "x$WXWIN_COMPATIBILITY_2_2" != "xno"; then
     AC_DEFINE(WXWIN_COMPATIBILITY_2_2)
 fi
 
@@ -3748,8 +3748,8 @@ if test "$wxUSE_SOCKETS" = "yes"; then
         AC_CHECK_FUNC(socket,,
             AC_CHECK_LIB(socket, socket,
                 if test "$INET_LINK" != " -lsocket"; then
-                    INET_LINK="$INET_LINK -lsocket",
-                fi
+                    INET_LINK="$INET_LINK -lsocket"
+                fi,
                 [
                     AC_MSG_WARN([socket library not found - sockets will be disabled])
                     wxUSE_SOCKETS=no