--- ./libcdaudio.m4 Sat Aug 18 09:44:32 2001 +++ ../libcdaudio-0.99.9/./libcdaudio.m4 Sat Mar 22 13:27:50 2003 @@ -58,7 +58,11 @@ dnl rm -f conf.cdaudiotest AC_TRY_RUN([ +#ifdef __sgi +#include +#else #include +#endif #include #include --- ./libcdaudio-config.in Mon Feb 10 15:46:14 2003 +++ ../libcdaudio-0.99.9/./libcdaudio-config.in Sat Mar 22 13:27:50 2003 @@ -49,8 +49,8 @@ echo @LIB_LDADD@ ;; --libs) - libdir=-L${exec_prefix}/lib - echo $libdir -lcdaudio @LIBS@ + libdir=-L@libdir@ + echo $libdir -l@cdaudioname@ @LIBS@ ;; *) echo "${usage}" 1>&2 --- ./source/Makefile.in Wed Feb 12 13:05:32 2003 +++ ../libcdaudio-0.99.9/./source/Makefile.in Sat Mar 22 17:41:17 2003 @@ -99,9 +99,9 @@ compat.h -lib_LTLIBRARIES = libcdaudio.la +lib_LTLIBRARIES = lib@cdaudioname@.la -libcdaudio_la_SOURCES = \ +lib@cdaudioname@_la_SOURCES = \ cdaudio.c \ irix_cdaudio.c \ beos_cdaudio.c \ @@ -114,7 +114,7 @@ extra_objs.c -libcdaudio_la_LDFLAGS = -version-info 1:0:0 +lib@cdaudioname@_la_LDFLAGS = -version-info 1:0:0 include_HEADERS = \ cdaudio.h @@ -125,11 +125,11 @@ CONFIG_CLEAN_FILES = cdaudio.h LTLIBRARIES = $(lib_LTLIBRARIES) -libcdaudio_la_LIBADD = -am_libcdaudio_la_OBJECTS = cdaudio.lo irix_cdaudio.lo beos_cdaudio.lo \ +lib@cdaudioname@_la_LIBADD = $(LIB_LDADD) +am_lib@cdaudioname@_la_OBJECTS = cdaudio.lo irix_cdaudio.lo beos_cdaudio.lo \ cddb.lo cdindex.lo coverart.lo data.lo changer.lo base64.lo \ extra_objs.lo -libcdaudio_la_OBJECTS = $(am_libcdaudio_la_OBJECTS) +lib@cdaudioname@_la_OBJECTS = $(am_lib@cdaudioname@_la_OBJECTS) DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@ -152,12 +152,12 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CFLAGS = @CFLAGS@ -DIST_SOURCES = $(libcdaudio_la_SOURCES) +DIST_SOURCES = $(lib@cdaudioname@_la_SOURCES) HEADERS = $(include_HEADERS) $(noinst_HEADERS) DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \ Makefile.in cdaudio.h.in -SOURCES = $(libcdaudio_la_SOURCES) +SOURCES = $(lib@cdaudioname@_la_SOURCES) all: all-am @@ -396,11 +396,11 @@ uninstall-libLTLIBRARIES: $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/lib@cdaudioname@.la -libcdaudio.la: $(libcdaudio_la_OBJECTS) $(libcdaudio_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libcdaudio_la_LDFLAGS) $(libcdaudio_la_OBJECTS) $(libcdaudio_la_LIBADD) $(LIBS) +lib@cdaudioname@.la: $(lib@cdaudioname@_la_OBJECTS) $(lib@cdaudioname@_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(lib@cdaudioname@_la_LDFLAGS) $(lib@cdaudioname@_la_OBJECTS) $(lib@cdaudioname@_la_LIBADD) $(LIBS) -liblibcdaudio.la: $(libcdaudio_la_OBJECTS) $(libcdaudio_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libcdaudio_la_LDFLAGS) $(libcdaudio_la_OBJECTS) $(libcdaudio_la_LIBADD) $(LIBS) +liblib@cdaudioname@.la: $(lib@cdaudioname@_la_OBJECTS) $(lib@cdaudioname@_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(lib@cdaudioname@_la_LDFLAGS) $(lib@cdaudioname@_la_OBJECTS) $(lib@cdaudioname@_la_LIBADD) $(LIBS) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- ./source/cdindex.c Sat Aug 18 09:59:42 2001 +++ ../libcdaudio-0.99.9/./source/cdindex.c Sat Mar 22 13:27:50 2003 @@ -445,7 +445,7 @@ if(cd_stat(cd_desc, &disc) < 0) return -1; - if((data->data_id = __internal_cddb_discid(disc) < 0)) + if((data->data_id = __internal_cddb_discid(disc)) == 0xFFFFFFFF) return -1; if(cdindex_discid(cd_desc, data->data_cdindex_id, CDINDEX_ID_SIZE) < 0) @@ -528,7 +528,7 @@ if(cd_stat(cd_desc, &disc) < 0) return -1; - if((data->data_id = __internal_cddb_discid(disc)) < 0) + if((data->data_id = __internal_cddb_discid(disc)) == 0xFFFFFFFF) return -1; if(__internal_cdindex_discid(disc, data->data_cdindex_id, @@ -614,7 +614,7 @@ if(cd_stat(cd_desc, &disc) < 0) return -1; - if((data->data_id = __internal_cddb_discid(disc)) < 0) + if((data->data_id = __internal_cddb_discid(disc)) == 0xFFFFFFFF) return -1; if(__internal_cdindex_discid(disc, data->data_cdindex_id, @@ -790,7 +790,7 @@ if(cd_stat(cd_desc, &disc) < 0) return -1; - if((entry->entry_id = __internal_cddb_discid(disc)) < 0) + if((entry->entry_id = __internal_cddb_discid(disc)) == 0xFFFFFFFF) return -1; if(__internal_cdindex_discid(disc, entry->entry_cdindex_id, --- ./source/cddb.c Wed Feb 12 12:55:25 2003 +++ ../libcdaudio-0.99.9/./source/cddb.c Sat Mar 22 13:27:50 2003 @@ -863,7 +863,7 @@ if(cd_stat(cd_desc, &disc) < 0) return -1; - if((discid = __internal_cddb_discid(disc)) < 0) + if((discid = __internal_cddb_discid(disc)) == 0xFFFFFFFF) return -1; if((outbuffer = malloc(1024)) == NULL) @@ -1130,7 +1130,7 @@ if(cd_stat(cd_desc, &disc) < 0) return -1; - if((indata.data_id = __internal_cddb_discid(disc)) < 0) + if((indata.data_id = __internal_cddb_discid(disc)) == 0xFFFFFFFF) return -1; if((outbuffer = malloc(512)) == NULL) @@ -1493,7 +1493,7 @@ if(cd_stat(cd_desc, &disc) < 0) return -1; - if((data->data_id = __internal_cddb_discid(disc)) < 0) + if((data->data_id = __internal_cddb_discid(disc)) == 0xFFFFFFFF) return -1; if(__internal_cdindex_discid(disc, data->data_cdindex_id, @@ -1599,7 +1599,7 @@ return -1; } - if((data->data_id = __internal_cddb_discid(disc)) < 0) { + if((data->data_id = __internal_cddb_discid(disc)) == 0xFFFFFFFF) { free(root_dir); free(file); free(inbuffer); @@ -2003,7 +2003,7 @@ if(cd_stat(cd_desc, &disc) < 0) return -1; - if((entry->entry_id = __internal_cddb_discid(disc)) < 0) + if((entry->entry_id = __internal_cddb_discid(disc)) == 0xFFFFFFFF) return -1; if(cdindex_discid(cd_desc, entry->entry_cdindex_id, CDINDEX_ID_SIZE) < 0) --- ./configure Wed Feb 12 13:00:36 2003 +++ ../libcdaudio-0.99.9/./configure Sat Mar 22 13:29:57 2003 @@ -8152,7 +8152,7 @@ #define BEOS_CDAUDIO _ACEOF - LIBRARY_LIBS="-lcdaudio $LIBS" + LIB_LDADD="-lcdaudio" ;; irix*) cdaudioname=libcdaudio @@ -8161,7 +8161,7 @@ #define IRIX_CDAUDIO _ACEOF - LIBRARY_LIBS="-lcdaudio -lmediad -lds $LIBS" + LIB_LDADD="-lcdaudio -lmediad -lds" ;; *solaris*) @@ -10083,7 +10083,7 @@ _ACEOF CFLAGS="$CFLAGS -D_REENTRANT" - LIBRARY_LIB="$threads $LIBRARY_LIB" + LIBS="$LIBS $threads" REENTRANT="-D_REENTRANT" fi