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

[E-devel] [Fwd: Re: building with automake-1.10] Patch proposal



I based on Kim post made a few change to be able to use automake-1.10 on
some autogen.sh. I haven't touch all the modules and look forward
solving warning : I only added two line maybe I hadded too much but
couldn't be sure of what to clean out to not force autopoint. I also had
to touch one configure.in : imlib2 configure.in add a missing entry to
make automake-1.10 happy. Need to be test against automake-1.9.

Pleased to help,
Marc-André

By the way keep on the good work!

-------- Original Message --------
From: - Thu Oct 19 20:40:41 2006
...
Sender: enlightenment-devel-bounces@lists.sourceforge.net

> ...

Not sure but I think there was a similar problem in e16 ages ago. IIRC
it was solved by changing the order of things in autogen.sh to

autopoint ...
aclocal ...
autoconf ...
autoheader ...
libtoolize ...
automake ...

/Kim

? automake-1.10.patch
Index: apps/e/autogen.sh
===================================================================
RCS file: /var/cvs/e/e17/apps/e/autogen.sh,v
retrieving revision 1.16
diff -u -r1.16 autogen.sh
--- apps/e/autogen.sh	31 May 2006 22:51:24 -0000	1.16
+++ apps/e/autogen.sh	24 Oct 2006 03:54:42 -0000
@@ -1,10 +1,12 @@
 #!/bin/sh
 
+rm -f ABOUT-NLS config.rpath m4 po/Makefile.in.in po/Makevars.template po/Rules-quot po/boldquot.sed po/en@boldquot.header po/en@quot.header po/insert-header.sin po/quot.sed po/remove-potcdate.sin
 rm -rf autom4te.cache
 rm -f aclocal.m4 ltmain.sh
 
 touch README
 
+echo "Running autopoint..."; autopoint || exit 1
 echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
 echo "Running autoheader..." ; autoheader || exit 1
 echo "Running autoconf..." ; autoconf || exit 1
Index: libs/imlib2/configure.in
===================================================================
RCS file: /var/cvs/e/e17/libs/imlib2/configure.in,v
retrieving revision 1.132
diff -u -r1.132 configure.in
--- libs/imlib2/configure.in	30 Sep 2006 08:15:32 -0000	1.132
+++ libs/imlib2/configure.in	24 Oct 2006 03:54:42 -0000
@@ -11,6 +11,7 @@
 AC_C_BIGENDIAN
 AC_PROG_CC
 
+AM_PROG_AS
 
 case $host_os in
 solaris*)
Index: proto/ephoto/autogen.sh
===================================================================
RCS file: /var/cvs/e/e17/proto/ephoto/autogen.sh,v
retrieving revision 1.3
diff -u -r1.3 autogen.sh
--- proto/ephoto/autogen.sh	16 Oct 2006 12:30:33 -0000	1.3
+++ proto/ephoto/autogen.sh	24 Oct 2006 03:54:42 -0000
@@ -1,10 +1,11 @@
 #!/bin/sh
-
+rm -f ABOUT-NLS config.rpath m4 po/Makefile.in.in po/Makevars.template po/Rules-quot po/boldquot.sed po/en@boldquot.header po/en@quot.header po/insert-header.sin po/quot.sed po/remove-potcdate.sin
 rm -rf autom4te.cache
 rm -f aclocal.m4 ltmain.sh
 
 touch README
 
+echo "Running autopoint..."; autopoint || exit 1
 echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
 echo "Running autoheader..." ; autoheader || exit 1
 echo "Running autoconf..." ; autoconf || exit 1
Index: proto/etk/autogen.sh
===================================================================
RCS file: /var/cvs/e/e17/proto/etk/autogen.sh,v
retrieving revision 1.4
diff -u -r1.4 autogen.sh
--- proto/etk/autogen.sh	27 Oct 2005 07:46:14 -0000	1.4
+++ proto/etk/autogen.sh	24 Oct 2006 03:54:42 -0000
@@ -1,8 +1,9 @@
 #!/bin/sh
-
+rm -f ABOUT-NLS config.rpath m4 po/Makefile.in.in po/Makevars.template po/Rules-quot po/boldquot.sed po/en@boldquot.header po/en@quot.header po/insert-header.sin po/quot.sed po/remove-potcdate.sin
 rm -rf autom4te.cache
 rm -f aclocal.m4 ltmain.sh
 
+echo "Running autopoint..."; autopoint || exit 1
 echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
 echo "Running autoheader..." ; autoheader || exit 1
 echo "Running autoconf..." ; autoconf || exit 1

Index: mem/autogen.sh
===================================================================
RCS file: /var/cvs/e/e_modules/mem/autogen.sh,v
retrieving revision 1.2
diff -u -r1.2 autogen.sh
--- mem/autogen.sh	9 Mar 2006 11:37:42 -0000	1.2
+++ mem/autogen.sh	24 Oct 2006 04:16:54 -0000
@@ -1,10 +1,11 @@
 #!/bin/sh
-
+rm -f ABOUT-NLS dist.rpath
 rm -rf autom4te.cache
 rm -f aclocal.m4 ltmain.sh
 
 touch README
 
+echo "Running autopoint..."; autopoint || exit 1
 echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1
 echo "Running autoheader..." ; autoheader || exit 1
 echo "Running autoconf..." ; autoconf || exit 1
Index: net/autogen.sh
===================================================================
RCS file: /var/cvs/e/e_modules/net/autogen.sh,v
retrieving revision 1.2
diff -u -r1.2 autogen.sh
--- net/autogen.sh	9 Mar 2006 11:39:09 -0000	1.2
+++ net/autogen.sh	24 Oct 2006 04:16:54 -0000
@@ -1,10 +1,12 @@
 #!/bin/sh
 
+rm -rf ABOUT-NLS config.rpath m4 po/Makefile.in.in po/Makevars.template po/Rules-quot po/boldquot.sed po/en@boldquot.header po/en@quot.header po/insert-header.sin po/quot.sed po/remove-potcdate.sin
 rm -rf autom4te.cache
 rm -f aclocal.m4 ltmain.sh
 
 touch README
 
+echo "Running autopoint..."; autopoint || exit 1
 echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1
 echo "Running autoheader..." ; autoheader || exit 1
 echo "Running autoconf..." ; autoconf || exit 1
Index: screenshot/autogen.sh
===================================================================
RCS file: /var/cvs/e/e_modules/screenshot/autogen.sh,v
retrieving revision 1.5
diff -u -r1.5 autogen.sh
--- screenshot/autogen.sh	1 Feb 2006 13:32:28 -0000	1.5
+++ screenshot/autogen.sh	24 Oct 2006 04:16:55 -0000
@@ -1,10 +1,12 @@
 #!/bin/sh
 
+rm -rf ABOUT-NLS config.rpath m4 po/Makefile.in.in po/Makevars.template po/Rules-quot po/boldquot.sed po/en@boldquot.header po/en@quot.header po/insert-header.sin po/quot.sed po/remove-potcdate.sin
 rm -rf autom4te.cache
 rm -f aclocal.m4 ltmain.sh
 
 touch README
 
+echo "Running autopoint..."; autopoint || exit 1
 echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1
 echo "Running autoheader..." ; autoheader || exit 1
 echo "Running autoconf..." ; autoconf || exit 1
Index: tclock/autogen.sh
===================================================================
RCS file: /var/cvs/e/e_modules/tclock/autogen.sh,v
retrieving revision 1.2
diff -u -r1.2 autogen.sh
--- tclock/autogen.sh	1 Apr 2006 19:35:59 -0000	1.2
+++ tclock/autogen.sh	24 Oct 2006 04:16:55 -0000
@@ -1,10 +1,12 @@
 #!/bin/sh
 
+rm -rf ABOUT-NLS config.rpath m4 po/Makefile.in.in po/Makevars.template po/Rules-quot po/boldquot.sed po/en@boldquot.header po/en@quot.header po/insert-header.sin po/quot.sed po/remove-potcdate.sin
 rm -rf autom4te.cache
 rm -f aclocal.m4 ltmain.sh
 
 touch README
 
+echo "Running autopoint..."; autopoint || exit 1
 echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1
 echo "Running autoheader..." ; autoheader || exit 1
 echo "Running autoconf..." ; autoconf || exit 1
Index: uptime/autogen.sh
===================================================================
RCS file: /var/cvs/e/e_modules/uptime/autogen.sh,v
retrieving revision 1.2
diff -u -r1.2 autogen.sh
--- uptime/autogen.sh	9 Mar 2006 11:40:41 -0000	1.2
+++ uptime/autogen.sh	24 Oct 2006 04:16:55 -0000
@@ -1,10 +1,12 @@
 #!/bin/sh
 
+rm -rf ABOUT-NLS config.rpath m4 po/Makefile.in.in po/Makevars.template po/Rules-quot po/boldquot.sed po/en@boldquot.header po/en@quot.header po/insert-header.sin po/quot.sed po/remove-potcdate.sin
 rm -rf autom4te.cache
 rm -f aclocal.m4 ltmain.sh
 
 touch README
 
+echo "Running autopoint..."; autopoint || exit 1
 echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1
 echo "Running autoheader..." ; autoheader || exit 1
 echo "Running autoconf..." ; autoconf || exit 1
Index: weather/autogen.sh
===================================================================
RCS file: /var/cvs/e/e_modules/weather/autogen.sh,v
retrieving revision 1.2
diff -u -r1.2 autogen.sh
--- weather/autogen.sh	19 Mar 2006 15:09:16 -0000	1.2
+++ weather/autogen.sh	24 Oct 2006 04:16:55 -0000
@@ -1,10 +1,12 @@
 #!/bin/sh
 
+rm -rf ABOUT-NLS config.rpath m4 po/Makefile.in.in po/Makevars.template po/Rules-quot po/boldquot.sed po/en@boldquot.header po/en@quot.header po/insert-header.sin po/quot.sed po/remove-potcdate.sin
 rm -rf autom4te.cache
 rm -f aclocal.m4 ltmain.sh
 
 touch README
 
+echo "Running autopoint..."; autopoint || exit 1
 echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1
 echo "Running autoheader..." ; autoheader || exit 1
 echo "Running autoconf..." ; autoconf || exit 1