added --with-wxdir=DIR option

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-01-19 12:04:07 +00:00
parent db8b7c5061
commit 5ff72dc423

View File

@@ -29,18 +29,26 @@ dnl ---------------------------------------------------------------------------
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl AM_OPTIONS_WXCONFIG dnl AM_OPTIONS_WXCONFIG
dnl dnl
dnl adds support for --wx-prefix, --wx-exec-prefix and --wx-config dnl adds support for --wx-prefix, --wx-exec-prefix, --with-wxdir and
dnl command line options dnl --wx-config command line options
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_DEFUN(AM_OPTIONS_WXCONFIG, AC_DEFUN(AM_OPTIONS_WXCONFIG,
[ [
AC_ARG_WITH(wx-prefix, [ --with-wx-prefix=PREFIX Prefix where wxWindows is installed (optional)], AC_ARG_WITH(wxdir,
[ --with-wxdir=PATH Use uninstalled version of wxWindows in PATH],
[ wx_config_name="$withval/wx-config"
wx_config_args="--inplace"])
AC_ARG_WITH(wx-config,
[ --with-wx-config=CONFIG wx-config script to use (optional)],
wx_config_name="$withval" )
AC_ARG_WITH(wx-prefix,
[ --with-wx-prefix=PREFIX Prefix where wxWindows is installed (optional)],
wx_config_prefix="$withval", wx_config_prefix="") wx_config_prefix="$withval", wx_config_prefix="")
AC_ARG_WITH(wx-exec-prefix,[ --with-wx-exec-prefix=PREFIX Exec prefix where wxWindows is installed (optional)], AC_ARG_WITH(wx-exec-prefix,
[ --with-wx-exec-prefix=PREFIX
Exec prefix where wxWindows is installed (optional)],
wx_config_exec_prefix="$withval", wx_config_exec_prefix="") wx_config_exec_prefix="$withval", wx_config_exec_prefix="")
AC_ARG_WITH(wx-config,[ --with-wx-config=CONFIG wx-config script to use (optional)],
wx_config_name="$withval", wx_config_name="")
]) ])
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
@@ -62,6 +70,7 @@ AC_DEFUN(AM_PATH_WXCONFIG,
if test x${WX_CONFIG_NAME+set} != xset ; then if test x${WX_CONFIG_NAME+set} != xset ; then
WX_CONFIG_NAME=wx-config WX_CONFIG_NAME=wx-config
fi fi
if test "x$wx_config_name" != x ; then if test "x$wx_config_name" != x ; then
WX_CONFIG_NAME="$wx_config_name" WX_CONFIG_NAME="$wx_config_name"
fi fi