*** empty log message ***

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 1c6fe05030483569ed8ee568869e7b72d49f323f..919de5ba6e6c9eea0db781801e7b30da8ae6eced 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2533,11 +2533,7 @@ if test "$wxUSE_STATLINE" = "yes"; then
     if test "$wxUSE_WINE" = 1 ; then
         AC_MSG_WARN([wxStaticLine is not supported under WINE])
     else
-        if test "$wxUSE_MOTIF" = 1 ; then
-            AC_MSG_WARN([wxStaticLine is not supported under Motif])
-       else
-            AC_DEFINE(wxUSE_STATLINE)
-       fi
+       AC_DEFINE(wxUSE_STATLINE)
     fi
 fi
 
@@ -2751,6 +2747,15 @@ AC_PROG_MAKE_SET
 
 AC_CONFIG_HEADER(setup.h:setup.h.in)
 
+dnl Duh! glcanvas/$(TOOLKIT_DIR) doesn't work for msw because some
+dnl genius called it "win"
+if test "${TOOLKIT_DIR}" = "msw" ; then
+  GL_TOOLKIT_DIR="win"
+else
+  GL_TOOLKIT_DIR="${TOOLKIT_DIR}"
+fi
+dnl It's needed in glcanvas/Makefile.in so we even have to subst this hack!
+AC_SUBST(GL_TOOLKIT_DIR)
 
 dnl create each of the files in the space separated list from the file.in
 dnl (the original file name may be overriden by appending another name after a
@@ -2774,6 +2779,7 @@ AC_OUTPUT([
            samples/drawing/Makefile
            samples/dynamic/Makefile
            samples/image/Makefile
+           samples/internat/Makefile
            samples/layout/Makefile
            samples/listctrl/Makefile
            samples/mdi/Makefile
@@ -2807,7 +2813,7 @@ AC_OUTPUT([
            utils/wxMMedia2/lib/Makefile
            utils/wxMMedia2/sample/Makefile
            utils/glcanvas/Makefile
-           utils/glcanvas/${TOOLKIT_DIR}/Makefile
+           utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile
           ],
           [
             chmod +x wx-config