Update RDA's configury

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Update RDA's configury

Kevin Buettner
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  <[hidden email]>

        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])