added wxUSE_PALETTE and fixed compilation with it set to 0

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index b605d73e9a10d7a569f52441b8d02c521d27f222..e35d9ccb4943dd6ac38ba82c69dd7a20e9e9c65a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -774,6 +774,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 

+  DEFAULT_wxUSE_PALETTE=no

   DEFAULT_wxUSE_IMAGE=no
   DEFAULT_wxUSE_GIF=no
   DEFAULT_wxUSE_PCX=no
   DEFAULT_wxUSE_IMAGE=no
   DEFAULT_wxUSE_GIF=no
   DEFAULT_wxUSE_PCX=no


@@ -933,6 +934,7 @@ else
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 

+  DEFAULT_wxUSE_PALETTE=yes

   DEFAULT_wxUSE_IMAGE=yes
   DEFAULT_wxUSE_GIF=yes
   DEFAULT_wxUSE_PCX=yes
   DEFAULT_wxUSE_IMAGE=yes
   DEFAULT_wxUSE_GIF=yes
   DEFAULT_wxUSE_PCX=yes


@@ -1290,6 +1292,7 @@ dnl ---------------------------------------------------------------------------
 dnl support for image formats that do not rely on external library
 dnl ---------------------------------------------------------------------------
 
 dnl support for image formats that do not rely on external library
 dnl ---------------------------------------------------------------------------
 

+WX_ARG_ENABLE(palette,     [  --enable-palette        use wxPalette class], wxUSE_PALETTE)

 WX_ARG_ENABLE(image,       [  --enable-image          use wxImage class], wxUSE_IMAGE)
 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(image,       [  --enable-image          use wxImage class], wxUSE_IMAGE)
 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)


@@ -4258,6 +4261,10 @@ if test "$wxUSE_VALIDATORS" = "yes"; then
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
 fi
 

+if test "$wxUSE_PALETTE" = "yes" ; then
+  AC_DEFINE(wxUSE_PALETTE)
+fi
+

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