From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32621 invoked by alias); 12 Nov 2009 05:10:44 -0000 Received: (qmail 32606 invoked by uid 22791); 12 Nov 2009 05:10:42 -0000 X-SWARE-Spam-Status: No, hits=1.7 required=5.0 tests=AWL,BAYES_00,HK_OBFDOM,KAM_MX3,SPF_HELO_PASS,SPF_PASS,URIBL_BLACK X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 12 Nov 2009 05:10:35 +0000 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAC5AX1K024725 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 12 Nov 2009 00:10:34 -0500 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nAC5AXFm020522 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO) for ; Thu, 12 Nov 2009 00:10:33 -0500 Date: Thu, 12 Nov 2009 05:10:00 -0000 From: Kevin Buettner To: rda@sources.redhat.com Subject: [commit] Update RDA's configury Message-ID: <20091111221032.23239fe7@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-IsSubscribed: yes Mailing-List: contact rda-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: rda-owner@sourceware.org X-SW-Source: 2009-q4/txt/msg00001.txt.bz2 I've just committed the patch below. I've omitted the patches for the regenerated files as those patches were rather large. 2009-11-11 Kevin Buettner Update configury: acinclude.m4: Include toplevel libtool related files. Don't include gettext-sister.m4. configure.in (ZW_GNU_GETTEXT_SISTER_DIR): Delete. aclocal.m4, configure, Makefile.in: Regenerate. samples/Makefile.am (INCLUDES): Rename to AM_CPPFLAGS. lib/Makefile.in, qe/Makefile.in, samples/Makefile.in: Regenerate. unix/acinclude.m4: Include toplevel libtool related files. unix/aclocal.m4, unix/configure, unix/Makefile.in: Regenerate. Index: acinclude.m4 =================================================================== RCS file: /cvs/src/src/rda/acinclude.m4,v retrieving revision 1.2 diff -u -p -r1.2 acinclude.m4 --- acinclude.m4 31 May 2006 15:14:39 -0000 1.2 +++ acinclude.m4 12 Nov 2009 04:54:51 -0000 @@ -1,10 +1,5 @@ -sinclude(../libtool.m4) -dnl The lines below arrange for aclocal not to bring libtool.m4 -dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake -dnl to add a definition of LIBTOOL to Makefile.in. -ifelse(yes,no,[ -AC_DEFUN([AM_PROG_LIBTOOL],) -AC_SUBST(LIBTOOL) -]) - -sinclude(../../gettext-sister.m4) +m4_include(../libtool.m4) +m4_include([../ltoptions.m4]) +m4_include([../ltsugar.m4]) +m4_include([../ltversion.m4]) +m4_include([../lt~obsolete.m4]) Index: configure.in =================================================================== RCS file: /cvs/src/src/rda/configure.in,v retrieving revision 1.3 diff -u -p -r1.3 configure.in --- configure.in 31 May 2006 15:14:39 -0000 1.3 +++ configure.in 12 Nov 2009 04:54:52 -0000 @@ -97,7 +97,5 @@ esac dnl $targ_subdirs is expanded at configure run time AC_SUBST(targ_subdirs) -ZW_GNU_GETTEXT_SISTER_DIR - dnl Outputs AC_OUTPUT(Makefile lib/Makefile samples/Makefile qe/Makefile) Index: samples/Makefile.am =================================================================== RCS file: /cvs/src/src/rda/samples/Makefile.am,v retrieving revision 1.2 diff -u -p -r1.2 Makefile.am --- samples/Makefile.am 31 May 2006 15:14:40 -0000 1.2 +++ samples/Makefile.am 12 Nov 2009 04:54:52 -0000 @@ -8,7 +8,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLA noinst_PROGRAMS = sample async poll thread -INCLUDES = -I$(srcdir) -I$(srcdir)/../include +AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/../include sample_SOURCES = main.c demo-target.c sample_DEPLIBS = ../lib/librda.la Index: unix/acinclude.m4 =================================================================== RCS file: /cvs/src/src/rda/unix/acinclude.m4,v retrieving revision 1.1 diff -u -p -r1.1 acinclude.m4 --- unix/acinclude.m4 27 Nov 2002 21:28:31 -0000 1.1 +++ unix/acinclude.m4 12 Nov 2009 04:54:52 -0000 @@ -1,10 +1,5 @@ -sinclude(../../libtool.m4) -dnl The lines below arrange for aclocal not to bring libtool.m4 -dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake -dnl to add a definition of LIBTOOL to Makefile.in. -ifelse(yes,no,[ -AC_DEFUN([AM_PROG_LIBTOOL],) -AC_DEFUN([AM_DISABLE_SHARED],) -AC_SUBST(LIBTOOL) -]) - +m4_include([../../libtool.m4]) +m4_include([../../ltoptions.m4]) +m4_include([../../ltsugar.m4]) +m4_include([../../ltversion.m4]) +m4_include([../../lt~obsolete.m4])