diff -Nur wxMotif-2.3.2.orig/configure.in wxMotif-2.3.2/configure.in
--- wxMotif-2.3.2.orig/configure.in	Wed Dec  5 10:34:53 2001
+++ wxMotif-2.3.2/configure.in	Sat Dec 22 22:43:41 2001
@@ -592,7 +592,7 @@
 dnl check for glibc version
 if test "$USE_LINUX" = 1; then
     AC_CACHE_CHECK([for glibc 2.1 or later], wx_lib_glibc21,
-        AC_TRY_COMPILE([#include <features.h>],
+        [AC_TRY_COMPILE([#include <features.h>],
             [
                 #if !__GLIBC_PREREQ(2, 1)
                     #error not glibc2.1
@@ -604,7 +604,7 @@
             [
                 wx_lib_glibc21=no
             ]
-        )
+        )]
     )
     if test "$wx_lib_glibc21" = "yes"; then
         AC_DEFINE(wxHAVE_GLIBC2)
@@ -1610,6 +1610,10 @@
     /usr/include"
 
 SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
+CFLAGS="$CFLAGS -I/usr/X11R6/include"
+CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include"
+CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include"
+LDFLAGS="$LDFLAGS -ldl -L/usr/X11R6/lib"
 
 dnl ------------------------------------------------------------------------
 dnl Check for libraries
@@ -2322,7 +2326,7 @@
                 if test "$ac_find_libraries" != "" ; then
                     WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
                     LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
-                    OPENGL_LIBS="-lGL -lGLU"
+                    OPENGL_LIBS="-L/usr/X11R6/lib -lGL -lGLU"
                     AC_MSG_RESULT([yes])
                 else
                     AC_MSG_RESULT([no])
@@ -2331,7 +2335,7 @@
                     if test "$ac_find_libraries" != "" ; then
                         WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
                         LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
-                        OPENGL_LIBS="-lMesaGL -lMesaGLU"
+                        OPENGL_LIBS="-L/usr/X11R6/lib -lMesaGL -lMesaGLU"
                         AC_MSG_RESULT([yes])
                     else
                         AC_MSG_RESULT([no])
@@ -3272,7 +3276,7 @@
                     THREADS_LINK="c_r"
                 ], [
                     dnl VZ: SGI threads are not supported currently
-                    AC_CHECK_HEADER(sys/prctl.h, [
+                    AC_CHECK_HEADERS(sys/prctl.h, [
                         THREADS_OBJ="threadsgi.lo"
                     ])
                 ])
@@ -3523,23 +3527,6 @@
 fi
 
 
-CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
-CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
-if test "$wxUSE_OPTIMISE" = "no" ; then
-    OPTIMISE=
-else
-    if test "$GCC" = yes ; then
-        OPTIMISE="-O2"
-        case "${host}" in
-            i586-*-*|i686-*-* )
-            OPTIMISE="${OPTIMISE} "
-        ;;
-        esac
-    else
-        OPTIMISE="-O"
-    fi
-fi
-
 if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
     AC_DEFINE(WXWIN_COMPATIBILITY_2)