]> git.saurik.com Git - wxWidgets.git/blobdiff - configure.in
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
removed call to win32 api ::SetMapMode -- hopefully not longer neccessary
[wxWidgets.git] / configure.in
diff --git a/configure.in b/configure.in
index d7d470d68160fa4e2b4b6c497e721a9aee3fb1d6..bd05c5bca09e2722951c07b6868f787b5769e56e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -409,7 +409,7 @@ dnl WX_INTERFACE_AGE = 0
 
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=1
 
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=1
-WX_RELEASE_NUMBER=12
+WX_RELEASE_NUMBER=13
 
 WX_INTERFACE_AGE=0
 WX_BINARY_AGE=0
 
 WX_INTERFACE_AGE=0
 WX_BINARY_AGE=0
@@ -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
 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
 
 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_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*
 
 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_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"
 
 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__)
 
   *-pc-os2_emx )
     AC_DEFINE(__EMX__)
+    DEFAULT_DEFAULT_wxUSE_PM=1
   ;;
 
   *-*-beos* )
   ;;
 
   *-*-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(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="")
 
 AC_ARG_WITH(gtk-prefix,    [  --with-gtk-prefix=PFX   Prefix where GTK is installed],
             gtk_config_prefix="$withval", gtk_config_prefix="")
@@ -1188,6 +1192,17 @@ 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}`
 
 dnl we suppose that expr exists...
 NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0}`
+case "${host}" in
+  *-pc-os2_emx )
+    NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
+    # PATH_IFS is autodetected by OS/2's configure (usually ';')
+    LEX_STEM="lexyy"
+  ;;
+  *)
+    PATH_IFS=':'
+    LEX_STEM="lex.yy"
+  ;;
+esac
 
 case "$NUM_TOOLKITS" in
   1)
 
 case "$NUM_TOOLKITS" in
   1)
@@ -1394,6 +1409,8 @@ SEARCH_INCLUDE="\
     /usr/x386/include         \
     /usr/XFree86/include/X11  \
                               \
     /usr/x386/include         \
     /usr/XFree86/include/X11  \
                               \
+    X:/XFree86/include/X11    \
+                              \
     /usr/include/gtk          \
     /usr/local/include/gtk    \
     /usr/include/glib         \
     /usr/include/gtk          \
     /usr/local/include/gtk    \
     /usr/include/glib         \
@@ -1428,8 +1445,12 @@ dnl ----------------------------------------------------------------
 dnl search for toolkit (widget sets)
 dnl ----------------------------------------------------------------
 
 dnl search for toolkit (widget sets)
 dnl ----------------------------------------------------------------
 
+AFMINSTALL=
+
 if test "$wxUSE_GUI" = "yes"; then
 
 if test "$wxUSE_GUI" = "yes"; then
 
+USE_GUI=1
+
 TOOLKIT=
 TOOLKIT_INCLUDE=
 
 TOOLKIT=
 TOOLKIT_INCLUDE=
 
@@ -1441,6 +1462,7 @@ GUI_TK_LIBRARY=
 GUI_TK_LINK=
 
 WXGTK12=
 GUI_TK_LINK=
 
 WXGTK12=
+WXGTK13=
 
 WXWINE=
 
 
 WXWINE=
 
@@ -1484,14 +1506,24 @@ if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
 fi
 
 if test "$wxUSE_GTK" = 1; then
 fi
 
 if test "$wxUSE_GTK" = 1; then
-    dnl avoid calling AM_PATH_GTK twice, so check first for the newer version and
-    dnl only then, if it wasn't found, for an older one
-    AM_PATH_GTK(1.2.1, WXGTK12=1, AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.1 or above?))
+    dnl avoid calling AM_PATH_GTK twice, so check first for the newer version
+    dnl and only then, if it wasn't found, for an older one
+    AM_PATH_GTK(1.2.3, WXGTK12=1, AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.3 or above?))
+dnl it doesn't really work with 1.3.0 now...
+dnl    AM_PATH_GTK(1.3.0,
+dnl        WXGTK13=1,
+dnl        AM_PATH_GTK(1.2.1,
+dnl            WXGTK12=1,
+dnl            AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.1 or above?)
+dnl        )
+dnl    )
 
     TOOLKIT_INCLUDE="$GTK_CFLAGS"
 
     TOOLKIT_INCLUDE="$GTK_CFLAGS"
-    GUI_TK_LIBRARY="$GTK_LIBS"
+    GUI_TK_LIBRARY="$GTK_LIBS -lgthread"
     TOOLKIT=GTK
 
     TOOLKIT=GTK
 
+    AFMINSTALL=afminstall
+
     GUIOBJS="\$(GTK_GUIOBJS)"
     GUIHEADERS="\$(GTK_HEADERS)"
     COMMONOBJS="\$(GTK_COMMONOBJS)"
     GUIOBJS="\$(GTK_GUIOBJS)"
     GUIHEADERS="\$(GTK_HEADERS)"
     COMMONOBJS="\$(GTK_COMMONOBJS)"
@@ -1572,6 +1604,8 @@ if test "$wxUSE_MOTIF" = 1; then
     GUI_TK_LIBRARY="$X_LIBS"
     TOOLKIT_INCLUDE="$X_CFLAGS"
 
     GUI_TK_LIBRARY="$X_LIBS"
     TOOLKIT_INCLUDE="$X_CFLAGS"
 
+    AFMINSTALL=afminstall
+
     dnl manual check for X11 headers/libs
     dnl
     dnl    AC_MSG_CHECKING(for X11 headers)
     dnl manual check for X11 headers/libs
     dnl
     dnl    AC_MSG_CHECKING(for X11 headers)
@@ -1661,8 +1695,27 @@ if test "$wxUSE_MOTIF" = 1; then
     GUIDIST=MOTIF_DIST
 fi
 
     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
 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}__"
 
 dnl the symbol which allows conditional compilation for the given toolkit
 TOOLKIT_DEF="-D__WX${TOOLKIT}__"
@@ -1689,6 +1742,8 @@ WX_LIBRARY="wx_${TOOLKIT_DIR}"
 else
     dnl leave all TOOLKIT_XXX vars empty
 
 else
     dnl leave all TOOLKIT_XXX vars empty
 
+    USE_GUI=0
+
     dnl the sources, their dependenices and the headers
     ALL_OBJECTS="\$(BASE_OBJS)"
     ALL_DEPFILES="\${BASE_DEPS}"
     dnl the sources, their dependenices and the headers
     ALL_OBJECTS="\$(BASE_OBJS)"
     ALL_DEPFILES="\${BASE_DEPS}"
@@ -1809,6 +1864,9 @@ if test "$wxUSE_SHARED" = "yes"; then
         WX_ALL="${WX_LIBRARY_NAME_STATIC}"
       ;;
       *-pc-os2_emx )
         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
       ;;
       *-*-beos* )
         dnl can't use gcc under BeOS for shared library creation because it
@@ -2208,6 +2266,11 @@ else
   fi
 fi
 
   fi
 fi
 
+if test "$WXGTK13" = 1 ; then
+  AC_DEFINE_UNQUOTED(__WXGTK13__,$WXGTK13)
+  WXGTK12=1
+fi
+
 if test "$WXGTK12" = 1 ; then
   AC_DEFINE_UNQUOTED(__WXGTK12__,$WXGTK12)
 fi
 if test "$WXGTK12" = 1 ; then
   AC_DEFINE_UNQUOTED(__WXGTK12__,$WXGTK12)
 fi
@@ -2257,16 +2320,16 @@ if test "$wxUSE_PROFILE" = "yes" ; then
 fi
 
 DEP_INFO_FLAGS=
 fi
 
 DEP_INFO_FLAGS=
+CODE_GEN_FLAGS=
 if test "$GCC" = yes ; then
     if test "$wxUSE_NO_RTTI" = "yes" ; then
 if test "$GCC" = yes ; then
     if test "$wxUSE_NO_RTTI" = "yes" ; then
-        WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti"
+        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-rtti"
     fi
     if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
     fi
     if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
-        WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-exceptions"
+        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-exceptions"
     fi
     if test "$wxUSE_PERMISSIVE" = "yes" ; then
     fi
     if test "$wxUSE_PERMISSIVE" = "yes" ; then
-       CFLAGS="${CFLAGS} -fpermissive"
-       CXXFLAGS="${CXXFLAGS} -fpermissive"
+       CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
     fi
     if test "$wxUSE_NO_DEPS" = "no" ; then
         DEP_INFO_FLAGS="-MMD"
     fi
     if test "$wxUSE_NO_DEPS" = "no" ; then
         DEP_INFO_FLAGS="-MMD"
@@ -2438,7 +2501,7 @@ fi
 
 if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
   AC_DEFINE(wxUSE_DIALUP_MANAGER)
 
 if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
   AC_DEFINE(wxUSE_DIALUP_MANAGER)
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS nettest"
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
 fi
 
 if test "$wxUSE_STREAMS" = "yes" ; then
 fi
 
 if test "$wxUSE_STREAMS" = "yes" ; then
@@ -2612,7 +2675,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
     AC_LANG_RESTORE
 
     AC_DEFINE(wxUSE_SOCKETS)
     AC_LANG_RESTORE
 
     AC_DEFINE(wxUSE_SOCKETS)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
     INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
 fi
 
     INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
 fi
 
@@ -3119,22 +3182,28 @@ if test "$wxUSE_GUI" = "yes"; then
     dnl      library features they need are present)
 
     dnl TODO some samples are never built so far:
     dnl      library features they need are present)
 
     dnl TODO some samples are never built so far:
-    dnl      mfc, nativdlg, oleauto, ownerdrw, proplist
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS bombs controls dialogs drawing dynamic \
-                     font forty fractal image minimal richedit wxpoem"
+    dnl      ipc, mfc, nativdlg, oleauto, ownerdrw, proplist
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs drawing dynamic \
+                     font fractal image minimal richedit"
 
     dnl this is needed to be able to find AFM files
 
     dnl this is needed to be able to find AFM files
-    EXTRADEFS="-DwxINSTALL_PREFIX=\"$prefix\""
+    CPPFLAGS="$CPPFLAGS \$(EXTRADEFS)"
 else
     SAMPLES_SUBDIRS=""
 else
     SAMPLES_SUBDIRS=""
-    EXTRADEFS=
 fi
 
 dnl for convenience, sort the samples in alphabetical order
 dnl
 dnl FIXME For some mysterious reasons, sometimes the directories are duplicated
 dnl       in this list - hence uniq. But normally, this shouldn't be needed!
 fi
 
 dnl for convenience, sort the samples in alphabetical order
 dnl
 dnl FIXME For some mysterious reasons, sometimes the directories are duplicated
 dnl       in this list - hence uniq. But normally, this shouldn't be needed!
-SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '`"
+dnl       Unfortunately, there is a bug in OS/2's tr, such that 
+dnl       tr ' ' '\n' introduces DOS-like line breaks, whereas tr '\n' ' '
+dnl       only removes the Unix-like part of the introduced line break.
+SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
+
+dnl makefile variables
+AC_SUBST(LEX_STEM)
+AC_SUBST(PATH_IFS)
 
 dnl global options
 AC_SUBST(WX_MAJOR_VERSION_NUMBER)
 
 dnl global options
 AC_SUBST(WX_MAJOR_VERSION_NUMBER)
@@ -3157,12 +3226,15 @@ AC_SUBST(WX_ALL_INSTALLED)
 AC_SUBST(SHARED_LD)
 AC_SUBST(PIC_FLAG)
 AC_SUBST(DEP_INFO_FLAGS)
 AC_SUBST(SHARED_LD)
 AC_SUBST(PIC_FLAG)
 AC_SUBST(DEP_INFO_FLAGS)
+AC_SUBST(CODE_GEN_FLAGS)
 AC_SUBST(BURNT_LIBRARY_NAME)
 
 dnl debugging options
 AC_SUBST(WXDEBUG_DEFINE)
 
 dnl toolkit options
 AC_SUBST(BURNT_LIBRARY_NAME)
 
 dnl debugging options
 AC_SUBST(WXDEBUG_DEFINE)
 
 dnl toolkit options
+AC_SUBST(USE_GUI)
+AC_SUBST(AFMINSTALL)
 AC_SUBST(TOOLKIT)
 AC_SUBST(TOOLKIT_DEF)
 AC_SUBST(TOOLKIT_DIR)
 AC_SUBST(TOOLKIT)
 AC_SUBST(TOOLKIT_DEF)
 AC_SUBST(TOOLKIT_DIR)
@@ -3225,9 +3297,15 @@ AC_OUTPUT([
             src/makeprog.env
             src/makelib.env
             Makefile
             src/makeprog.env
             src/makelib.env
             Makefile
+            demos/Makefile
+            demos/bombs/Makefile
+            demos/forty/Makefile
+            demos/fractal/Makefile
+            demos/life/Makefile
+            demos/poem/Makefile
             samples/Makefile
             samples/Makefile
-            samples/bombs/Makefile
             samples/caret/Makefile
             samples/caret/Makefile
+            samples/calendar/Makefile
             samples/checklst/Makefile
             samples/config/Makefile
             samples/controls/Makefile
             samples/checklst/Makefile
             samples/config/Makefile
             samples/controls/Makefile
@@ -3238,22 +3316,25 @@ AC_OUTPUT([
             samples/docvwmdi/Makefile
             samples/dnd/Makefile
             samples/drawing/Makefile
             samples/docvwmdi/Makefile
             samples/dnd/Makefile
             samples/drawing/Makefile
-            samples/forty/Makefile
+            samples/exec/Makefile
             samples/font/Makefile
             samples/font/Makefile
-            samples/fractal/Makefile
+            samples/grid/Makefile
+            samples/help/Makefile
             samples/image/Makefile
             samples/internat/Makefile
             samples/image/Makefile
             samples/internat/Makefile
+            samples/ipc/Makefile
             samples/layout/Makefile
             samples/listctrl/Makefile
             samples/mdi/Makefile
             samples/minifram/Makefile
             samples/minimal/Makefile
             samples/layout/Makefile
             samples/listctrl/Makefile
             samples/mdi/Makefile
             samples/minifram/Makefile
             samples/minimal/Makefile
-            samples/nettest/Makefile
+            samples/dialup/Makefile
             samples/newgrid/Makefile
             samples/notebook/Makefile
             samples/png/Makefile
             samples/printing/Makefile
             samples/proplist/Makefile
             samples/newgrid/Makefile
             samples/notebook/Makefile
             samples/png/Makefile
             samples/printing/Makefile
             samples/proplist/Makefile
+            samples/propsize/Makefile
             samples/richedit/Makefile
             samples/resource/Makefile
             samples/sashtest/Makefile
             samples/richedit/Makefile
             samples/resource/Makefile
             samples/sashtest/Makefile
@@ -3266,8 +3347,7 @@ AC_OUTPUT([
             samples/treectrl/Makefile
             samples/typetest/Makefile
             samples/validate/Makefile
             samples/treectrl/Makefile
             samples/typetest/Makefile
             samples/validate/Makefile
-            samples/wxpoem/Makefile
-            samples/wxsocket/Makefile
+            samples/sockets/Makefile
             samples/wizard/Makefile
             samples/html/Makefile
             samples/html/about/Makefile
             samples/wizard/Makefile
             samples/html/Makefile
             samples/html/about/Makefile
@@ -3286,6 +3366,14 @@ AC_OUTPUT([
             utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile
             utils/ogl/Makefile
             utils/ogl/src/Makefile
             utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile
             utils/ogl/Makefile
             utils/ogl/src/Makefile
+            utils/makegen/Makefile
+            utils/HelpGen/Makefile
+            utils/HelpGen/src/Makefile
+            utils/tex2rtf/Makefile
+            utils/tex2rtf/src/Makefile
+            utils/hhp2cached/Makefile
+            utils/dialoged/Makefile
+            utils/dialoged/src/Makefile
           ],
           [
             chmod +x wx-config
           ],
           [
             chmod +x wx-config
wxWidgets (Impactor)