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

Update the wxAutohacks libs.m4 with some of the changes from newer autoconf (this will make generated configure at least match what is currently in the tree).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@48110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2007-08-15 17:08:08 +00:00
parent 5f9f0b0dee
commit 65b26bd6b5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
build/autoconf_prepend-include/autoconf/libs.m4
View File

@@ -261,11 +261,11 @@ ac_x_header_dirs='
if test "$ac_x_includes" = no; then if test "$ac_x_includes" = no; then
# Guess where to find include files, by looking for a specified header file. # Guess where to find include files, by looking for a specified header file.
# First, try using that file with no special directory specified. # First, try using that file with no special directory specified.
AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Intrinsic.h>])], AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Xlib.h>])],
[# We can compile using X headers with no special include directory. [# We can compile using X headers with no special include directory.
ac_x_includes=], ac_x_includes=],
[for ac_dir in $ac_x_header_dirs; do [for ac_dir in $ac_x_header_dirs; do
if test -r "$ac_dir/X11/Intrinsic.h"; then if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir ac_x_includes=$ac_dir
break break
fi fi
@@ -277,9 +277,9 @@ if test "$ac_x_libraries" = no; then
# See if we find them without any special options. # See if we find them without any special options.
# Don't add to $LIBS permanently. # Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS ac_save_LIBS=$LIBS
LIBS="-lXt $LIBS" LIBS="-lX11 $LIBS"
AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Intrinsic.h>], AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>],
[XtMalloc (0)])], [XrmInitialize ()])],
[LIBS=$ac_save_LIBS [LIBS=$ac_save_LIBS
# We can link X programs with no special library path. # We can link X programs with no special library path.
ac_x_libraries=], ac_x_libraries=],
@@ -288,7 +288,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
do do
# Don't even attempt the hair of trying to link an X program! # Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do for ac_extension in a so sl; do
if test -r $ac_dir/libXt.$ac_extension; then if test -r $ac_dir/libX11.$ac_extension; then
ac_x_libraries=$ac_dir ac_x_libraries=$ac_dir
break 2 break 2
fi fi