Fixed toolbar crash for MinGW/Cygwin

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index fa1ee8a609a611c4bd081524e09ff871ebeb5dd7..43621eef1946b827c8f3dd926df35fa0cea7a973 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -255,7 +255,6 @@ case "${host}" in
     AC_DEFINE(__DOS__)
     PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_MGL=1
     AC_DEFINE(__DOS__)
     PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_MGL=1

-    DEFAULT_DEFAULT_wxUSE_SHARED=0

   ;;
 
   *-pc-os2_emx | *-pc-os2-emx )
   ;;
 
   *-pc-os2_emx | *-pc-os2-emx )


@@ -331,6 +330,8 @@ DEBUG_CONFIGURE=0
 if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_UNIVERSAL=no
 
 if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_UNIVERSAL=no
 

+  DEFAULT_wxUSE_NANOX=no
+

   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes


@@ -503,6 +504,8 @@ if test $DEBUG_CONFIGURE = 1; then
 else
   DEFAULT_wxUSE_UNIVERSAL=no
 
 else
   DEFAULT_wxUSE_UNIVERSAL=no
 

+  DEFAULT_wxUSE_NANOX=no
+

   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes


@@ -713,7 +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(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])
+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)
 
 
 AC_ARG_ENABLE(gtk2,        [  --enable-gtk2           use GTK+ 2.0 if available (EXPERIMENTAL)],wxUSE_GTK2=1,wxUSE_GTK2=0)
 


@@ -1219,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 |
 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"
         wx_cv_prog_makeisgnu="yes"
     else
         wx_cv_prog_makeisgnu="no"


@@ -1850,6 +1854,16 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         AFMINSTALL=afminstall
         COMPILED_X_PROGRAM=0
 
         AFMINSTALL=afminstall
         COMPILED_X_PROGRAM=0
 

+        if test "$wxUSE_NANOX" = "yes"; then
+            AC_MSG_CHECKING(for MicroWindows/NanoX distribution)
+            if test "x$MICROWIN" = x ; then
+                AC_MSG_RESULT(not found)
+                AC_MSG_ERROR([Cannot find MicroWindows library. Make sure MICROWIN is set.])
+            else
+                AC_MSG_RESULT($MICROWIN)
+            fi
+        fi
+

         xpm_link=
         AC_MSG_CHECKING(for Xpm library)
         WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
         xpm_link=
         AC_MSG_CHECKING(for Xpm library)
         WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)


@@ -1881,11 +1895,17 @@ equivalent variable and GTK+ is version 1.2.3 or above.
             )
         fi
 
             )
         fi
 

-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext -lXt -lX11"
-        TOOLKIT_VPATH="\${top_srcdir}/src/x11 \${top_srcdir}/src/univ"
+        if test "$wxUSE_NANOX" = "yes"; then
+            TOOLKIT_INCLUDE="-I\$(top_srcdir)/include/wx/x11/nanox -I\$(MICROWIN)/src/include $TOOLKIT_INCLUDE"
+            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
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link"
+        fi
+
+        TOOLKIT_VPATH="\${top_srcdir}/src/x11"

         TOOLKIT=X11
         GUIDIST=X11_DIST
         TOOLKIT=X11
         GUIDIST=X11_DIST

-        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"

     fi
 
     if test "$wxUSE_WINE" = 1; then
     fi
 
     if test "$wxUSE_WINE" = 1; then


@@ -2124,6 +2144,9 @@ else
         TOOLKIT_VPATH="\${top_srcdir}/src/unix"
     fi
 
         TOOLKIT_VPATH="\${top_srcdir}/src/unix"
     fi
 

+    ALL_SOURCES="\$(ALL_SOURCES)"
+    ALL_HEADERS="\$(ALL_HEADERS)"
+

     PORT_FILES="\${top_srcdir}/src/files.lst"
 
     dnl distribute only wxBase sources/headers
     PORT_FILES="\${top_srcdir}/src/files.lst"
 
     dnl distribute only wxBase sources/headers


@@ -2300,6 +2323,17 @@ fi
 
 dnl --- the marker for quick search, leave it here: SHARED_LIB_SETUP ---
 
 
 dnl --- the marker for quick search, leave it here: SHARED_LIB_SETUP ---
 

+if test "$wxUSE_SHARED" = "yes"; then
+    case "${host}" in
+      *-pc-os2_emx | *-pc-os2-emx | \
+      *-pc-msdosdjgpp )
+        dnl only static for now
+        wxUSE_SHARED=no
+        AC_MSG_WARN([Host system doesn't support shared libraries, disabling])
+      ;;
+    esac
+fi
+

 if test "$wxUSE_SHARED" = "yes"; then
 
     dnl install targets
 if test "$wxUSE_SHARED" = "yes"; then
 
     dnl install targets


@@ -2411,11 +2445,6 @@ if test "$wxUSE_SHARED" = "yes"; then
         fi
       ;;
 
         fi
       ;;
 

-      *-pc-os2_emx | *-pc-os2-emx )
-        dnl only static for now
-        wxUSE_SHARED=no
-      ;;
-

       *-*-beos* )
         dnl can't use gcc under BeOS for shared library creation because it
         dnl complains about missing 'main'
       *-*-beos* )
         dnl can't use gcc under BeOS for shared library creation because it
         dnl complains about missing 'main'


@@ -3017,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
 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),
 INET_LINK=
 AC_CHECK_FUNCS(inet_addr,
     AC_DEFINE(HAVE_INET_ADDR),


@@ -3025,7 +3054,10 @@ AC_CHECK_FUNCS(inet_addr,
         AC_CHECK_LIB(nsl, inet_addr,
             INET_LINK="nsl",
             AC_CHECK_LIB(resolv, 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"
+                )

             )
         )
     ]
             )
         )
     ]


@@ -3691,10 +3723,17 @@ dnl ------------------------------------------------------------------------
 dnl wxSocket
 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,
         dnl under Solaris, socket functions live in -lsocket
         AC_CHECK_FUNC(socket,,
             AC_CHECK_LIB(socket, socket,


@@ -3706,12 +3745,13 @@ if test "$TOOLKIT" != "MSW"; then
             )
         )
     fi
             )
         )
     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
     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,
         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,


@@ -3765,7 +3805,6 @@ if test "$TOOLKIT" != "MSW"; then
         fi
     fi
 fi
         fi
     fi
 fi

-dnl if !MSW

 
 if test "$wxUSE_SOCKETS" = "yes" ; then
     AC_DEFINE(wxUSE_SOCKETS)
 
 if test "$wxUSE_SOCKETS" = "yes" ; then
     AC_DEFINE(wxUSE_SOCKETS)


@@ -3945,7 +3984,7 @@ fi
 
 if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
     if test "$wxUSE_UNIVERSAL" = "yes"; then
 
 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
 
         wxUSE_MDI_ARCHITECTURE=no
     fi
 


@@ -4004,8 +4043,12 @@ if test "$wxUSE_PROLOGIO" = "yes" ; then
 fi
 
 if test "$wxUSE_RESOURCES" = "yes" ; then
 fi
 
 if test "$wxUSE_RESOURCES" = "yes" ; then

-    AC_DEFINE(wxUSE_RESOURCES)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
+    if test "$wxUSE_NANOX" = "yes"; then
+        AC_MSG_WARN([Cannot use resource database functions in NanoX])
+       else
+               AC_DEFINE(wxUSE_RESOURCES)
+               SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
+    fi

 fi
 
 if test "$wxUSE_X_RESOURCES" = "yes"; then
 fi
 
 if test "$wxUSE_X_RESOURCES" = "yes"; then


@@ -4296,7 +4339,7 @@ if test "$wxUSE_TOGGLEBTN" = "yes"; then
         wxUSE_TOGGLEBTN=no
     fi
     if test "$wxUSE_UNIVERSAL" = "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
 
         wxUSE_TOGGLEBTN=no
     fi
 


@@ -4337,13 +4380,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 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
             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
             fi
         fi
     fi


@@ -4366,15 +4405,23 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
         if test "$wxUSE_MOTIF" = 1; then
             AC_MSG_WARN([wxPopupWindow not yet supported under Motif... disabled])
         else
         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
         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
 fi
 
 if test "$USES_CONTROLS" = 1; then