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

No changes, just simplifications to configure code.

Browse Source 
Implicitly use SEARCH_LIB in WX_PATH_FIND_LIBRARIES() and WX_FIND_LIB() macros
to avoid having to pass it to them explicitly every time.

Closes #13601.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2011-10-27 22:48:50 +00:00
parent 776f4b8df8
commit 76ff3d06f5
3 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
acinclude.m4
View File

@ -43,16 +43,17 @@ for ac_dir in $1 /usr/include
])
dnl ---------------------------------------------------------------------------
dnl call WX_PATH_FIND_LIBRARIES(search path, lib name), sets ac_find_libraries
dnl to the full name of the file that was found or leaves it empty if not found
dnl call WX_PATH_FIND_LIBRARIES(lib name, [optional extra search paths])
dnl sets ac_find_libraries to the full name of the file that was found
dnl or leaves it empty if not found
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_LIBRARIES],
[
ac_find_libraries=
for ac_dir in $1
for ac_dir in $2 $SEARCH_LIB
do
for ac_extension in a so sl dylib dll.a; do
if test -f "$ac_dir/lib$2.$ac_extension"; then
if test -f "$ac_dir/lib$1.$ac_extension"; then
ac_find_libraries=$ac_dir
break 2
fi
@ -116,7 +117,7 @@ AC_DEFUN([WX_LINK_PATH_EXIST],
])
dnl ---------------------------------------------------------------------------
dnl Usage: WX_FIND_LIB(search-path, lib-name, [lib-function to test])
dnl Usage: WX_FIND_LIB(lib-name, [lib-function to test], [extra search paths])
dnl
dnl Tests in a variety of ways for the presence of lib-name
dnl
@ -129,23 +130,23 @@ AC_DEFUN([WX_FIND_LIB],
ac_find_libraries=
dnl Try with pkg-config first. It requires its lib-name parameter lowercase
fl_pkgname=`echo "$2" | tr [[:upper:]] [[:lower:]]`
fl_pkgname=`echo "$1" | tr [[:upper:]] [[:lower:]]`
dnl suppress PKG_PROG_PKG_CONFIG output; we don't want to keep seeing it
PKG_PROG_PKG_CONFIG() AS_MESSAGE_FD> /dev/null
PKG_CHECK_MODULES([$2], [$fl_pkgname],
PKG_CHECK_MODULES([$1], [$fl_pkgname],
[
dnl Start by assuming there are no novel lib paths
ac_find_libraries="std"
dnl A simple copy of the internal vars $2_CFLAGS $2_LIBS doesn't work
dnl A simple copy of the internal vars $1_CFLAGS $1_LIBS doesn't work
dnl inside the macro
dnl
dnl TODO: When we stop being autoconf 2.61 compatible, the next 2 lines
dnl should become:
dnl AS_VAR_COPY([ac_find_cflags], [$2_CFLAGS])
dnl AS_VAR_COPY([fl_libs], [$2_LIBS])
eval ac_find_cflags=\$$2_CFLAGS
eval fl_libs=\$$2_LIBS
dnl AS_VAR_COPY([ac_find_cflags], [$1_CFLAGS])
dnl AS_VAR_COPY([fl_libs], [$1_LIBS])
eval ac_find_cflags=\$$1_CFLAGS
eval fl_libs=\$$1_LIBS
dnl fl_libs may now contain -Lfoopath -lfoo (only non-standard paths are
dnl added) We only want the path bit, not the lib names
@ -161,8 +162,8 @@ AC_DEFUN([WX_FIND_LIB],
[
if test "x$ac_find_libraries" = "x"; then
dnl Next with AC_CHECK_LIB, if a test function was provided
if test "x$3" != "x"; then
AC_CHECK_LIB([$2], [$3], [ac_find_libraries="std"])
if test "x$2" != "x"; then
AC_CHECK_LIB([$1], [$2], [ac_find_libraries="std"])
fi
fi
@ -170,7 +171,8 @@ AC_DEFUN([WX_FIND_LIB],
dnl Finally try the search path
dnl Output a message again, as AC_CHECK_LIB will just have said "no"
AC_MSG_CHECKING([elsewhere])
WX_PATH_FIND_LIBRARIES([$1],[$2])
dnl $3 will occasionally hold extra path(s) to search
WX_PATH_FIND_LIBRARIES([$1], [$3])
if test "x$ac_find_libraries" != "x"; then
AC_MSG_RESULT([yes])
else

12
configure vendored
View File

@ -36477,7 +36477,7 @@ fi
echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
ac_find_libraries=
for ac_dir in $SEARCH_LIB /opt/graphics/OpenGL/lib
for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB
do
for ac_extension in a so sl dylib dll.a; do
if test -f "$ac_dir/libGL.$ac_extension"; then
@ -36573,7 +36573,7 @@ fi
echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
ac_find_libraries=
for ac_dir in $SEARCH_LIB /opt/graphics/OpenGL/lib
for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB
do
for ac_extension in a so sl dylib dll.a; do
if test -f "$ac_dir/libGL.$ac_extension"; then
@ -36891,7 +36891,7 @@ fi
echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
ac_find_libraries=
for ac_dir in $SEARCH_LIB
for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB
do
for ac_extension in a so sl dylib dll.a; do
if test -f "$ac_dir/libGLU.$ac_extension"; then
@ -36987,7 +36987,7 @@ fi
echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
ac_find_libraries=
for ac_dir in $SEARCH_LIB
for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB
do
for ac_extension in a so sl dylib dll.a; do
if test -f "$ac_dir/libGLU.$ac_extension"; then
@ -37312,7 +37312,7 @@ fi
echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
ac_find_libraries=
for ac_dir in $SEARCH_LIB
for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB
do
for ac_extension in a so sl dylib dll.a; do
if test -f "$ac_dir/libMesaGL.$ac_extension"; then
@ -37408,7 +37408,7 @@ fi
echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; }
ac_find_libraries=
for ac_dir in $SEARCH_LIB
for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB
do
for ac_extension in a so sl dylib dll.a; do
if test -f "$ac_dir/libMesaGL.$ac_extension"; then

24
configure.in
View File

@ -2366,7 +2366,7 @@ if test "$build" != "$host" -a "$GCC" = yes; then
x_includes=$ac_find_includes
fi
if test -z "$x_libraries" -o "$x_libraries" = NONE; then
WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xt)
WX_PATH_FIND_LIBRARIES(Xt)
x_libraries=$ac_find_libraries
fi
fi
@ -3146,7 +3146,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
dnl test for external libxpm if we're configured to use it
if test "$wxUSE_GPE" = "yes"; then
AC_MSG_CHECKING(for gpewidget library)
WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpewidget)
WX_PATH_FIND_LIBRARIES(gpewidget)
if test "$ac_find_libraries" != "" ; then
WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
dnl -lgpewidget must be before all GTK libs and
@ -3159,7 +3159,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
fi
dnl AC_MSG_CHECKING(for gpe library)
dnl WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpe)
dnl WX_PATH_FIND_LIBRARIES(gpe)
dnl if test "$ac_find_libraries" != "" ; then
dnl WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
dnl GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lgpe"
@ -3405,7 +3405,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
AC_MSG_CHECKING(for Motif/Lesstif library)
WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xm)
WX_PATH_FIND_LIBRARIES(Xm)
if test "x$ac_find_libraries" != "x" ; then
AC_MSG_RESULT(found in $ac_find_libraries)
@ -3544,7 +3544,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
dnl test for external libxpm if we're configured to use it
if test "$wxUSE_LIBXPM" = "sys"; then
AC_MSG_CHECKING(for Xpm library)
WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
WX_PATH_FIND_LIBRARIES(Xpm)
if test "$ac_find_libraries" != "" ; then
WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
@ -3772,7 +3772,7 @@ USE_XINERAMA=0
if test "$wxUSE_DISPLAY" = "yes"; then
dnl Xinerama is used for wxGTK1/wxX11/wxMotif only
if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK1" = 1; then
WX_FIND_LIB([$SEARCH_LIB], Xinerama, XineramaQueryScreens)
WX_FIND_LIB(Xinerama, XineramaQueryScreens)
if test "$ac_find_libraries" != "" ; then
if test "$ac_find_libraries" != "std" ; then
WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
@ -3795,7 +3795,7 @@ fi
if test "$wxUSE_DISPLAY" = "yes"; then
dnl wxGTK2 needs Xxf86vm as well as Xinerama-using ports from above
if test "$USE_XINERAMA" = 1 -o "$wxUSE_GTK" = 1; then
WX_FIND_LIB([$SEARCH_LIB], Xxf86vm, XF86VidModeQueryExtension)
WX_FIND_LIB(Xxf86vm, XF86VidModeQueryExtension)
if test "$ac_find_libraries" != "" ; then
AC_CHECK_HEADERS([X11/extensions/xf86vmode.h],
[
@ -3816,7 +3816,7 @@ dnl X11 session management
dnl ---------------------------------------------------------------------------
if test "$wxUSE_DETECT_SM" = "yes"; then
if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1; then
WX_FIND_LIB([$SEARCH_LIB], SM, SmcOpenConnection)
WX_FIND_LIB(SM, SmcOpenConnection)
if test "$ac_find_libraries" != "" ; then
if test "$ac_find_libraries" != "std" ; then
WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
@ -3866,7 +3866,7 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
AC_CHECK_HEADER(GL/glu.h, [
found_gl=0
WX_FIND_LIB([$SEARCH_LIB /opt/graphics/OpenGL/lib], GL, glBegin)
WX_FIND_LIB(GL, glBegin, [/opt/graphics/OpenGL/lib])
if test "$ac_find_libraries" != "" ; then
if test "$ac_find_libraries" != "std" ; then
WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
@ -3878,7 +3878,7 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
dnl don't suppose that libGL and libGLU are always in the
dnl same directory -- this is not true for some common
dnl distributions
WX_FIND_LIB([$SEARCH_LIB], GLU, gluBeginCurve)
WX_FIND_LIB(GLU, gluBeginCurve, [/opt/graphics/OpenGL/lib])
if test "$ac_find_libraries" != "" ; then
if test "$ac_find_libraries" != "std" ; then
WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
@ -3894,7 +3894,7 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
fi
if test "$found_gl" != 1; then
WX_FIND_LIB([$SEARCH_LIB], MesaGL, glEnable)
WX_FIND_LIB(MesaGL, glEnable, [/opt/graphics/OpenGL/lib])
if test "$ac_find_libraries" != "" ; then
if test "$ac_find_libraries" != "std" ; then
WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
@ -7397,7 +7397,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
if test "$wxUSE_WEBVIEW_WEBKIT" = "yes"; then
if test "$wxUSE_GTK" = 1; then
AC_MSG_CHECKING([for webkitgtk libraries])
WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],webkitgtk-1.0)
WX_PATH_FIND_LIBRARIES(webkitgtk-1.0)
if test "$ac_find_libraries" != "" ; then
WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
if test "$ac_path_to_link" != " -L/usr/lib" ; then