patches for running configure under OS/2

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

configure.in

@@ -456,7 +456,7 @@ dnl than checking it during run-time
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 
 dnl the list of all available toolkits
-ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF WINE"
+ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF WINE PM"
 
 dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones
 dnl     which are either yes or no
@@ -464,6 +464,7 @@ DEFAULT_wxUSE_GTK=0
 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0
 DEFAULT_wxUSE_WINE=0
+DEFAULT_wxUSE_PM=0
 
 dnl these are the values which are really default for the given platform -
 dnl they're not cached and are only used if no --with-toolkit was given *and*
@@ -472,6 +473,7 @@ DEFAULT_DEFAULT_wxUSE_GTK=0
 DEFAULT_DEFAULT_wxUSE_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MSW=0
 DEFAULT_DEFAULT_wxUSE_WINE=0
+DEFAULT_DEFAULT_wxUSE_PM=0
 
 dnl to support a new system, you need to add its canonical name (as determined
 dnl by config.sub or specified by the configure command line) to this "case"
@@ -572,6 +574,7 @@ case "${host}" in
 
   *-pc-os2_emx )
     AC_DEFINE(__EMX__)
+    DEFAULT_DEFAULT_wxUSE_PM=1
   ;;
 
   *-*-beos* )
@@ -887,6 +890,7 @@ AC_ARG_WITH(motif,         [  --with-motif            use Motif/Lesstif], [wxUSE
 AC_ARG_WITH(wine,          [  --with-wine             use WINE], [wxUSE_WINE="$withval" CACHE_WINE=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(cygwin,        [  --with-cygwin           use Cygwin for MS-Windows], [wxUSE_CYGWIN="$withval" CACHE_CYGWIN=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(mingw,         [  --with-mingw            use GCC Minimal MS-Windows], [wxUSE_MINGW="$withval" CACHE_MINGW=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(pm,            [  --with-pm               use OS/2 Presentation Manager], [wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1])
 
 AC_ARG_WITH(gtk-prefix,    [  --with-gtk-prefix=PFX   Prefix where GTK is installed],
             gtk_config_prefix="$withval", gtk_config_prefix="")
@@ -1187,7 +1191,7 @@ else
 fi
 
 dnl we suppose that expr exists...
-NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0}`
+NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0} + ${wxUSE_PM:-0}`
 
 case "$NUM_TOOLKITS" in
   1)
@@ -1661,8 +1665,27 @@ if test "$wxUSE_MOTIF" = 1; then
     GUIDIST=MOTIF_DIST
 fi
 
+if test "$wxUSE_PM" = 1; then
+    TOOLKIT=PM
+
+    GUIOBJS="\$(PM_GUIOBJS)"
+    GUIHEADERS="\$(PM_HEADERS)"
+    COMMONOBJS="\$(PM_COMMONOBJS)"
+    GENERICOBJS="\$(PM_GENERICOBJS)"
+    GUIDEPS="\$(PM_GUIDEPS)"
+    COMMONDEPS="\$(PM_COMMONDEPS)"
+    GENERICDEPS="\$(PM_GENERICDEPS)"
+    UNIXOBJS=
+    UNIXDEPS=
+    GUIDIST=GTK_DIST
+fi
+
 dnl the name of the directory where the files for this toolkit live
-TOOLKIT_DIR=`echo ${TOOLKIT} | tr "A-Z" "a-z"`
+if test "$TOOLKIT" != "PM" ; then
+    TOOLKIT_DIR=`echo ${TOOLKIT} | tr "A-Z" "a-z"`
+else
+    TOOLKIT_DIR="os2"
+fi
 
 dnl the symbol which allows conditional compilation for the given toolkit
 TOOLKIT_DEF="-D__WX${TOOLKIT}__"
@@ -1809,6 +1832,9 @@ if test "$wxUSE_SHARED" = "yes"; then
         WX_ALL="${WX_LIBRARY_NAME_STATIC}"
       ;;
       *-pc-os2_emx )
+        dnl only static for now
+        WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
+        WX_ALL="${WX_LIBRARY_NAME_STATIC}"
       ;;
       *-*-beos* )
         dnl can't use gcc under BeOS for shared library creation because it

distrib/msw/tmake/filelist.txt

@@ -14,11 +14,13 @@
 #  X	/src/motif   X for Xt
 #  U	/src/unix
 #  R	/src/gtk     R for Robert
+#  O	/src/os2
 #  H	/src/html
 #  W	/include/wx
 #  K	/include/wx/gtk        K for gtK
 #  F	/include/wx/motif      F for motiF
 #  9	/include/wx/msw        9 for Windows 9x
+#  2	/include/wx/os2        2 for os2
 #  N	/include/wx/generic    N for geNeric
 #  L	/include/wx/html       L for htmL
 #  P	/include/wx/protocol
@@ -412,6 +414,82 @@ timer.cpp	X
 utils.cpp	X
 window.cpp	X
 
+accel.cpp	O
+app.cpp	O
+bitmap.cpp	O
+bmpbuttn.cpp	O
+brush.cpp	O
+button.cpp	O
+checkbox.cpp	O
+checklst.cpp	O
+choice.cpp	O
+clipbrd.cpp	O
+colour.cpp	O
+combobox.cpp	O
+control.cpp	O
+cursor.cpp	O
+data.cpp	O
+dataobj.cpp	O
+dc.cpp	O
+dcclient.cpp	O
+dcmemory.cpp	O
+dcprint.cpp	O
+dcscreen.cpp	O
+dialog.cpp	O
+#dialup.cpp	O
+#dir.cpp	O	B
+dirdlg.cpp	O
+dnd.cpp	O
+filedlg.cpp	O
+font.cpp	O
+fontdlg.cpp	O
+frame.cpp	O
+gauge.cpp	O
+gdiimage.cpp	O
+gdiobj.cpp	O
+helpwin.cpp	O
+icon.cpp	O
+iniconf.cpp	O
+joystick.cpp	O
+listbox.cpp	O
+main.cpp	O
+mdi.cpp	O
+menu.cpp	O
+menuitem.cpp	O
+metafile.cpp	O
+minifram.cpp	O
+msgdlg.cpp	O
+nativdlg.cpp	O
+notebook.cpp	O
+ownerdrw.cpp	O
+palette.cpp	O
+pen.cpp	O
+print.cpp	O
+radiobox.cpp	O
+radiobut.cpp	O
+region.cpp	O
+scrolbar.cpp	O
+settings.cpp	O
+slider.cpp	O
+spinbutt.cpp	O
+spinctrl.cpp	O
+statbmp.cpp	O
+statbox.cpp	O
+statline.cpp	O
+stattext.cpp	O
+tabctrl.cpp	O
+taskbar.cpp	O
+textctrl.cpp	O
+timer.cpp	O
+thread.cpp	O
+toolbar.cpp	O
+tooltip.cpp	O
+utils.cpp	O	B
+utilsexc.cpp	O	B
+wave.cpp	O
+window.cpp	O
+gsocket.c	O
+
 helpdata.cpp	H
 helpfrm.cpp	H
 helpctrl.cpp	H
@@ -861,6 +939,80 @@ xpmhand.h	9
 # disable.bmp	9
 # wx.rc	9
 
+accel.h	2
+dataobj.h	2
+helpwin.h	2
+pngread.h	2
+statline.h	2
+app.h	2
+dataobj2.h	2
+icon.h	2
+stattext.h	2
+bitmap.h	2
+dc.h	2
+tabctrl.h	2
+dcclient.h	2
+print.h	2
+taskbar.h	2
+bmpbuttn.h	2
+dcmemory.h	2
+iniconf.h	2
+private.h	2
+textctrl.h	2
+brush.h	2
+dcprint.h	2
+joystick.h	2
+timer.h	2
+dcscreen.h	2
+listbox.h	2
+button.h	2
+dialog.h	2
+radiobox.h	2
+toolbar.h	2
+checkbox.h	2
+dirdlg.h	2
+mdi.h	2
+radiobut.h	2
+tooltip.h	2
+checklst.h	2
+dnd.h	2
+menu.h	2
+region.h	2
+menuitem.h	2
+choice.h	2
+filedlg.h	2
+metafile.h	2
+scrolbar.h	2
+wave.h	2
+clipbrd.h	2
+font.h	2
+minifram.h	2
+settings.h	2
+window.h	2
+fontdlg.h	2
+msgdlg.h	2
+setup.h	2
+colour.h	2
+frame.h	2
+setup0.h	2
+combobox.h	2
+gauge.h	2
+notebook.h	2
+control.h	2
+gdiimage.h	2
+palette.h	2
+slider.h	2
+cursor.h	2
+gdiobj.h	2
+spinbutt.h	2
+gsockos2.h	2
+pen.h	2
+spinctrl.h	2
+statbmp.h	2
+dataform.h	2
+pnghand.h	2
+statbox.h	2
+
 fontutil.h	S
 execute.h	S