rpms/autoconf/devel autoconf-2.59-intrinsic.patch, NONE, 1.1 autoconf.spec, 1.18, 1.19

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Feb 6 10:28:00 UTC 2006


Author: karsten

Update of /cvs/dist/rpms/autoconf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7745

Modified Files:
	autoconf.spec 
Added Files:
	autoconf-2.59-intrinsic.patch 
Log Message:
- check for Xlib.h instead of Intrinsic.h to find X11 headers
  (#176379)


autoconf-2.59-intrinsic.patch:
 libs.m4 |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE autoconf-2.59-intrinsic.patch ---
diff -urN autoconf-2.59/lib/autoconf/libs.m4 autoconf-2.59_new/lib/autoconf/libs.m4
--- autoconf-2.59/lib/autoconf/libs.m4	2003-05-22 14:05:13.000000000 +0200
+++ autoconf-2.59_new/lib/autoconf/libs.m4	2006-02-06 10:17:56.000000000 +0100
@@ -259,13 +259,13 @@
 /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([@%:@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.
 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
@@ -278,8 +278,8 @@
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Intrinsic.h>],
-				  [XtMalloc (0)])],
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>],
+				  [XrmInitialize (0)])],
 		 [LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=],


Index: autoconf.spec
===================================================================
RCS file: /cvs/dist/rpms/autoconf/devel/autoconf.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- autoconf.spec	9 Dec 2005 22:39:42 -0000	1.18
+++ autoconf.spec	6 Feb 2006 10:27:58 -0000	1.19
@@ -1,10 +1,11 @@
 Summary:	A GNU tool for automatically configuring source code.
 Name:		autoconf
 Version:	2.59
-Release: 5.1
+Release:    6
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.bz2
+Patch0:     autoconf-2.59-intrinsic.patch
 URL:		http://www.gnu.org/software/autoconf/
 BuildRequires:	sed, m4, emacs
 Prereq(post,preun):	/sbin/install-info
@@ -30,10 +31,13 @@
 
 %prep
 %setup -q -n autoconf-%{version}
+%patch0 -p1
 
 %build
 %configure
 make
+
+%check
 make check || make check VERBOSE=yes
 
 %install
@@ -65,6 +69,10 @@
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Mon Feb 06 2006 Karsten Hopp <karsten at redhat.de> 2.59-6
+- check for Xlib.h instead of Intrinsic.h to find X11 headers
+  (#176379)
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 




More information about the fedora-cvs-commits mailing list