bug-autoconf
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: AC_PATH_X checks for Xt, not for X itself


From: Paul Eggert
Subject: Re: AC_PATH_X checks for Xt, not for X itself
Date: Sun, 18 Sep 2005 10:10:46 -0700
User-agent: Gnus/5.1007 (Gnus v5.10.7) Emacs/21.4 (gnu/linux)

Thanks for reporting that bug.  I installed this fix:

2005-09-18  Paul Eggert  <address@hidden>

        * lib/autoconf/libs.m4 (_AC_PATH_X_DIRECT): Look for X11/Xlib.h
        and XrmInitialize rather than X11/Intrinsic.h and XtMalloc
        (which belong to Xt, not X itself).  See Debian bug 327655.
        * NEWS: Mention this.

Index: NEWS
===================================================================
RCS file: /cvsroot/autoconf/autoconf/NEWS,v
retrieving revision 1.346
diff -p -u -r1.346 NEWS
--- NEWS        23 Aug 2005 08:50:55 -0000      1.346
+++ NEWS        18 Sep 2005 17:09:58 -0000
@@ -35,6 +35,10 @@
 ** AC_C_TYPEOF
   New macro to check for support of 'typeof' syntax a la GNU C.
 
+** AC_PATH_X
+  Now checks for X11/Xlib.h and XrmInitialize (X proper) rather than
+  X11/Intrinsic.h and XtMalloc (Xt).
+
 ** AC_PROG_CC_C89, AC_PROG_CC_C99
   New macros for ISO C99 support.  AC_PROG_CC_C89 and AC_PROG_CC_C99
   check for ANSI C89 and ISO C99 support respectively.
Index: lib/autoconf/libs.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/libs.m4,v
retrieving revision 1.13
diff -p -u -r1.13 libs.m4
--- lib/autoconf/libs.m4        6 Sep 2005 15:34:06 -0000       1.13
+++ lib/autoconf/libs.m4        18 Sep 2005 17:09:58 -0000
@@ -1,7 +1,7 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Checking for libraries.
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -265,13 +265,13 @@ ac_x_header_dirs='
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Intrinsic.h.
+  # Guess where to find include files, by looking for Xlib.h.
   # First, try using that file with no special directory specified.
-  AC_PREPROC_IFELSE([AC_LANG_SOURCE(address@hidden:@include 
<X11/Intrinsic.h>])],
+  AC_PREPROC_IFELSE([AC_LANG_SOURCE(address@hidden:@include <X11/Xlib.h>])],
 [# 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
@@ -284,8 +284,8 @@ if test "$ac_x_libraries" = no; then
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
-  AC_LINK_IFELSE([AC_LANG_PROGRAM(address@hidden:@include <X11/Intrinsic.h>],
-                                 [XtMalloc (0)])],
+  AC_LINK_IFELSE([AC_LANG_PROGRAM(address@hidden:@include <X11/Xlib.h>],
+                                 [XrmInitialize (0)])],
                 [LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=],




reply via email to

[Prev in Thread] Current Thread [Next in Thread]