autoconf-x.patch

   1 --- autoconf-2.59/lib/autoconf/libs.m4.orig     2003-05-22 14:05:13.000000000 +0200
   2 +++ autoconf-2.59/lib/autoconf/libs.m4  2006-02-18 16:45:40.815890250 +0100
   3 @@ -180,7 +180,8 @@
   4  # Internal subroutine of _AC_PATH_X.
   5  # Set ac_x_includes and/or ac_x_libraries.
   6  m4_define([_AC_PATH_X_XMKMF],
   7 -[rm -fr conftest.dir
   8 +[AC_ARG_VAR(XMKMF, [Path to xmkmf, Makefile generator for X Window System])dnl
   9 +rm -f -r conftest.dir
  10  if mkdir conftest.dir; then
  11    cd conftest.dir
  12    # Make sure to not put "make" in the Imakefile rules, since we grep it out.
  13 @@ -188,7 +189,7 @@
  14  acfindx:
  15         @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
  16  _ACEOF
  17 -  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
  18 +  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
  19      # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  20      eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
  21      # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
  22 @@ -202,7 +203,7 @@
  23      # bogus both because they are the default anyway, and because
  24      # using them would break gcc on systems where it needs fixed includes.
  25      case $ac_im_incroot in
  26 -       /usr/include) ;;
  27 +       /usr/include) ac_x_includes= ;;
  28         *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
  29      esac
  30      case $ac_im_usrlibdir in
  31 @@ -259,13 +260,13 @@
  32  /usr/openwin/share/include'
  33
  34  if test "$ac_x_includes" = no; then
  35 -  # Guess where to find include files, by looking for Intrinsic.h.
  36 +  # Guess where to find include files, by looking for Xlib.h.
  37    # First, try using that file with no special directory specified.
  38 -  AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Intrinsic.h>])],
  39 +  AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Xlib.h>])],
  40  [# We can compile using X headers with no special include directory.
  41  ac_x_includes=],
  42  [for ac_dir in $ac_x_header_dirs; do
  43 -  if test -r "$ac_dir/X11/Intrinsic.h"; then
  44 +  if test -r "$ac_dir/X11/Xlib.h"; then
  45      ac_x_includes=$ac_dir
  46      break
  47    fi
  48 @@ -277,9 +278,9 @@
  49    # See if we find them without any special options.
  50    # Don't add to $LIBS permanently.
  51    ac_save_LIBS=$LIBS
  52 -  LIBS="-lXt $LIBS"
  53 -  AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Intrinsic.h>],
  54 -                                 [XtMalloc (0)])],
  55 +  LIBS="-lX11 $LIBS"
  56 +  AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>],
  57 +                                 [XrmInitialize ()])],
  58                  [LIBS=$ac_save_LIBS
  59  # We can link X programs with no special library path.
  60  ac_x_libraries=],
  61 @@ -288,7 +289,7 @@
  62  do
  63    # Don't even attempt the hair of trying to link an X program!
  64    for ac_extension in a so sl; do
  65 -    if test -r $ac_dir/libXt.$ac_extension; then
  66 +    if test -r $ac_dir/libX11.$ac_extension; then
  67        ac_x_libraries=$ac_dir
  68        break 2
  69      fi