Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added --with-wxdir=DIR option

Browse Source 
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
1 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
wxwin.m4
View File

@@ -1,46 +1,54 @@
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl Macros for wxWindows detection. Typically used in configure.in as: dnl Macros for wxWindows detection. Typically used in configure.in as:
dnl dnl
dnl AC_ARG_ENABLE(...) dnl AC_ARG_ENABLE(...)
dnl AC_ARG_WITH(...) dnl AC_ARG_WITH(...)
dnl ... dnl ...
dnl AM_OPTIONS_WXCONFIG dnl AM_OPTIONS_WXCONFIG
dnl ... dnl ...
dnl ... dnl ...
dnl AM_PATH_WXCONFIG(2.3.4, wxWin=1) dnl AM_PATH_WXCONFIG(2.3.4, wxWin=1)
dnl if test "$wxWin" != 1; then dnl if test "$wxWin" != 1; then
dnl AC_MSG_ERROR([ dnl AC_MSG_ERROR([
dnl wxWindows must be installed on your system dnl wxWindows must be installed on your system
dnl but wx-config script couldn't be found. dnl but wx-config script couldn't be found.
dnl dnl
dnl Please check that wx-config is in path, the directory dnl Please check that wx-config is in path, the directory
dnl where wxWindows libraries are installed (returned by dnl where wxWindows libraries are installed (returned by
dnl 'wx-config --libs' command) is in LD_LIBRARY_PATH or dnl 'wx-config --libs' command) is in LD_LIBRARY_PATH or
dnl equivalent variable and wxWindows version is 2.3.4 or above. dnl equivalent variable and wxWindows version is 2.3.4 or above.
dnl ]) dnl ])
dnl fi dnl fi
dnl CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" dnl CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
dnl CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY" dnl CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
dnl dnl
dnl LDFLAGS="$LDFLAGS $WX_LIBS" dnl LDFLAGS="$LDFLAGS $WX_LIBS"
dnl --------------------------------------------------------------------------- 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,
wx_config_prefix="$withval", wx_config_prefix="") [ --with-wxdir=PATH Use uninstalled version of wxWindows in PATH],
AC_ARG_WITH(wx-exec-prefix,[ --with-wx-exec-prefix=PREFIX Exec prefix where wxWindows is installed (optional)], [ wx_config_name="$withval/wx-config"
wx_config_exec_prefix="$withval", wx_config_exec_prefix="") wx_config_args="--inplace"])
AC_ARG_WITH(wx-config,[ --with-wx-config=CONFIG wx-config script to use (optional)], AC_ARG_WITH(wx-config,
wx_config_name="$withval", wx_config_name="") [ --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="")
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="")
]) ])
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
@@ -174,10 +183,10 @@ AC_DEFUN(AM_PATH_WXCONFIG,
ifelse([$2], , :, [$2]) ifelse([$2], , :, [$2])
else else
if test "x$WX_VERSION" = x; then if test "x$WX_VERSION" = x; then
dnl no wx-config at all dnl no wx-config at all
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
else else
AC_MSG_RESULT(no (version $WX_VERSION is not new enough)) AC_MSG_RESULT(no (version $WX_VERSION is not new enough))
fi fi
WX_CFLAGS="" WX_CFLAGS=""