AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

s/wxWindows/wxWidgets/g

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2005-06-01 16:53:40 +00:00
parent 5e711f771a
commit 128c8706a0
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
wxwin.m4
View File

@ -1,5 +1,5 @@
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl Macros for wxWindows detection. Typically used in configure.in as: dnl Macros for wxWidgets 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(...)
@ -10,13 +10,13 @@ dnl ...
dnl AM_PATH_WXCONFIG(2.6.0, wxWin=1) dnl AM_PATH_WXCONFIG(2.6.0, 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 wxWidgets 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 wxWidgets 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 wxWidgets version is 2.3.4 or above.
dnl ]) dnl ])
dnl fi dnl fi
dnl CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" dnl CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
@ -36,18 +36,18 @@ dnl ---------------------------------------------------------------------------
AC_DEFUN([AM_OPTIONS_WXCONFIG], AC_DEFUN([AM_OPTIONS_WXCONFIG],
[ [
AC_ARG_WITH(wxdir, AC_ARG_WITH(wxdir,
[ --with-wxdir=PATH Use uninstalled version of wxWindows in PATH], [ --with-wxdir=PATH Use uninstalled version of wxWidgets in PATH],
[ wx_config_name="$withval/wx-config" [ wx_config_name="$withval/wx-config"
wx_config_args="--inplace"]) wx_config_args="--inplace"])
AC_ARG_WITH(wx-config, AC_ARG_WITH(wx-config,
[ --with-wx-config=CONFIG wx-config script to use (optional)], [ --with-wx-config=CONFIG wx-config script to use (optional)],
wx_config_name="$withval" ) wx_config_name="$withval" )
AC_ARG_WITH(wx-prefix, AC_ARG_WITH(wx-prefix,
[ --with-wx-prefix=PREFIX Prefix where wxWindows is installed (optional)], [ --with-wx-prefix=PREFIX Prefix where wxWidgets is installed (optional)],
wx_config_prefix="$withval", wx_config_prefix="") wx_config_prefix="$withval", wx_config_prefix="")
AC_ARG_WITH(wx-exec-prefix, AC_ARG_WITH(wx-exec-prefix,
[ --with-wx-exec-prefix=PREFIX [ --with-wx-exec-prefix=PREFIX
Exec prefix where wxWindows is installed (optional)], Exec prefix where wxWidgets is installed (optional)],
wx_config_exec_prefix="$withval", wx_config_exec_prefix="") wx_config_exec_prefix="$withval", wx_config_exec_prefix="")
]) ])
@ -55,16 +55,16 @@ dnl ---------------------------------------------------------------------------
dnl AM_PATH_WXCONFIG(VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND dnl AM_PATH_WXCONFIG(VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
dnl [, WX-LIBS [, ADDITIONAL-WX-CONFIG-FLAGS]]]]) dnl [, WX-LIBS [, ADDITIONAL-WX-CONFIG-FLAGS]]]])
dnl dnl
dnl Test for wxWindows, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC dnl Test for wxWidgets, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC
dnl (the latter is for static linking against wxWindows). Set WX_CONFIG_NAME dnl (the latter is for static linking against wxWidgets). Set WX_CONFIG_NAME
dnl environment variable to override the default name of the wx-config script dnl environment variable to override the default name of the wx-config script
dnl to use. Set WX_CONFIG_PATH to specify the full path to wx-config - in this dnl to use. Set WX_CONFIG_PATH to specify the full path to wx-config - in this
dnl case the macro won't even waste time on tests for its existence. dnl case the macro won't even waste time on tests for its existence.
dnl dnl
dnl Optional WX-LIBS argument contains comma- or space-separated list of dnl Optional WX-LIBS argument contains comma- or space-separated list of
dnl wxWindows libraries to link against (it may include contrib libraries). If dnl wxWidgets libraries to link against (it may include contrib libraries). If
dnl it is not specified then WX_LIBS and WX_LIBS_STATIC will contain flags to dnl it is not specified then WX_LIBS and WX_LIBS_STATIC will contain flags to
dnl link with all of the core wxWindows libraries. dnl link with all of the core wxWidgets libraries.
dnl dnl
dnl Optional ADDITIONAL-WX-CONFIG-FLAGS argument is appended to wx-config dnl Optional ADDITIONAL-WX-CONFIG-FLAGS argument is appended to wx-config
dnl invocation command in present. It can be used to fine-tune lookup of dnl invocation command in present. It can be used to fine-tune lookup of
@ -116,9 +116,9 @@ AC_DEFUN([AM_PATH_WXCONFIG],
min_wx_version=ifelse([$1], ,2.2.1,$1) min_wx_version=ifelse([$1], ,2.2.1,$1)
if test -z "$5" ; then if test -z "$5" ; then
AC_MSG_CHECKING([for wxWindows version >= $min_wx_version]) AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version])
else else
AC_MSG_CHECKING([for wxWindows version >= $min_wx_version ($5)]) AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version ($5)])
fi fi
WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5 $4" WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5 $4"
@ -166,7 +166,7 @@ AC_DEFUN([AM_PATH_WXCONFIG],
dnl and WX_CONFIG_WITH_ARGS is likely to contain it if that is dnl and WX_CONFIG_WITH_ARGS is likely to contain it if that is
dnl what the user actually wants, making this redundant at best. dnl what the user actually wants, making this redundant at best.
dnl For now keep it in case anyone actually used it in the past. dnl For now keep it in case anyone actually used it in the past.
AC_MSG_CHECKING([for wxWindows static library]) AC_MSG_CHECKING([for wxWidgets static library])
WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null` WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
if test "x$WX_LIBS_STATIC" = "x"; then if test "x$WX_LIBS_STATIC" = "x"; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)