Enabling --with-wx-version parameter to facilitate wx3 testing

configure

@@ -956,6 +956,7 @@ enable_sse
 enable_universal_binary
 enable_dynamic_loading
 enable_gtk3
+with_wx_version
 with_expat
 with_ffmpeg
 with_lame
@@ -1723,6 +1724,7 @@ Optional Packages:
                         (or the compiler's sysroot if not specified).
   --with-lib-preference   whether to use local and/or system libraries, in
                           order of preference (default="system local")
+  --with-wx-version       select wxWidgets version (if both installed) [2.8,]
   --with-expat            which expat to use for XML file support:
                           [system,local]
   --with-ffmpeg           use ffmpeg for import and export support
@@ -19190,6 +19192,14 @@ fi
 
 
 
+# Check whether --with-wx-version was given.
+if test "${with_wx_version+set}" = set; then :
+  withval=$with_wx_version; wx_preference="--version=$withval"
+else
+  wx_preference=""
+fi
+
+
 
 if test x$enable_universal_binary = xyes; then
    case "$target_os" in

configure.ac

@@ -186,11 +186,11 @@ AC_ARG_ENABLE(dynamic-loading,
 
 AC_ARG_ENABLE(gtk3, [AS_HELP_STRING([--enable-gtk3],[enable use of GTK+-3.0 (default: use GTK+-2.0)])], enable_gtk3=$enableval, enable_gtk3=no)
 
-dnl AC_ARG_WITH(wx-version,
+AC_ARG_WITH(wx-version,
-dnl            [AS_HELP_STRING([--with-wx-version],
+           [AS_HELP_STRING([--with-wx-version],
-dnl                            [select wxWidgets version (if both installed) [2.8,]])],
+                           [select wxWidgets version (if both installed) [2.8,]])],
-dnl            wx_preference="--version=$withval",
+           wx_preference="--version=$withval",
-dnl            wx_preference="")
+           wx_preference="")
 dnl At the moment we only support wx2.8. If we start supporting 3.0 when it
 dnl comes out, we'll want it back again.
 

lib-src/lib-widget-extra/configure

@@ -774,6 +774,7 @@ enable_libtool_lock
 enable_static_wx
 enable_unicode
 enable_debug
+with_wx_version
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1432,6 +1433,7 @@ Optional Packages:
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
                         (or the compiler's sysroot if not specified).
+  --with-wx-version       select wxWidgets version (if both installed) [2.8,]
 
 Some influential environment variables:
   CC          C compiler command
@@ -16232,6 +16234,14 @@ fi
 
 
 
+# Check whether --with-wx-version was given.
+if test "${with_wx_version+set}" = set; then :
+  withval=$with_wx_version; wx_preference="--version=$withval"
+else
+  wx_preference=""
+fi
+
+
 
 if test "$debug_preference" = "yes"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: Adding -g for debugging to CFLAGS and CXXFLAGS ..." >&5

lib-src/lib-widget-extra/configure.ac

@@ -63,11 +63,11 @@ AC_ARG_ENABLE(debug,
             debug_preference="$enableval",
             debug_preference="no")
 
-dnl AC_ARG_WITH(wx-version,
+AC_ARG_WITH(wx-version,
-dnl             [AS_HELP_STRING([--with-wx-version],
+            [AS_HELP_STRING([--with-wx-version],
-dnl                            [select wxWidgets version (if both installed) [2.8,]])],
+                           [select wxWidgets version (if both installed) [2.8,]])],
-dnl            wx_preference="--version=$withval",
+           wx_preference="--version=$withval",
-dnl            wx_preference="")
+           wx_preference="")
 dnl Right now only support wx 2.8
 
 dnl ----------------------------------------------------