[Adonthell-commits] CVS: adonthell acinclude.m4,1.13.2.3,1.13.2.4 configure.in,1.50.2.18,1.50.2.19

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/adonthell
In directory subversions:/tmp/cvs-serv15305

Modified Files:
      Tag: Branch_road_to_0-4
        acinclude.m4 configure.in 
Log Message:
FIXES for autoconf 2.5x and automake 1.6

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/adonthell/adonthell/acinclude.m4,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -C2 -r1.13.2.3 -r1.13.2.4
*** acinclude.m4        4 Apr 2002 11:45:26 -0000       1.13.2.3
--- acinclude.m4        19 Sep 2002 20:36:49 -0000      1.13.2.4
***************
*** 1,2 ****
--- 1,15 ----
+ # aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+ 
+ # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+ # Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+ # This program is distributed in the hope that it will be useful,
[...3450 lines suppressed...]
+           echo "*** came with the system with the command"
+           echo "***"
+           echo "***    rpm --erase --nodeps gtk gtk-devel" ],
+         [ echo "*** The test program failed to compile or link. See the file 
config.log for the"
+           echo "*** exact error that occured. This usually means GTK was 
incorrectly installed"
+           echo "*** or that you have moved GTK since it was installed. In the 
latter case, you"
+           echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
+           CFLAGS="$ac_save_CFLAGS"
+           LIBS="$ac_save_LIBS"
+        fi
+      fi
+      GTK_CFLAGS=""
+      GTK_LIBS=""
+      ifelse([$3], , :, [$3])
+   fi
+   AC_SUBST(GTK_CFLAGS)
+   AC_SUBST(GTK_LIBS)
+   rm -f conf.gtktest
+ ])
+ 

Index: configure.in
===================================================================
RCS file: /cvsroot/adonthell/adonthell/configure.in,v
retrieving revision 1.50.2.18
retrieving revision 1.50.2.19
diff -C2 -r1.50.2.18 -r1.50.2.19
*** configure.in        12 Sep 2002 20:18:14 -0000      1.50.2.18
--- configure.in        19 Sep 2002 20:36:49 -0000      1.50.2.19
***************
*** 121,125 ****
  
  OGG_VORBIS=no
! AM_PATH_VORBIS(
          OGG_VORBIS="yes"
          ogg_music="enabled"
--- 121,125 ----
  
  OGG_VORBIS=no
! XIPH_PATH_VORBIS(
          OGG_VORBIS="yes"
          ogg_music="enabled"