From 2fe2de5c2107f65d6e5b29d9877f296e9c3d016d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 22 Jun 2003 12:48:38 +0000 Subject: [PATCH] GNU/Hurd patch git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@21293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure.in | 17 ++++++++++++++--- docs/changes.txt | 1 + 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 36bc6e3390..9c07c55702 100644 --- a/configure.in +++ b/configure.in @@ -72,6 +72,7 @@ USE_BEOS=0 USE_MAC=0 USE_LINUX= +USE_GNU= USE_SGI= USE_HPUX= USE_SYSV= @@ -151,6 +152,16 @@ case "${host}" in fi DEFAULT_DEFAULT_wxUSE_GTK=1 ;; + *-*-gnu* ) + USE_GNU=1 + AC_DEFINE(__GNU__) + TMP=`uname -m` + if test "x$TMP" = "xalpha"; then + USE_ALPHA=1 + AC_DEFINE(__ALPHA__) + fi + DEFAULT_DEFAULT_wxUSE_GTK=1 + ;; *-*-irix5* | *-*-irix6* ) USE_SGI=1 USE_SVR4=1 @@ -1613,7 +1624,7 @@ dnl check for glibc version dnl dnl VZ: I have no idea why had this check been there originally, but now dnl we could probably do without it by just always adding _GNU_SOURCE -if test "$USE_LINUX" = 1; then +if test "$USE_LINUX" = 1 || test "$USE_GNU" = 1 ; then AC_CACHE_CHECK([for glibc 2.1 or later], wx_cv_lib_glibc21,[ AC_TRY_COMPILE([#include ], [ @@ -2337,7 +2348,7 @@ equivalent variable and GTK+ is version 1.2.3 or above. 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__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DLINUX=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1" + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1" GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a" else GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link" @@ -2888,7 +2899,7 @@ if test "$wxUSE_SHARED" = "yes"; then fi ;; - *-*-linux* ) + *-*-linux* | *-*-gnu* ) if test "$GCC" != "yes"; then AC_CACHE_CHECK([for Intel compiler], wx_cv_prog_icc, [ diff --git a/docs/changes.txt b/docs/changes.txt index dd3af5a823..90845023ec 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -192,6 +192,7 @@ Unix: - fixed build problems with OpenGL when libGL(U) were in different directories - added --basename and --release flags to wx-config (Robert O'Connor) +- added support for GNU/Hurd in configure wxMSW: