[xiph-cvs] cvs commit: speex/src Makefile.am speexdec.c speexenc.c

[Jean-Marc Valin]

jm          04/02/18 01:59:41

  Modified:    .        ChangeLog configure.in
               src      Makefile.am speexdec.c speexenc.c
  Log:
  Integrated IRIX patch (getopt stuff) from Michael Pruett <michael at 68k.org>

Revision  Changes    Path
1.4       +6 -0      speex/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /usr/local/cvsroot/speex/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog	27 Mar 2002 21:16:30 -0000	1.3
+++ ChangeLog	18 Feb 2004 06:59:40 -0000	1.4
@@ -1,3 +1,9 @@
+2004-02-18 Jean-Marc Valin <jean-marc.valin at usherbrooke.ca>
+	Integrated IRIX patch (getopt stuff) from Michael Pruett <michael at 68k.org> 
+
+2004-02-18 Jean-Marc Valin <jean-marc.valin at usherbrooke.ca>
+	Changed the Makefile.am so that KDevelop can parse SUBDIRS correctly 
+
 2002/03/27 Jean-Marc Valin:
 Working encoder and decoder for both narrowband and wideband.
 

<p><p>1.63      +9 -1      speex/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/speex/configure.in,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- configure.in	12 Feb 2004 08:30:15 -0000	1.62
+++ configure.in	18 Feb 2004 06:59:40 -0000	1.63
@@ -52,7 +52,15 @@
 AC_SUBST(src)
 
 AC_CHECK_LIB(m, sin)
-AC_CHECK_LIB(gnugetopt, getopt_long)
+
+# Check for getopt_long; if not found, use included source.
+AC_CHECK_FUNCS([getopt_long],,
+[# FreeBSD has a gnugetopt library.
+  AC_CHECK_LIB([gnugetopt],[getopt_long],
+[AC_DEFINE([HAVE_GETOPT_LONG])],
+[# Use the GNU replacement.
+AC_LIBOBJ(getopt)
+AC_LIBOBJ(getopt1)])])
 
 AC_DEFINE_UNQUOTED(VERSION, "${VERSION}")
 

<p><p>1.11      +7 -3      speex/src/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/speex/src/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.am	30 May 2003 02:09:30 -0000	1.10
+++ Makefile.am	18 Feb 2004 06:59:40 -0000	1.11
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in. -*-Makefile-*-
 
-# $Id: Makefile.am,v 1.10 2003/05/30 02:09:30 jm Exp $
+# $Id: Makefile.am,v 1.11 2004/02/18 06:59:40 jm Exp $
 
 # Disable automatic dependency tracking if using other tools than gcc and gmake
 #AUTOMAKE_OPTIONS = no-dependencies
@@ -18,7 +18,11 @@
 bin_PROGRAMS = speexenc speexdec
 
 speexenc_SOURCES = speexenc.c wav_io.c
-speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS)
+speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la \
+	$(OGG_LDFLAGS) $(OGG_LIBS) \
+	@LTLIBOBJS@
 
 speexdec_SOURCES = speexdec.c wav_io.c
-speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS)
+speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la \
+	$(OGG_LDFLAGS) $(OGG_LIBS) \
+	@LTLIBOBJS@

<p><p>1.88      +3 -0      speex/src/speexdec.c

Index: speexdec.c
===================================================================
RCS file: /usr/local/cvsroot/speex/src/speexdec.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- speexdec.c	28 Jan 2004 07:51:29 -0000	1.87
+++ speexdec.c	18 Feb 2004 06:59:40 -0000	1.88
@@ -34,6 +34,9 @@
 #include <unistd.h>
 #include <getopt.h>
 #endif
+#ifndef HAVE_GETOPT_LONG
+#include "getopt_win.h"
+#endif
 #include <stdlib.h>
 #include <string.h>
 

<p><p>1.86      +3 -0      speex/src/speexenc.c

Index: speexenc.c
===================================================================
RCS file: /usr/local/cvsroot/speex/src/speexenc.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- speexenc.c	28 Jan 2004 07:51:30 -0000	1.85
+++ speexenc.c	18 Feb 2004 06:59:40 -0000	1.86
@@ -34,6 +34,9 @@
 #include <unistd.h>
 #include <getopt.h>
 #endif
+#ifndef HAVE_GETOPT_LONG
+#include "getopt_win.h"
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>

<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.