diff --git a/configure.ac b/configure.ac index 17d16c929..dafce0e6f 100644 --- a/configure.ac +++ b/configure.ac @@ -153,10 +153,10 @@ fi ##################### AC_ARG_ENABLE(static, - [AS_HELP_STRING([--enable-static], + [AS_HELP_STRING([--enable-static-wx], [link wx statically [default=no]])], - static_preference="--static=$enableval", - static_preference="") + static_wx_preference="--static=$enableval", + static_wx_preference="") AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], @@ -288,7 +288,7 @@ else fi dnl more things we always pass to wx-config -wxconfigargs="$static_preference $unicode_preference $wxconfigargs $wx_preference" +wxconfigargs="$static_wx_preference $unicode_preference $wxconfigargs $wx_preference" wx_version=`${WX_CONFIG} $wxconfigargs --version` AC_MSG_NOTICE([Checking that the chosen version of wxWidgets is 2.8.x]) diff --git a/lib-src/FileDialog/configure.ac b/lib-src/FileDialog/configure.ac index f18dd1e67..d0b4133d7 100644 --- a/lib-src/FileDialog/configure.ac +++ b/lib-src/FileDialog/configure.ac @@ -27,10 +27,10 @@ AC_HEADER_STDC # Check for debug # AC_ARG_ENABLE(static, - [AC_HELP_STRING([--enable-static], + [AC_HELP_STRING([--enable-static-wx], [link wx statically (default=no)])], - static_preference="--static=$enableval", - static_preference="") + static_wx_preference="--static=$enableval", + static_wx_preference="") AC_ARG_ENABLE(unicode, @@ -65,7 +65,7 @@ fi dnl Gather wx arguments -CPPFLAGS="$CPPFLAGS `$WX_CONFIG $static_preference $unicode_preference $debug_preference $wx_preference --cxxflags`" +CPPFLAGS="$CPPFLAGS `$WX_CONFIG $static_wx_preference $unicode_preference $debug_preference $wx_preference --cxxflags`" dnl OS-specific configuration diff --git a/lib-src/lib-widget-extra/configure.in b/lib-src/lib-widget-extra/configure.in index 57beb6391..f15ae998d 100644 --- a/lib-src/lib-widget-extra/configure.in +++ b/lib-src/lib-widget-extra/configure.in @@ -57,10 +57,10 @@ fi dnl Build Options AC_ARG_ENABLE(static, - [AS_HELP_STRING([--enable-static], + [AS_HELP_STRING([--enable-static-wx], [link wx statically [default=no]])], - static_preference="--static=$enableval", - static_preference="") + static_wx_preference="--static=$enableval", + static_wx_preference="") AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], @@ -135,7 +135,7 @@ else fi dnl more things we always pass to wx-config -wxconfigargs="$static_preference $unicode_preference $wxconfigargs $wx_preference" +wxconfigargs="$static_wx_preference $unicode_preference $wxconfigargs $wx_preference" wx_version=`${WX_CONFIG} $wxconfigargs --version`