Deprecate second parameter of wxSlider::SetTickFreq().

[wxWidgets.git] / configure

diff --git a/configure b/configure
index 9be6e6156fe7a41eb66e7cc46ef594fe873036f0..fea56a821e71518775c67bbe48934e2fae7c2100 100755 (executable)
--- a/configure
+++ b/configure
@@ -1806,6 +1806,7 @@ Optional Features:
   --disable-controls      disable compilation of all standard controls
   --enable-accel          use accelerators
   --enable-animatectrl    use wxAnimationCtrl class
+  --enable-artstd         use standard XPM icons in wxArtProvider
   --enable-arttango       use Tango icons in wxArtProvider
   --enable-bmpbutton      use wxBitmapButton class
   --enable-bmpcombobox    use wxBitmapComboBox class
@@ -9899,6 +9900,50 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-artstd" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-artstd... $ECHO_C" >&6; }
+          # Check whether --enable-artstd was given.
+if test "${enable_artstd+set}" = set; then
+  enableval=$enable_artstd;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_artstd='wxUSE_ARTPROVIDER_STD=yes'
+                          else
+                            wx_cv_use_artstd='wxUSE_ARTPROVIDER_STD=no'
+                          fi
+
+else
+
+                          wx_cv_use_artstd='wxUSE_ARTPROVIDER_STD=${'DEFAULT_wxUSE_ARTPROVIDER_STD":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_artstd"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_ARTPROVIDER_STD = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_ARTPROVIDER_STD
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -26637,7 +26682,7 @@ if test "$build" != "$host" -a "$GCC" = yes; then
                                 if test -z "$x_includes" -o "$x_includes" = NONE; then
 
 ac_find_includes=
-for ac_dir in $SEARCH_INCLUDE /usr/include;
+for ac_dir in $SEARCH_INCLUDE /usr/include
   do
     if test -f "$ac_dir/X11/Intrinsic.h"; then
       ac_find_includes=$ac_dir
@@ -26650,7 +26695,7 @@ for ac_dir in $SEARCH_INCLUDE /usr/include;
         if test -z "$x_libraries" -o "$x_libraries" = NONE; then
 
   ac_find_libraries=
-  for ac_dir in $SEARCH_LIB;
+  for ac_dir in $SEARCH_LIB
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXt.$ac_extension"; then
@@ -30871,7 +30916,7 @@ done
 echo $ECHO_N "checking for gpewidget library... $ECHO_C" >&6; }
 
   ac_find_libraries=
-  for ac_dir in $SEARCH_LIB;
+  for ac_dir in $SEARCH_LIB
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libgpewidget.$ac_extension"; then
@@ -33066,7 +33111,7 @@ done
 echo $ECHO_N "checking for Motif/Lesstif headers... $ECHO_C" >&6; }
 
 ac_find_includes=
-for ac_dir in $SEARCH_INCLUDE /usr/include;
+for ac_dir in $SEARCH_INCLUDE /usr/include
   do
     if test -f "$ac_dir/Xm/Xm.h"; then
       ac_find_includes=$ac_dir
@@ -33161,7 +33206,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 echo $ECHO_N "checking for Motif/Lesstif library... $ECHO_C" >&6; }
 
   ac_find_libraries=
-  for ac_dir in $SEARCH_LIB;
+  for ac_dir in $SEARCH_LIB
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXm.$ac_extension"; then
@@ -33565,7 +33610,7 @@ _ACEOF
 echo $ECHO_N "checking for Xpm library... $ECHO_C" >&6; }
 
   ac_find_libraries=
-  for ac_dir in $SEARCH_LIB;
+  for ac_dir in $SEARCH_LIB
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXpm.$ac_extension"; then
@@ -34097,7 +34142,7 @@ if test "$wxUSE_DISPLAY" = "yes"; then
 echo $ECHO_N "checking for Xinerama... $ECHO_C" >&6; }
 
   ac_find_libraries=
-  for ac_dir in $SEARCH_LIB;
+  for ac_dir in $SEARCH_LIB
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXinerama.$ac_extension"; then
@@ -34191,7 +34236,7 @@ if test "$wxUSE_DISPLAY" = "yes"; then
 echo $ECHO_N "checking for Xxf86vm extension... $ECHO_C" >&6; }
 
   ac_find_libraries=
-  for ac_dir in $SEARCH_LIB;
+  for ac_dir in $SEARCH_LIB
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXxf86vm.$ac_extension"; then
@@ -34281,7 +34326,7 @@ if test "$wxUSE_DETECT_SM" = "yes"; then
 echo $ECHO_N "checking for -lSM - X11 session management... $ECHO_C" >&6; }
 
   ac_find_libraries=
-  for ac_dir in $SEARCH_LIB;
+  for ac_dir in $SEARCH_LIB
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libSM.$ac_extension"; then
@@ -34339,7 +34384,7 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
 echo $ECHO_N "checking for OpenGL headers... $ECHO_C" >&6; }
 
 ac_find_includes=
-for ac_dir in $SEARCH_INCLUDE /opt/graphics/OpenGL/include /usr/include;
+for ac_dir in $SEARCH_INCLUDE /opt/graphics/OpenGL/include /usr/include
   do
     if test -f "$ac_dir/GL/gl.h"; then
       ac_find_includes=$ac_dir
@@ -34467,7 +34512,7 @@ if test $ac_cv_header_GL_glu_h = yes; then
 echo $ECHO_N "checking for -lGL... $ECHO_C" >&6; }
 
   ac_find_libraries=
-  for ac_dir in $SEARCH_LIB /opt/graphics/OpenGL/lib;
+  for ac_dir in $SEARCH_LIB /opt/graphics/OpenGL/lib
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libGL.$ac_extension"; then
@@ -34502,7 +34547,7 @@ echo "${ECHO_T}found in $ac_find_libraries" >&6; }
 echo $ECHO_N "checking for -lGLU... $ECHO_C" >&6; }
 
   ac_find_libraries=
-  for ac_dir in $SEARCH_LIB;
+  for ac_dir in $SEARCH_LIB
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libGLU.$ac_extension"; then
@@ -34549,7 +34594,7 @@ echo "${ECHO_T}no" >&6; }
 echo $ECHO_N "checking for -lMesaGL... $ECHO_C" >&6; }
 
   ac_find_libraries=
-  for ac_dir in $SEARCH_LIB;
+  for ac_dir in $SEARCH_LIB
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libMesaGL.$ac_extension"; then
@@ -47575,6 +47620,13 @@ _ACEOF
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
 fi
 
+if test "$wxUSE_ARTPROVIDER_STD" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_ARTPROVIDER_STD 1
+_ACEOF
+
+fi
+
 if test "$wxUSE_ARTPROVIDER_TANGO" = "auto"; then
             if test "$wxUSE_GTK" != 1; then
                 if test "$wxUSE_LIBPNG" != no -a \
@@ -51023,10 +51075,10 @@ fi
 
 
 
-    BAKEFILE_BAKEFILE_M4_VERSION="0.2.8"
+    BAKEFILE_BAKEFILE_M4_VERSION="0.2.9"
 
 
-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.8"
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.9"