[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freedesktop-xorg
Subject:    Re: libX11 & autoconf 2.59
From:       Matthias Hopf <mhopf () suse ! de>
Date:       2006-07-04 9:31:43
Message-ID: 20060704093143.GA624 () suse ! de
[Download RAW message or body]

On Jul 04, 06 12:25:05 +0900, Peter O'Gorman wrote:
> On Mon, 2006-07-03 at 15:12 -0700, James Blanford wrote:
> > On  3 Jul, Matthias Hopf wrote:
> > > I have autoconf 2.59 installed here, but appearantly the change by
> > > Keith in 644f4828b15bce42b597eb123ba0bbc372c46c03 was
> > > contra-productive for me. $datarootdir is not defined anywhere, and
> > > 'make install' barks, of course.
> > > 
> > > Maybe this depends on the automake version, as my Makefile.ins don't
> > > have datarootdir defined anywhere. I have version 1.9.6.
> > > 
> > > Anybody seeing similar issues?
> 
> datarootdir is substituted by autoconf-2.60.

Is this patch fine as a first aid? If nobody objects, I'll commit later today.
It should work with 2.60, and it does with 2.59.

CU all

Matthias

-- 
Matthias Hopf <mhopf@suse.de>       __        __   __
Maxfeldstr. 5 / 90409 Nuernberg    (_   | |  (_   |__         mat@mshopf.de
Phone +49-911-74053-715            __)  |_|  __)  |__  labs   www.mshopf.de

["blub.diff" (text/x-patch)]

diff --git a/configure.ac b/configure.ac
index a7a642d..5ef8a38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -321,7 +321,8 @@ if test "x$GCC" = "xyes"; then
 	X11_CFLAGS="$GCC_WARNINGS $X11_CFLAGS"
 fi
 
-X11_DATADIR="${datarootdir}/X11"
+X11_DATADIR="${datadir}/X11"
+test "x${datarootdir}" = x || X11_DATADIR="${datarootdir}/X11"
 AC_DEFINE_DIR(X11_DATADIR, X11_DATADIR, [Location of libX11 data])
 AC_SUBST(X11_DATADIR)
 


[prev in list] [next in list] [prev in thread] [next in thread]