From 65b26bd6b535b0e5883c23453fc607d23922c2e1 Mon Sep 17 00:00:00 2001 From: David Elliott Date: Wed, 15 Aug 2007 17:08:08 +0000 Subject: [PATCH] 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). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@48110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/autoconf_prepend-include/autoconf/libs.m4 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build/autoconf_prepend-include/autoconf/libs.m4 b/build/autoconf_prepend-include/autoconf/libs.m4 index 9f2611f0a6..f8ad09305a 100644 --- a/build/autoconf_prepend-include/autoconf/libs.m4 +++ b/build/autoconf_prepend-include/autoconf/libs.m4 @@ -261,11 +261,11 @@ ac_x_header_dirs=' if test "$ac_x_includes" = no; then # Guess where to find include files, by looking for a specified header file. # First, try using that file with no special directory specified. - AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include ])], + AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include ])], [# We can compile using X headers with no special include directory. ac_x_includes=], [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 break fi @@ -277,9 +277,9 @@ if test "$ac_x_libraries" = no; then # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" - AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include ], - [XtMalloc (0)])], + LIBS="-lX11 $LIBS" + AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include ], + [XrmInitialize ()])], [LIBS=$ac_save_LIBS # We can link X programs with no special library path. 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 # Don't even attempt the hair of trying to link an X program! 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 break 2 fi