Re: Re: Will CVS compile (shot 3) ?

This is a multi-part message in MIME format.
--------------050203040900090201030400
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

one day i will attach the right patch, i swear ;-)
---
Hi All,

	Devels, apply attached patch to current CVS, and don't forget to remove
the acconfig.h file from CVS, new auto* tool doesn't need it anymore.
This patch prevail of the first one i sent few minutes ago, it fix also
the bison version checking bug.

Cheers.
-- 
73's de Daniel, F1RMB.

                 -=- Daniel Caujolle-Bert -=- [email protected] -=-
                           -=- [email protected] (AMPR NET) -=-




--------------050203040900090201030400
Content-Type: text/plain;
 name="sinek-auto.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="sinek-auto.diff"

Index: autogen.sh
===================================================================
RCS file: /cvsroot/sinek/sinek/autogen.sh,v
retrieving revision 1.2
diff -u -r1.2 autogen.sh
--- autogen.sh	13 Feb 2002 18:34:54 -0000	1.2
+++ autogen.sh	21 Jan 2003 23:21:27 -0000
@@ -10,17 +10,6 @@
 test -z "$srcdir" && srcdir=.
 build_dir=`pwd`
 
-m4_files="xine.m4 gettext.m4 glibc21.m4 iconv.m4 lcmessage.m4 progtest.m4 codeset.m4 isc-posix.m4 guile.m4"
-if test -d m4; then
-    rm -f acinclude.m4
-    for m4f in $m4_files; do
-	cat m4/$m4f >> acinclude.m4
-    done
-else
-    echo "Directory 'm4' is missing."
-    exit 1
-fi
-
 DIE=0
 
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
@@ -57,9 +46,9 @@
 
 (
 	cd $srcdir
-	aclocal
+	aclocal -I m4
 	autoheader
-	automake --add-missing $am_opt
+	automake  --gnu --add-missing --copy $am_opt
 	autoconf
 ) || exit $?
 
Index: configure.in
===================================================================
RCS file: /cvsroot/sinek/sinek/configure.in,v
retrieving revision 1.22
diff -u -r1.22 configure.in
--- configure.in	3 Jan 2003 05:44:23 -0000	1.22
+++ configure.in	21 Jan 2003 23:21:28 -0000
@@ -43,13 +43,13 @@
 AM_PATH_XINE(1.0.0,, AC_MSG_ERROR(*** You should install xine-lib first ***))
 XINE_LOCALEDIR="`echo $xine_locale_dir|sed -e 's/\^'$escapedprefix/'\${prefix}'/`"
 AC_SUBST(XINE_LOCALEDIR)
-AC_DEFINE_UNQUOTED(XINE_LOCALEDIR, "$XINE_LOCALEDIR")
+AC_DEFINE_UNQUOTED(XINE_LOCALEDIR, "$XINE_LOCALEDIR", [Path where catalog files will be.])
 
 AC_PATH_X
 XTEST_LIBS=""
 AC_CHECK_LIB(Xtst, XTestFakeKeyEvent,
         XTEST_LIBS="-lXtst -L$x_libraries"
-        AC_DEFINE(HAVE_XTEST),
+        AC_DEFINE(HAVE_XTEST,1,[Define this if you have XText]),
         ,
         "-L$x_libraries")
 AC_SUBST(XTEST_LIBS)
@@ -58,7 +58,8 @@
 [  --disable-guile         disable use of guile scripting],
         guile=$enableval, guile=yes)
 if test "$guile" = yes; then
-    AM_PATH_GUILE(lala, AC_DEFINE(USE_GUILE), [guile=no])
+    AM_PATH_GUILE(lala, AC_DEFINE(USE_GUILE,1,[Define this if you have GUILE installed]),
+		 [guile=no])
 fi
 AM_CONDITIONAL(DO_GUILE, test "x$guile" = "xyes")
 
Index: m4/gettext.m4
===================================================================
RCS file: /cvsroot/sinek/sinek/m4/gettext.m4,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 gettext.m4
--- m4/gettext.m4	3 Jan 2002 22:51:30 -0000	1.1.1.1
+++ m4/gettext.m4	21 Jan 2003 23:21:29 -0000
@@ -241,7 +241,7 @@
       dnl Found it, now check the version.
       AC_MSG_CHECKING([version of bison])
 changequote(<<,>>)dnl
-      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
       case $ac_prog_version in
         '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
         1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)

--------------050203040900090201030400--




-------------------------------------------------------
This SF.net email is sponsored by: Scholarships for Techies!
Can't afford IT training? All 2003 ictp students receive scholarships.
Get hands-on training in Microsoft, Cisco, Sun, Linux/UNIX, and more.
www.ictp.com/training/sourceforge.asp