fixed bug with creating status bar with more than 1 pane (needed resize to refresh)

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 8737f5db0bfa197bdacb053777ffae386c7f3d38..4527c7c6e573a0ae76ee481ba02eb3da43102f8d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2313,16 +2313,26 @@ if test "$wxUSE_OPENGL" = "yes"; then
   if test "$wxUSE_MAC" = 1; then
     OPENGL_LIBS="-framework OpenGL -framework AGL"
   else
+
     dnl check for OpenGL libs availability first
-    AC_CHECK_HEADER(GL/gl.h, [
-      AC_CHECK_LIB(GL, glFlush, [
-        OPENGL_LIBS="-lGL -lGLU"
-      ], [
-        AC_CHECK_LIB(MesaGL, glFlush, [
-          OPENGL_LIBS="-lMesaGL -lMesaGLU"
+    dnl -lGL requires -lm with soem OpenGL versions
+
+    AC_CHECK_HEADER(GL/gl.h,
+        [
+            AC_CHECK_LIB(GL, glFlush,
+                [
+                    OPENGL_LIBS="-lGL -lGLU"
+                ],
+                [
+                    AC_CHECK_LIB(MesaGL, glFlush,
+                        [
+                            OPENGL_LIBS="-lMesaGL -lMesaGLU"
+                        ],
+                        [],
+                        [-lm])
+                ],
+                [-lm])
         ])
-      ])
-    ])
 
     if test "x$OPENGL_LIBS" = "x"; then
         dnl it should be an error and not a warning because OpenGL is not on
@@ -2515,7 +2525,7 @@ if test "$wxUSE_SHARED" = "yes"; then
         WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"
 
         SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
-        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1"
+        TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1"
 
         PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
 
@@ -4658,7 +4668,7 @@ $REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
 $FREETYPE_INCLUDE $TOOLKIT_INCLUDE"
 
 dnl wxGTK does not need TOOLKIT includes in wx-config
-if test $wxUSE_GTK = 1; then
+if test "$wxUSE_GTK" = 1; then
     WXCONFIG_INCLUDE=
 else
     WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
@@ -4736,6 +4746,7 @@ AC_SUBST(TOOLKIT_DIR)
 AC_SUBST(TOOLKIT_VPATH)
 AC_SUBST(TOOLCHAIN_NAME)
 AC_SUBST(TOOLCHAIN_DEFS)
+AC_SUBST(TOOLCHAIN_DLL_DEFS)
 
 dnl wx-config options
 AC_SUBST(host_alias)