don't use -q option with egrep, Solaris doesn't have it (bug 517145)

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 1f8f4e490c2f7fac65802937c69941bb53932e66..92404961ea870ebc0d0daea6dcfda937c3d0b39f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -716,8 +716,8 @@ AC_ARG_WITH(msw,           [  --with-msw              use MS-Windows], [wxUSE_MS
 AC_ARG_WITH(pm,            [  --with-pm               use OS/2 Presentation Manager], [wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(mgl,           [  --with-mgl              use SciTech MGL], [wxUSE_MGL="$withval" CACHE_MGL=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(microwin,      [  --with-microwin         use MicroWindows], [wxUSE_MICROWIN="$withval" CACHE_MICROWIN=1 TOOLKIT_GIVEN=1])
-AC_ARG_WITH(x11,           [  --with-x11              use X11], [wxUSE_X11="$withval" CACHE_X11=1 TOOLKIT_GIVEN=1])
-WX_ARG_ENABLE(nanox    ,   [  --enable-nanox          use NanoX], wxUSE_NANOX)
+AC_ARG_WITH(x11,           [  --with-x11              use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1])
+WX_ARG_ENABLE(nanox,       [  --enable-nanox          use NanoX], wxUSE_NANOX)
 
 AC_ARG_ENABLE(gtk2,        [  --enable-gtk2           use GTK+ 2.0 if available (EXPERIMENTAL)],wxUSE_GTK2=1,wxUSE_GTK2=0)
 
@@ -1223,7 +1223,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 -s GNU); then
+            egrep qs GNU > /dev/null); then
         wx_cv_prog_makeisgnu="yes"
     else
         wx_cv_prog_makeisgnu="no"
@@ -1897,14 +1897,13 @@ equivalent variable and GTK+ is version 1.2.3 or above.
 
         if test "$wxUSE_NANOX" = 1; then
             TOOLKIT_INCLUDE="-I\$(top_srcdir)/include/wx/x11/nanox -I\$(MICROWIN)/src/include $TOOLKIT_INCLUDE"
-            TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__ -D__NANOX__"
+            TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__"
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$MICROWIN/src/lib/libnano-X.a \$MICROWIN/src/lib/libmwengine.a \$MICROWIN/src/lib/libmwfonts.a \$MICROWIN/src/lib/libmwdrivers.a \$MICROWIN/src/lib/libmwobjects.a"
         else
-            TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"
-            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11"
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link"
         fi
 
-        TOOLKIT_VPATH="\${top_srcdir}/src/x11 \${top_srcdir}/src/univ \${top_srcdir}/src/univ/themes"
+        TOOLKIT_VPATH="\${top_srcdir}/src/x11"
         TOOLKIT=X11
         GUIDIST=X11_DIST
     fi
@@ -3047,7 +3046,7 @@ AC_CHECK_FUNCS(strtok_r)
 AC_LANG_RESTORE
 
 dnl check for inet_addr and inet_aton (these may live either in libc, or in
-dnl libnsl or libresolv)
+dnl libnsl or libresolv or libsocket)
 INET_LINK=
 AC_CHECK_FUNCS(inet_addr,
     AC_DEFINE(HAVE_INET_ADDR),
@@ -3055,7 +3054,10 @@ AC_CHECK_FUNCS(inet_addr,
         AC_CHECK_LIB(nsl, inet_addr,
             INET_LINK="nsl",
             AC_CHECK_LIB(resolv, inet_addr,
-                INET_LINK="resolv"
+                INET_LINK="resolv",
+                AC_CHECK_LIB(socket, inet_addr,
+                    INET_LINK="socket"
+                )
             )
         )
     ]
@@ -3721,10 +3723,17 @@ dnl ------------------------------------------------------------------------
 dnl wxSocket
 dnl ------------------------------------------------------------------------
 
-dnl under MSW we always have sockets
-if test "$TOOLKIT" != "MSW"; then
+dnl VZ: the GUI hooks wxSocket needs are not implemented yet in wxX11
+if test "$wxUSE_SOCKETS" = "yes"; then
+    if test "$TOOLKIT" = "X11"; then
+        AC_MSG_WARN([wxSocket not yet supported under X11... disabled])
+        wxUSE_SOCKETS="no"
+    fi
+fi
 
-    if test "$wxUSE_SOCKETS" = "yes"; then
+if test "$wxUSE_SOCKETS" = "yes"; then
+    dnl under MSW we always have sockets
+    if test "$TOOLKIT" != "MSW"; then
         dnl under Solaris, socket functions live in -lsocket
         AC_CHECK_FUNC(socket,,
             AC_CHECK_LIB(socket, socket,
@@ -3736,12 +3745,13 @@ if test "$TOOLKIT" != "MSW"; then
             )
         )
     fi
+fi
 
+if test "$wxUSE_SOCKETS" = "yes" ; then
     dnl this test may be appropriate if building under cygwin
     dnl right now I'm assuming it also uses the winsock stuff
     dnl like mingw does..  -- RL
-
-    if test "$wxUSE_SOCKETS" = "yes" ; then
+    if test "$TOOLKIT" != "MSW"; then
         dnl determine the type of third argument for getsockname
         AC_CACHE_CHECK([what is the type of the third argument of getsockname],
                        wx_cv_type_getsockname3,
@@ -3795,7 +3805,6 @@ if test "$TOOLKIT" != "MSW"; then
         fi
     fi
 fi
-dnl if !MSW
 
 if test "$wxUSE_SOCKETS" = "yes" ; then
     AC_DEFINE(wxUSE_SOCKETS)
@@ -3975,7 +3984,7 @@ fi
 
 if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
     if test "$wxUSE_UNIVERSAL" = "yes"; then
-        AC_MSG_WARN(MDI not yet supported for wxUNIVERSAL... disabled)
+        AC_MSG_WARN(MDI not yet supported for wxUniversal... disabled)
         wxUSE_MDI_ARCHITECTURE=no
     fi
 
@@ -4326,7 +4335,7 @@ if test "$wxUSE_TOGGLEBTN" = "yes"; then
         wxUSE_TOGGLEBTN=no
     fi
     if test "$wxUSE_UNIVERSAL" = "yes"; then
-        AC_MSG_WARN([Toggle button not yet supported under wxUNIVERSAL... disabled])
+        AC_MSG_WARN([Toggle button not yet supported under wxUniversal... disabled])
         wxUSE_TOGGLEBTN=no
     fi
 
@@ -4367,13 +4376,9 @@ if test "$wxUSE_TOOLTIPS" = "yes"; then
             AC_MSG_WARN([wxTooltip not supported under WINE... disabled])
         else
             if test "$wxUSE_UNIVERSAL" = "yes"; then
-                AC_MSG_WARN([wxTooltip not supported yet in wxUNIVERSAL... disabled])
+                AC_MSG_WARN([wxTooltip not supported yet in wxUniversal... disabled])
             else
-                if test "$wxUSE_X11" = "1"; then
-                    AC_MSG_WARN([wxTooltip not supported yet under X11... disabled])
-                else
-                    AC_DEFINE(wxUSE_TOOLTIPS)
-                fi
+                AC_DEFINE(wxUSE_TOOLTIPS)
             fi
         fi
     fi
@@ -4396,15 +4401,23 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
         if test "$wxUSE_MOTIF" = 1; then
             AC_MSG_WARN([wxPopupWindow not yet supported under Motif... disabled])
         else
-            AC_DEFINE(wxUSE_POPUPWIN)
+            if test "$wxUSE_PM" = 1; then
+                AC_MSG_WARN([wxPopupWindow not yet supported under PM... disabled])
+            else 
+                AC_DEFINE(wxUSE_POPUPWIN)
 
-            USES_CONTROLS=1
+                USES_CONTROLS=1
+            fi
         fi
     fi
 fi
 
 if test "$wxUSE_TIPWINDOW" = "yes"; then
-    AC_DEFINE(wxUSE_TIPWINDOW)
+    if test "$wxUSE_PM" = 1; then
+        AC_MSG_WARN([wxTipWindow not yet supported under PM... disabled])
+    else 
+        AC_DEFINE(wxUSE_TIPWINDOW)
+    fi
 fi
 
 if test "$USES_CONTROLS" = 1; then