Added roadmap.

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index b62394c75ba4a44cf023b6ee04e6d1b42a4a3278..66db673ae4eadd7a5c5b6cb16fc150c15547c6ca 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -587,6 +587,7 @@ case "${host}" in
     AC_DEFINE(__WIN95__)
     AC_DEFINE(__WINDOWS__)
     AC_DEFINE(__GNUWIN32__)
     AC_DEFINE(__WIN95__)
     AC_DEFINE(__WINDOWS__)
     AC_DEFINE(__GNUWIN32__)

+    AC_DEFINE(STRICT)

     AC_DEFINE(WINVER, 0x0400)
     DEFAULT_DEFAULT_wxUSE_MSW=1
   ;;
     AC_DEFINE(WINVER, 0x0400)
     DEFAULT_DEFAULT_wxUSE_MSW=1
   ;;


@@ -596,6 +597,7 @@ case "${host}" in
     AC_DEFINE(__WIN95__)
     AC_DEFINE(__WINDOWS__)
     AC_DEFINE(__GNUWIN32__)
     AC_DEFINE(__WIN95__)
     AC_DEFINE(__WINDOWS__)
     AC_DEFINE(__GNUWIN32__)

+    AC_DEFINE(STRICT)

     AC_DEFINE(WINVER, 0x0400)
     DEFAULT_DEFAULT_wxUSE_MSW=1
   ;;
     AC_DEFINE(WINVER, 0x0400)
     DEFAULT_DEFAULT_wxUSE_MSW=1
   ;;


@@ -659,7 +661,6 @@ if test $DEBUG_CONFIGURE = 1; then
 
   DEFAULT_wxUSE_ZLIB=no
   DEFAULT_wxUSE_LIBPNG=no
 
   DEFAULT_wxUSE_ZLIB=no
   DEFAULT_wxUSE_LIBPNG=no

-  DEFAULT_wxUSE_LIBGIF=no

   DEFAULT_wxUSE_LIBJPEG=no
   DEFAULT_wxUSE_ODBC=no
 
   DEFAULT_wxUSE_LIBJPEG=no
   DEFAULT_wxUSE_ODBC=no
 


@@ -742,6 +743,10 @@ if test $DEBUG_CONFIGURE = 1; then
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no

+  
+  DEFAULT_wxUSE_GIF=no
+  DEFAULT_wxUSE_PCX=no
+  DEFAULT_wxUSE_PNM=no

 else
   DEFAULT_wxUSE_THREADS=yes
 
 else
   DEFAULT_wxUSE_THREADS=yes
 


@@ -766,7 +771,6 @@ else
 
   DEFAULT_wxUSE_ZLIB=yes
   DEFAULT_wxUSE_LIBPNG=yes
 
   DEFAULT_wxUSE_ZLIB=yes
   DEFAULT_wxUSE_LIBPNG=yes

-  DEFAULT_wxUSE_LIBGIF=yes

   DEFAULT_wxUSE_LIBJPEG=yes
   DEFAULT_wxUSE_ODBC=no
 
   DEFAULT_wxUSE_LIBJPEG=yes
   DEFAULT_wxUSE_ODBC=no
 


@@ -849,6 +853,10 @@ else
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no

+  
+  DEFAULT_wxUSE_GIF=yes
+  DEFAULT_wxUSE_PCX=yes
+  DEFAULT_wxUSE_PNM=yes

 fi
 
 dnl WX_ARG_WITH should be used to select whether an external package will be
 fi
 
 dnl WX_ARG_WITH should be used to select whether an external package will be


@@ -884,7 +892,6 @@ AC_ARG_WITH(gtk-exec-prefix, [  --with-gtk-exec-prefix=PFX  Exec prefix where GT
 WX_ARG_WITH(dmalloc,       [  --with-dmalloc          use dmalloc library (www.letters.com/dmalloc)], wxUSE_DMALLOC)
 WX_ARG_WITH(zlib,          [  --with-zlib             use zlib for LZW compression], wxUSE_ZLIB)
 WX_ARG_WITH(libpng,        [  --with-libpng           use libpng (PNG image format)], wxUSE_LIBPNG)
 WX_ARG_WITH(dmalloc,       [  --with-dmalloc          use dmalloc library (www.letters.com/dmalloc)], wxUSE_DMALLOC)
 WX_ARG_WITH(zlib,          [  --with-zlib             use zlib for LZW compression], wxUSE_ZLIB)
 WX_ARG_WITH(libpng,        [  --with-libpng           use libpng (PNG image format)], wxUSE_LIBPNG)

-WX_ARG_WITH(libgif,        [  --with-libgif           use libgif (GIF file format)], wxUSE_LIBGIF)

 WX_ARG_WITH(libjpeg,       [  --with-libjpeg          use libjpeg (JPEG file format)], wxUSE_LIBJPEG)
 WX_ARG_WITH(opengl,        [  --with-opengl           use OpenGL (or Mesa)], wxUSE_OPENGL)
 WX_ARG_WITH(odbc,          [  --with-odbc             use the IODBC and wxODBC classes], wxUSE_ODBC)
 WX_ARG_WITH(libjpeg,       [  --with-libjpeg          use libjpeg (JPEG file format)], wxUSE_LIBJPEG)
 WX_ARG_WITH(opengl,        [  --with-opengl           use OpenGL (or Mesa)], wxUSE_OPENGL)
 WX_ARG_WITH(odbc,          [  --with-odbc             use the IODBC and wxODBC classes], wxUSE_ODBC)


@@ -1113,6 +1120,14 @@ WX_ARG_ENABLE(splines,     [  --enable-splines        use spline drawing code],
 WX_ARG_ENABLE(validators,  [  --enable-validators     use wxValidator and derived classes], wxUSE_VALIDATORS)
 WX_ARG_ENABLE(busyinfo,    [  --enable-busyinfo       use wxBusyInfo], wxUSE_BUSYINFO)
 
 WX_ARG_ENABLE(validators,  [  --enable-validators     use wxValidator and derived classes], wxUSE_VALIDATORS)
 WX_ARG_ENABLE(busyinfo,    [  --enable-busyinfo       use wxBusyInfo], wxUSE_BUSYINFO)
 

+dnl ---------------------------------------------------------------------------
+dnl support for image formats that do not rely on external library
+dnl ---------------------------------------------------------------------------
+
+WX_ARG_ENABLE(gif,         [  --enable-gif            use gif images (GIF file format)], wxUSE_GIF)
+WX_ARG_ENABLE(pcx,         [  --enable-pcx            use pcx images (PCX file format)], wxUSE_PCX)
+WX_ARG_ENABLE(pnm,         [  --enable-pnm            use pnm images (PNM file format)], wxUSE_PNM)
+

 dnl cache the options values before (may be) aborting below
 WX_ARG_CACHE_FLUSH
 
 dnl cache the options values before (may be) aborting below
 WX_ARG_CACHE_FLUSH
 


@@ -1180,12 +1195,12 @@ dnl cross-compiling support: we're cross compiling if the build system is
 dnl different from the target one (assume host and target be always the same)
 if eval "test $host != $build"; then
   if eval "test $host_alias != NONE"; then
 dnl different from the target one (assume host and target be always the same)
 if eval "test $host != $build"; then
   if eval "test $host_alias != NONE"; then

-    CC=$host_alias-gcc 
-    CXX=$host_alias-c++ 
+    CC=$host_alias-gcc
+    CXX=$host_alias-c++

     AR=$host_alias-ar
     RANLIB=$host_alias-ranlib
     AR=$host_alias-ar
     RANLIB=$host_alias-ranlib

-    DLLTOOL=$host_alias-dlltool 
-    LD=$host_alias-ld 
+    DLLTOOL=$host_alias-dlltool
+    LD=$host_alias-ld

     NM=$host_alias-nm
     STRIP=$host_alias-strip
   fi
     NM=$host_alias-nm
     STRIP=$host_alias-strip
   fi


@@ -1299,6 +1314,8 @@ SEARCH_INCLUDE="\
                               \
     /usr/include/Motif1.2     \
     /opt/xpm/include/X11      \
                               \
     /usr/include/Motif1.2     \
     /opt/xpm/include/X11      \

+    /opt/GBxpm/include/       \
+    /opt/GBxpm/X11/include/   \

                               \
     /usr/Motif1.2/include     \
     /usr/dt/include           \
                               \
     /usr/Motif1.2/include     \
     /usr/dt/include           \


@@ -1385,29 +1402,30 @@ WXGTK12=
 WXWINE=
 
 dnl Extension for programs; '.exe' for msw builds
 WXWINE=
 
 dnl Extension for programs; '.exe' for msw builds

-PROGRAM_EXT= 
+PROGRAM_EXT=

 
 if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
 
 if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then

-    AC_MSG_CHECKING(for Windows headers)
-    WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h)
-    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
-  
-    dnl --- Quick & Dirty ; link against most/all libraries
-    dnl --- This will bloat the executable, but it'll work for now...
-    LIBS="$LIBS  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -loldnames -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
-
-    if test "$ac_find_includes" != "" ; then
-        AC_MSG_RESULT(found $ac_find_includes)
-        TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
+    if test "$cross_compiling" = "yes" ; then
+       AC_MSG_WARN(Cross compiling --- skipping windows.h check)

     else
     else

-        AC_MSG_RESULT(no)
-        if test "$cross_compiling" != "yes" ; then
+       AC_MSG_CHECKING(for Windows headers)
+       WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h)
+       if test "$ac_find_includes" != "" ; then
+            AC_MSG_RESULT(found $ac_find_includes)
+            TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
+       else
+            AC_MSG_RESULT(no)

             AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
             AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)

-        fi  
+        fi

     fi
 
     fi
 

+    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
+    dnl --- Quick & Dirty ; link against most/all libraries
+    dnl --- This will bloat the executable, but it'll work for now...
+    LIBS="$LIBS  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
+

     TOOLKIT=MSW
     TOOLKIT=MSW

-    
+

     GUIOBJS=MSW_GUIOBJS
     GUIHEADERS=MSW_HEADERS
     COMMONOBJS=MSW_COMMONOBJS
     GUIOBJS=MSW_GUIOBJS
     GUIHEADERS=MSW_HEADERS
     COMMONOBJS=MSW_COMMONOBJS


@@ -1428,7 +1446,7 @@ if test "$wxUSE_GTK" = 1; then
     TOOLKIT_INCLUDE="$GTK_CFLAGS"
     GUI_TK_LIBRARY="$GTK_LIBS -ldl"
     TOOLKIT=GTK
     TOOLKIT_INCLUDE="$GTK_CFLAGS"
     GUI_TK_LIBRARY="$GTK_LIBS -ldl"
     TOOLKIT=GTK

-  
+

     GUIHEADERS=GTK_HEADERS
     GUIOBJS=GTK_GUIOBJS
     COMMONOBJS=GTK_COMMONOBJS
     GUIHEADERS=GTK_HEADERS
     GUIOBJS=GTK_GUIOBJS
     COMMONOBJS=GTK_COMMONOBJS


@@ -1463,7 +1481,7 @@ if test "$wxUSE_WINE" = 1; then
         AC_MSG_RESULT(no)
         AC_MSG_WARN(library will be compiled without support for images in XPM format)
     fi
         AC_MSG_RESULT(no)
         AC_MSG_WARN(library will be compiled without support for images in XPM format)
     fi

-    
+

     MESA_LINK=""
     AC_MSG_CHECKING(for Mesa library)
     WX_PATH_FIND_LIBRARIES($SEARCH_LIB,MesaGL)
     MESA_LINK=""
     AC_MSG_CHECKING(for Mesa library)
     WX_PATH_FIND_LIBRARIES($SEARCH_LIB,MesaGL)


@@ -1479,7 +1497,7 @@ if test "$wxUSE_WINE" = 1; then
     GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
     WXWINE=1
     TOOLKIT=MSW
     GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
     WXWINE=1
     TOOLKIT=MSW

-    
+

     GUIHEADERS=MSW_HEADERS
     GUIOBJS=MSW_GUIOBJS
     COMMONOBJS=MSW_COMMONOBJS
     GUIHEADERS=MSW_HEADERS
     GUIOBJS=MSW_GUIOBJS
     COMMONOBJS=MSW_COMMONOBJS


@@ -1554,7 +1572,7 @@ if test "$wxUSE_MOTIF" = 1; then
     GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXt -lX11 -ldl -lm"
     GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
     TOOLKIT=MOTIF
     GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXt -lX11 -ldl -lm"
     GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
     TOOLKIT=MOTIF

-  
+

     GUIHEADERS=MOTIF_HEADERS
     GUIOBJS=MOTIF_GUIOBJS
     COMMONOBJS=MOTIF_COMMONOBJS
     GUIHEADERS=MOTIF_HEADERS
     GUIOBJS=MOTIF_GUIOBJS
     COMMONOBJS=MOTIF_COMMONOBJS


@@ -1870,7 +1888,7 @@ fi
 
 if test "$wxUSE_THREADS" = "yes" ; then
     dnl find if POSIX threads are available
 
 if test "$wxUSE_THREADS" = "yes" ; then
     dnl find if POSIX threads are available

-    
+

     dnl standard lib name is pthread
     dnl We no longer test for pthread-0.7 as it breaks compilation on some
     dnl glibc2 systems, especially for static linkage.
     dnl standard lib name is pthread
     dnl We no longer test for pthread-0.7 as it breaks compilation on some
     dnl glibc2 systems, especially for static linkage.


@@ -2035,9 +2053,9 @@ if test "$GCC" = yes ; then
     if test "$wxUSE_NO_DEPS" = "no" ; then
         DEP_INFO_FLAGS="-MMD"
     fi
     if test "$wxUSE_NO_DEPS" = "no" ; then
         DEP_INFO_FLAGS="-MMD"
     fi

-fi  
-         
-         
+fi
+
+

 CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
 CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
 if test "$wxUSE_OPTIMISE" = "no" ; then
 CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
 CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
 if test "$wxUSE_OPTIMISE" = "no" ; then


@@ -2072,10 +2090,6 @@ if test "$wxUSE_LIBPNG" = "yes" ; then
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
 fi
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
 fi
 

-if test "$wxUSE_LIBGIF" = "yes" ; then
-  AC_DEFINE(wxUSE_LIBGIF)
-fi
-

 JPEG_INCLUDE=
 if test "$wxUSE_LIBJPEG" = "yes" ; then
   AC_DEFINE(wxUSE_LIBJPEG)
 JPEG_INCLUDE=
 if test "$wxUSE_LIBJPEG" = "yes" ; then
   AC_DEFINE(wxUSE_LIBJPEG)


@@ -2280,13 +2294,13 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
                     [AC_DEFINE(HAVE_SHL_LOAD) HAVE_DL_FUNCS=1 HAVE_SHL_FUNCS=1])
 
     if test "$HAVE_DL_FUNCS" = 0; then
                     [AC_DEFINE(HAVE_SHL_LOAD) HAVE_DL_FUNCS=1 HAVE_SHL_FUNCS=1])
 
     if test "$HAVE_DL_FUNCS" = 0; then

-        if test "$USE_UNIX" = 1; then 
+        if test "$USE_UNIX" = 1; then

             AC_MSG_WARN("--with-dynlib and --with-odbc will be disabled due to missing shared library support")
             wxUSE_ODBC=no
             wxUSE_DYNLIB_CLASS=no
        else
            AC_MSG_WARN("Cannot check dynlib requirements on non-Unix platforms. dynlib remains enabled.")
             AC_MSG_WARN("--with-dynlib and --with-odbc will be disabled due to missing shared library support")
             wxUSE_ODBC=no
             wxUSE_DYNLIB_CLASS=no
        else
            AC_MSG_WARN("Cannot check dynlib requirements on non-Unix platforms. dynlib remains enabled.")

-       fi    
+       fi

     fi
 fi
 
     fi
 fi
 


@@ -2528,11 +2542,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_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
 
     fi
 fi
 


@@ -2632,6 +2642,18 @@ if test "$wxUSE_VALIDATORS" = "yes"; then
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
 fi
 

+if test "$wxUSE_GIF" = "yes" ; then
+  AC_DEFINE(wxUSE_GIF)
+fi
+
+if test "$wxUSE_PCX" = "yes" ; then
+  AC_DEFINE(wxUSE_PCX)
+fi
+
+if test "$wxUSE_PNM" = "yes" ; then
+  AC_DEFINE(wxUSE_PNM)
+fi
+

 dnl ---------------------------------------------------------------------------
 dnl Output the makefiles and such from the results found above
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
 dnl Output the makefiles and such from the results found above
 dnl ---------------------------------------------------------------------------


@@ -2746,6 +2768,15 @@ AC_PROG_MAKE_SET
 
 AC_CONFIG_HEADER(setup.h:setup.h.in)
 
 
 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
 
 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


@@ -2769,6 +2800,7 @@ AC_OUTPUT([
            samples/drawing/Makefile
            samples/dynamic/Makefile
            samples/image/Makefile
            samples/drawing/Makefile
            samples/dynamic/Makefile
            samples/image/Makefile

+           samples/internat/Makefile

            samples/layout/Makefile
            samples/listctrl/Makefile
            samples/mdi/Makefile
            samples/layout/Makefile
            samples/listctrl/Makefile
            samples/mdi/Makefile


@@ -2801,17 +2833,21 @@ AC_OUTPUT([
            utils/wxMMedia2/Makefile
            utils/wxMMedia2/lib/Makefile
            utils/wxMMedia2/sample/Makefile
            utils/wxMMedia2/Makefile
            utils/wxMMedia2/lib/Makefile
            utils/wxMMedia2/sample/Makefile

+           utils/glcanvas/Makefile
+           utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile
+           utils/ogl/Makefile
+           utils/ogl/src/Makefile

           ],
           [
             chmod +x wx-config
           ],
           [
             chmod +x wx-config

-           if test ! -d include; then 
-             mkdir include 
+           if test ! -d include; then
+             mkdir include

            fi
            fi

-           if test ! -d include/wx; then 
-             mkdir include/wx 
+           if test ! -d include/wx; then
+             mkdir include/wx

            fi
            fi

-           if test ! -d include/wx/${TOOLKIT_DIR}; then 
-             mkdir include/wx/${TOOLKIT_DIR} 
+           if test ! -d include/wx/${TOOLKIT_DIR}; then
+             mkdir include/wx/${TOOLKIT_DIR}

            fi
            cp -f setup.h include/wx/${TOOLKIT_DIR}/setup.h
           ],
            fi
            cp -f setup.h include/wx/${TOOLKIT_DIR}/setup.h
           ],