1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-02 17:09:26 +02:00

Rename --enable-static to --enable-static-wx.

--enable-static is too generic and also used by libtool.
This commit is contained in:
benjamin.drung@gmail.com 2013-11-05 22:28:42 +00:00
parent b7ced85206
commit 639c93c145
3 changed files with 12 additions and 12 deletions

View File

@ -153,10 +153,10 @@ fi
##################### #####################
AC_ARG_ENABLE(static, AC_ARG_ENABLE(static,
[AS_HELP_STRING([--enable-static], [AS_HELP_STRING([--enable-static-wx],
[link wx statically [default=no]])], [link wx statically [default=no]])],
static_preference="--static=$enableval", static_wx_preference="--static=$enableval",
static_preference="") static_wx_preference="")
AC_ARG_ENABLE(unicode, AC_ARG_ENABLE(unicode,
[AS_HELP_STRING([--enable-unicode], [AS_HELP_STRING([--enable-unicode],
@ -288,7 +288,7 @@ else
fi fi
dnl more things we always pass to wx-config 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` wx_version=`${WX_CONFIG} $wxconfigargs --version`
AC_MSG_NOTICE([Checking that the chosen version of wxWidgets is 2.8.x]) AC_MSG_NOTICE([Checking that the chosen version of wxWidgets is 2.8.x])

View File

@ -27,10 +27,10 @@ AC_HEADER_STDC
# Check for debug # Check for debug
# #
AC_ARG_ENABLE(static, AC_ARG_ENABLE(static,
[AC_HELP_STRING([--enable-static], [AC_HELP_STRING([--enable-static-wx],
[link wx statically (default=no)])], [link wx statically (default=no)])],
static_preference="--static=$enableval", static_wx_preference="--static=$enableval",
static_preference="") static_wx_preference="")
AC_ARG_ENABLE(unicode, AC_ARG_ENABLE(unicode,
@ -65,7 +65,7 @@ fi
dnl Gather wx arguments 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 dnl OS-specific configuration

View File

@ -57,10 +57,10 @@ fi
dnl Build Options dnl Build Options
AC_ARG_ENABLE(static, AC_ARG_ENABLE(static,
[AS_HELP_STRING([--enable-static], [AS_HELP_STRING([--enable-static-wx],
[link wx statically [default=no]])], [link wx statically [default=no]])],
static_preference="--static=$enableval", static_wx_preference="--static=$enableval",
static_preference="") static_wx_preference="")
AC_ARG_ENABLE(unicode, AC_ARG_ENABLE(unicode,
[AS_HELP_STRING([--enable-unicode], [AS_HELP_STRING([--enable-unicode],
@ -135,7 +135,7 @@ else
fi fi
dnl more things we always pass to wx-config 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` wx_version=`${WX_CONFIG} $wxconfigargs --version`