[xiph-cvs] cvs commit: ao/include/ao Makefile.am

[Ralph Giles]

giles       03/10/31 07:12:16

  Modified:    include/ao Makefile.am
  Log:
  Require automake 1.6.
  
  nodist_include_HEADERS is not supported by automake 1.4. It ignores the
  line entirely and fails to install ao/os_types.h, preventing any
  application from compiling against libao. Therefore we make the
  requirement explicit by adding it to the AUTOMAKE_OPTIONS in
  Makefile.am.
  
  Unfortunately, automake 1.4 is still the default on many systems
  (including Debian unstable) and in stark contrast to the situation with
  autoconf, even when 1.6 or later is installed there is no dispatch
  mechanism to ensure the appropriate version is used. Therefore we make
  an attempt in autogen.sh to select the correct executables for aclocal
  and automake and run those.
  
  Note that while the message says, "checking for automake 1.6 or
  later..." it actually only checks for a matching version number. If
  someone knows how to do the 'or later' part in portable shell, please
  let me know.

Revision  Changes    Path
1.4       +1 -1      ao/include/ao/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ao/include/ao/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am	11 Oct 2003 03:03:35 -0000	1.3
+++ Makefile.am	31 Oct 2003 12:12:16 -0000	1.4
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.6
 
 includedir = $(prefix)/include/ao
 

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.