skins2: fallback to x11 os factory for os not win or osx.

diff --git a/configure.ac b/configure.ac
index 42dd032799f89f64a50bd8c5b590c68f54b53adb..ddea7da09cc77f934257502790403a42af753a28 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -418,7 +418,6 @@ AM_CONDITIONAL(HAVE_LINUX, [test "${SYS}" = "linux"])
 AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
 AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce")
 AM_CONDITIONAL(USE_PEFLAGS, [test "${enable_peflags}" = "yes"])
-AM_CONDITIONAL(USE_X11_FOR_SKINS2, [case "${SYS}" in linux*|openbsd*) true;; *) false;; esac])
 
 dnl
 dnl Sadly autoconf doesn't think about testing foo.exe when ask to test

diff --git a/modules/gui/skins2/Modules.am b/modules/gui/skins2/Modules.am
index 2142fdd789b11cfb8a28b4c263494b5d1ba40cf3..c64f53c97b67c8cdef83f9722feca7511ebdc016 100644 (file)
--- a/modules/gui/skins2/Modules.am
+++ b/modules/gui/skins2/Modules.am
@@ -209,9 +209,26 @@ SOURCES_skins2 += \
        win32/win32_window.cpp \
        win32/win32_window.hpp \
     $(NULL)
-endif
-
-if USE_X11_FOR_SKINS2
+else if HAVE_DARWIN
+SOURCES_skins2 += \
+       macosx/macosx_dragdrop.cpp \
+       macosx/macosx_dragdrop.hpp \
+       macosx/macosx_factory.cpp \
+       macosx/macosx_factory.hpp \
+       macosx/macosx_graphics.cpp \
+       macosx/macosx_graphics.hpp \
+       macosx/macosx_loop.cpp \
+       macosx/macosx_loop.hpp \
+       macosx/macosx_popup.cpp \
+       macosx/macosx_popup.hpp \
+       macosx/macosx_timer.cpp \
+       macosx/macosx_timer.hpp \
+       macosx/macosx_window.cpp \
+       macosx/macosx_window.hpp \
+       macosx/macosx_tooltip.cpp \
+       macosx/macosx_tooltip.hpp \
+    $(NULL)
+else
 SOURCES_skins2 += \
        x11/x11_display.cpp \
        x11/x11_display.hpp \
@@ -234,23 +251,3 @@ SOURCES_skins2 += \
     $(NULL)
 endif
 
-if HAVE_DARWIN
-SOURCES_skins2 += \
-       macosx/macosx_dragdrop.cpp \
-       macosx/macosx_dragdrop.hpp \
-       macosx/macosx_factory.cpp \
-       macosx/macosx_factory.hpp \
-       macosx/macosx_graphics.cpp \
-       macosx/macosx_graphics.hpp \
-       macosx/macosx_loop.cpp \
-       macosx/macosx_loop.hpp \
-       macosx/macosx_popup.cpp \
-       macosx/macosx_popup.hpp \
-       macosx/macosx_timer.cpp \
-       macosx/macosx_timer.hpp \
-       macosx/macosx_window.cpp \
-       macosx/macosx_window.hpp \
-       macosx/macosx_tooltip.cpp \
-       macosx/macosx_tooltip.hpp \
-    $(NULL)
-endif