Skip to content

M
mpd
Commit d94eaf58 authored by Led's avatar Led
Browse files
Options

0.8.2

parent 24721bba
Hide whitespace changes
Inline Side-by-side
Showing with 2766 additions and 3516 deletions
ChangeLog
View file @ d94eaf58
ver 0.8.1 (2003/7/15) ver 0.8.2 (2003/7/22)
1) Increased the connection que for listen() from 0 to 5
2) Cleanup configure makefiles so that mpd uses MPD_LIBS and MPD_CFLAGS
rather than LIBS and CFLAGS
3) Put a cap on the number of commands per command list
4) Put a cap on the maximum number of buffered output lines
5) Get rid of TIME_WAIT/EADDRINUSE socket problem
6) Use asynchronious IO (i.e. trigger SIGIO instead so we can sleep in
select() calls longer)
ver 0.8.1 (2003/7/11)
1) FreeBSD fixes 1) FreeBSD fixes
2) Fix for rare segfault when updating 2) Fix for rare segfault when updating
3) Fix bug where client was being hungup on when done playing current song 3) Fix bug where client was being hungup on when done playing current song
......
INSTALL
View file @ d94eaf58
...@@ -10,7 +10,7 @@ For Red Hat 8.0, the neccessary packages are: libao and libao-devel) ...@@ -10,7 +10,7 @@ For Red Hat 8.0, the neccessary packages are: libao and libao-devel)
zlib - http://www.gzip.org/zlib zlib - http://www.gzip.org/zlib
(This comes with all distributions. Make sure you have bot the zlib libs (This comes with all distributions. Make sure you have bot the zlib libs
and delevelopment packages for your distribution installed. For Red hat, and development packages for your distribution installed. For Red hat,
the neccessary packages are: zlib and zlib-devel) the neccessary packages are: zlib and zlib-devel)
Optional Optional
......
Makefile.am
View file @ d94eaf58
bin_PROGRAMS = mpd bin_PROGRAMS = mpd
SUBDIRS = $(ID3_SUBDIR) $(MAD_SUBDIR) SUBDIRS = $(ID3_SUBDIR) $(MAD_SUBDIR)
man_MANS = mpd.1
pkgdata_DATA = mpdconf.example README INSTALL pkgdata_DATA = mpdconf.example README INSTALL
EXTRA_DIST = COMMANDS UPGRADING $(pkgdata_DATA) EXTRA_DIST = COMMANDS UPGRADING $(pkgdata_DATA) $(man_MANS)
mpd_headers = buffer2array.h interface.h command.h playlist.h ls.h \ mpd_headers = buffer2array.h interface.h command.h playlist.h ls.h \
song.h list.h directory.h tables.h utils.h path.h flac_decode.h \ song.h list.h directory.h tables.h utils.h path.h flac_decode.h \
tag.h player.h listen.h conf.h ogg_decode.h volume.h mp3_decode.h \ tag.h player.h listen.h conf.h ogg_decode.h volume.h mp3_decode.h \
audio.h buffer.h stats.h myfprintf.h audio.h buffer.h stats.h myfprintf.h sig_handlers.h
mpd_SOURCES = main.c buffer2array.c interface.c command.c playlist.c ls.c \ mpd_SOURCES = main.c buffer2array.c interface.c command.c playlist.c ls.c \
song.c list.c directory.c tables.c utils.c path.c flac_decode.c\ song.c list.c directory.c tables.c utils.c path.c flac_decode.c\
tag.c player.c listen.c conf.c ogg_decode.c volume.c mp3_decode.c \ tag.c player.c listen.c conf.c ogg_decode.c volume.c mp3_decode.c \
audio.c buffer.c stats.c myfprintf.c $(mpd_headers) audio.c buffer.c stats.c myfprintf.c sig_handlers.c $(mpd_headers)
mpd_LDADD = $(ID3_LIB) $(MAD_LIB) CFLAGS = @CFLAGS@ $(MPD_CFLAGS)
mpd_LDADD = $(MPD_LIBS) $(ID3_LIB) $(MAD_LIB)
Makefile.in
View file @ d94eaf58
# Makefile.in generated by automake 1.6.3 from Makefile.am. # Makefile.in generated by automake 1.7.2 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
...@@ -13,108 +13,145 @@ ...@@ -13,108 +13,145 @@
# PARTICULAR PURPOSE. # PARTICULAR PURPOSE.
@SET_MAKE@ @SET_MAKE@
SHELL = @SHELL@
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = . top_builddir = .
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644 install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA) INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@ transform = $(program_transform_name)
NORMAL_INSTALL = : NORMAL_INSTALL = :
PRE_INSTALL = : PRE_INSTALL = :
POST_INSTALL = : POST_INSTALL = :
NORMAL_UNINSTALL = : NORMAL_UNINSTALL = :
PRE_UNINSTALL = : PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@ host_triplet = @host@
ACLOCAL = @ACLOCAL@
EXEEXT = @EXEEXT@ AMDEP_FALSE = @AMDEP_FALSE@
OBJEXT = @OBJEXT@ AMDEP_TRUE = @AMDEP_TRUE@
PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AO_CFLAGS = @AO_CFLAGS@ AO_CFLAGS = @AO_CFLAGS@
AO_LIBS = @AO_LIBS@ AO_LIBS = @AO_LIBS@
AS = @AS@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
CC = @CC@ CC = @CC@
CCAS = @CCAS@ CCAS = @CCAS@
CCASFLAGS = @CCASFLAGS@ CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@ $(MPD_CFLAGS)
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@ ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
ID3_LIB = @ID3_LIB@ ID3_LIB = @ID3_LIB@
ID3_SUBDIR = @ID3_SUBDIR@ ID3_SUBDIR = @ID3_SUBDIR@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@ LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@
LIBFLAC_LIBS = @LIBFLAC_LIBS@ LIBFLAC_LIBS = @LIBFLAC_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAD_LIB = @MAD_LIB@ MAD_LIB = @MAD_LIB@
MAD_SUBDIR = @MAD_SUBDIR@ MAD_SUBDIR = @MAD_SUBDIR@
OBJDUMP = @OBJDUMP@ MAKEINFO = @MAKEINFO@
MPD_CFLAGS = @MPD_CFLAGS@
MPD_LIBS = @MPD_LIBS@
OBJEXT = @OBJEXT@
OGG_CFLAGS = @OGG_CFLAGS@ OGG_CFLAGS = @OGG_CFLAGS@
OGG_LIBS = @OGG_LIBS@ OGG_LIBS = @OGG_LIBS@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
VORBISENC_LIBS = @VORBISENC_LIBS@ VORBISENC_LIBS = @VORBISENC_LIBS@
VORBISFILE_LIBS = @VORBISFILE_LIBS@ VORBISFILE_LIBS = @VORBISFILE_LIBS@
VORBIS_CFLAGS = @VORBIS_CFLAGS@ VORBIS_CFLAGS = @VORBIS_CFLAGS@
VORBIS_LIBS = @VORBIS_LIBS@ VORBIS_LIBS = @VORBIS_LIBS@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@ am__include = @am__include@
am__quote = @am__quote@ am__quote = @am__quote@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@ install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
bin_PROGRAMS = mpd bin_PROGRAMS = mpd
SUBDIRS = $(ID3_SUBDIR) $(MAD_SUBDIR) SUBDIRS = $(ID3_SUBDIR) $(MAD_SUBDIR)
man_MANS = mpd.1
pkgdata_DATA = mpdconf.example README INSTALL pkgdata_DATA = mpdconf.example README INSTALL
EXTRA_DIST = COMMANDS UPGRADING $(pkgdata_DATA) EXTRA_DIST = COMMANDS UPGRADING $(pkgdata_DATA) $(man_MANS)
mpd_headers = buffer2array.h interface.h command.h playlist.h ls.h \ mpd_headers = buffer2array.h interface.h command.h playlist.h ls.h \
song.h list.h directory.h tables.h utils.h path.h flac_decode.h \ song.h list.h directory.h tables.h utils.h path.h flac_decode.h \
tag.h player.h listen.h conf.h ogg_decode.h volume.h mp3_decode.h \ tag.h player.h listen.h conf.h ogg_decode.h volume.h mp3_decode.h \
audio.h buffer.h stats.h myfprintf.h audio.h buffer.h stats.h myfprintf.h sig_handlers.h
mpd_SOURCES = main.c buffer2array.c interface.c command.c playlist.c ls.c \ mpd_SOURCES = main.c buffer2array.c interface.c command.c playlist.c ls.c \
song.c list.c directory.c tables.c utils.c path.c flac_decode.c\ song.c list.c directory.c tables.c utils.c path.c flac_decode.c\
tag.c player.c listen.c conf.c ogg_decode.c volume.c mp3_decode.c \ tag.c player.c listen.c conf.c ogg_decode.c volume.c mp3_decode.c \
audio.c buffer.c stats.c myfprintf.c $(mpd_headers) audio.c buffer.c stats.c myfprintf.c sig_handlers.c $(mpd_headers)
mpd_LDADD = $(ID3_LIB) $(MAD_LIB) mpd_LDADD = $(MPD_LIBS) $(ID3_LIB) $(MAD_LIB)
subdir = . subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
...@@ -131,16 +168,12 @@ am_mpd_OBJECTS = main.$(OBJEXT) buffer2array.$(OBJEXT) \ ...@@ -131,16 +168,12 @@ am_mpd_OBJECTS = main.$(OBJEXT) buffer2array.$(OBJEXT) \
listen.$(OBJEXT) conf.$(OBJEXT) ogg_decode.$(OBJEXT) \ listen.$(OBJEXT) conf.$(OBJEXT) ogg_decode.$(OBJEXT) \
volume.$(OBJEXT) mp3_decode.$(OBJEXT) audio.$(OBJEXT) \ volume.$(OBJEXT) mp3_decode.$(OBJEXT) audio.$(OBJEXT) \
buffer.$(OBJEXT) stats.$(OBJEXT) myfprintf.$(OBJEXT) \ buffer.$(OBJEXT) stats.$(OBJEXT) myfprintf.$(OBJEXT) \
$(am__objects_1) sig_handlers.$(OBJEXT) $(am__objects_1)
mpd_OBJECTS = $(am_mpd_OBJECTS) mpd_OBJECTS = $(am_mpd_OBJECTS)
mpd_DEPENDENCIES = mpd_DEPENDENCIES =
mpd_LDFLAGS = mpd_LDFLAGS =
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) DEFAULT_INCLUDES = -I. -I$(srcdir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/depcomp depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles
@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/audio.Po ./$(DEPDIR)/buffer.Po \ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/audio.Po ./$(DEPDIR)/buffer.Po \
...@@ -152,9 +185,10 @@ am__depfiles_maybe = depfiles ...@@ -152,9 +185,10 @@ am__depfiles_maybe = depfiles
@AMDEP_TRUE@ ./$(DEPDIR)/mp3_decode.Po ./$(DEPDIR)/myfprintf.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/mp3_decode.Po ./$(DEPDIR)/myfprintf.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/ogg_decode.Po ./$(DEPDIR)/path.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/ogg_decode.Po ./$(DEPDIR)/path.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/player.Po ./$(DEPDIR)/playlist.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/player.Po ./$(DEPDIR)/playlist.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/song.Po ./$(DEPDIR)/stats.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/sig_handlers.Po ./$(DEPDIR)/song.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/tables.Po ./$(DEPDIR)/tag.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/stats.Po ./$(DEPDIR)/tables.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/utils.Po ./$(DEPDIR)/volume.Po @AMDEP_TRUE@ ./$(DEPDIR)/tag.Po ./$(DEPDIR)/utils.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/volume.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
...@@ -162,15 +196,18 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ...@@ -162,15 +196,18 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
CCLD = $(CC) CCLD = $(CC)
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@ $(AM_LDFLAGS) $(LDFLAGS) -o $@
CFLAGS = @CFLAGS@
DIST_SOURCES = $(mpd_SOURCES) DIST_SOURCES = $(mpd_SOURCES)
NROFF = nroff
MANS = $(man_MANS)
DATA = $(pkgdata_DATA) DATA = $(pkgdata_DATA)
RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
uninstall-info-recursive all-recursive install-data-recursive \ ps-recursive install-info-recursive uninstall-info-recursive \
install-exec-recursive installdirs-recursive install-recursive \ all-recursive install-data-recursive install-exec-recursive \
uninstall-recursive check-recursive installcheck-recursive installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive
DIST_COMMON = README COPYING ChangeLog INSTALL Makefile.am Makefile.in \ DIST_COMMON = README COPYING ChangeLog INSTALL Makefile.am Makefile.in \
TODO aclocal.m4 config.guess config.sub configure configure.in \ TODO aclocal.m4 config.guess config.sub configure configure.in \
depcomp install-sh ltmain.sh missing mkinstalldirs depcomp install-sh ltmain.sh missing mkinstalldirs
...@@ -208,7 +245,7 @@ install-binPROGRAMS: $(bin_PROGRAMS) ...@@ -208,7 +245,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
; then \ ; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
else :; fi; \ else :; fi; \
done done
...@@ -254,6 +291,7 @@ distclean-compile: ...@@ -254,6 +291,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/path.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/path.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/playlist.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/playlist.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sig_handlers.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/song.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/song.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stats.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stats.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tables.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tables.Po@am__quote@
...@@ -265,23 +303,37 @@ distclean-depend: ...@@ -265,23 +303,37 @@ distclean-depend:
-rm -rf ./$(DEPDIR) -rm -rf ./$(DEPDIR)
.c.o: .c.o:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
.c.obj: .c.obj:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
$(COMPILE) -c `cygpath -w $<` @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
.c.lo: .c.lo:
@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
CCDEPMODE = @CCDEPMODE@ @am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
mostlyclean-libtool: mostlyclean-libtool:
-rm -f *.lo -rm -f *.lo
...@@ -292,6 +344,53 @@ clean-libtool: ...@@ -292,6 +344,53 @@ clean-libtool:
distclean-libtool: distclean-libtool:
-rm -f libtool -rm -f libtool
uninstall-info-am: uninstall-info-am:
man1dir = $(mandir)/man1
install-man1: $(man1_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(man1dir)
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
case "$$i" in \
*.1*) list="$$list $$i" ;; \
esac; \
done; \
for i in $$list; do \
if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
else file=$$i; fi; \
ext=`echo $$i | sed -e 's/^.*\\.//'`; \
case "$$ext" in \
1*) ;; \
*) ext='1' ;; \
esac; \
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed -e 's/^.*\///'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
$(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
done
uninstall-man1:
@$(NORMAL_UNINSTALL)
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
case "$$i" in \
*.1*) list="$$list $$i" ;; \
esac; \
done; \
for i in $$list; do \
ext=`echo $$i | sed -e 's/^.*\\.//'`; \
case "$$ext" in \
1*) ;; \
*) ext='1' ;; \
esac; \
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed -e 's/^.*\///'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
rm -f $(DESTDIR)$(man1dir)/$$inst; \
done
pkgdataDATA_INSTALL = $(INSTALL_DATA) pkgdataDATA_INSTALL = $(INSTALL_DATA)
install-pkgdataDATA: $(pkgdata_DATA) install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
...@@ -365,10 +464,17 @@ tags-recursive: ...@@ -365,10 +464,17 @@ tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \ list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ETAGS = etags ETAGS = etags
ETAGSFLAGS = ETAGSFLAGS =
CTAGS = ctags
CTAGSFLAGS =
tags: TAGS tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
...@@ -399,13 +505,28 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ...@@ -399,13 +505,28 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique $$tags $$unique
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
GTAGS: GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \ here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \ && cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here && gtags -i $(GTAGS_ARGS) $$here
distclean-tags: distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = . top_distdir = .
...@@ -417,12 +538,19 @@ am__remove_distdir = \ ...@@ -417,12 +538,19 @@ am__remove_distdir = \
&& rm -fr $(distdir); }; } && rm -fr $(distdir); }; }
GZIP_ENV = --best GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print
distdir: $(DISTFILES) distdir: $(DISTFILES)
$(am__remove_distdir) $(am__remove_distdir)
mkdir $(distdir) mkdir $(distdir)
@list='$(DISTFILES)'; for file in $$list; do \ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
...@@ -479,8 +607,9 @@ distcheck: dist ...@@ -479,8 +607,9 @@ distcheck: dist
mkdir $(distdir)/=inst mkdir $(distdir)/=inst
chmod a-w $(distdir) chmod a-w $(distdir)
dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& cd $(distdir)/=build \ && cd $(distdir)/=build \
&& ../configure --srcdir=.. --prefix=$$dc_install_base \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) dvi \
...@@ -488,31 +617,47 @@ distcheck: dist ...@@ -488,31 +617,47 @@ distcheck: dist
&& $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
&& $(MAKE) $(AM_MAKEFLAGS) uninstall \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \
&& (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
|| { echo "ERROR: files left after uninstall:" ; \ distuninstallcheck \
find $$dc_install_base -type f -print ; \ && chmod -R a-w "$$dc_install_base" \
exit 1; } >&2 ) \ && ({ \
(cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
} || { rm -rf "$$dc_destdir"; exit 1; }) \
&& rm -rf "$$dc_destdir" \
&& $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
&& rm -f $(distdir).tar.gz \ && rm -f $(distdir).tar.gz \
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
$(am__remove_distdir) $(am__remove_distdir)
@echo "$(distdir).tar.gz is ready for distribution" | \ @echo "$(distdir).tar.gz is ready for distribution" | \
sed 'h;s/./=/g;p;x;p;x' sed 'h;s/./=/g;p;x;p;x'
distuninstallcheck:
cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
echo " (check DESTDIR support)"; \
fi ; \
$(distuninstallcheck_listfiles) ; \
exit 1; } >&2
distcleancheck: distclean distcleancheck: distclean
if test '$(srcdir)' = . ; then \ if test '$(srcdir)' = . ; then \
echo "ERROR: distcleancheck can only run from a VPATH build" ; \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
exit 1 ; \ exit 1 ; \
fi fi
test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left after distclean:" ; \ || { echo "ERROR: files left in build directory after distclean:" ; \
$(distcleancheck_listfiles) ; \ $(distcleancheck_listfiles) ; \
exit 1; } >&2 exit 1; } >&2
check-am: all-am check-am: all-am
check: check-recursive check: check-recursive
all-am: Makefile $(PROGRAMS) $(DATA) all-am: Makefile $(PROGRAMS) $(MANS) $(DATA)
installdirs: installdirs-recursive installdirs: installdirs-recursive
installdirs-am: installdirs-am:
$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdatadir) $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(pkgdatadir)
install: install-recursive install: install-recursive
install-exec: install-exec-recursive install-exec: install-exec-recursive
...@@ -555,13 +700,13 @@ info: info-recursive ...@@ -555,13 +700,13 @@ info: info-recursive
info-am: info-am:
install-data-am: install-pkgdataDATA install-data-am: install-man install-pkgdataDATA
install-exec-am: install-binPROGRAMS install-exec-am: install-binPROGRAMS
install-info: install-info-recursive install-info: install-info-recursive
install-man: install-man: install-man1
installcheck-am: installcheck-am:
...@@ -575,30 +720,41 @@ mostlyclean: mostlyclean-recursive ...@@ -575,30 +720,41 @@ mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool mostlyclean-libtool
uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ pdf: pdf-recursive
pdf-am:
ps: ps-recursive
ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man \
uninstall-pkgdataDATA uninstall-pkgdataDATA
uninstall-info: uninstall-info-recursive uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ uninstall-man: uninstall-man1
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
clean-binPROGRAMS clean-generic clean-libtool clean-recursive \ clean-binPROGRAMS clean-generic clean-libtool clean-recursive \
dist dist-all dist-gzip distcheck distclean distclean-compile \ ctags ctags-recursive dist dist-all dist-gzip distcheck \
distclean-depend distclean-generic distclean-libtool \ distclean distclean-compile distclean-depend distclean-generic \
distclean-recursive distclean-tags distcleancheck distdir dvi \ distclean-libtool distclean-recursive distclean-tags \
dvi-am dvi-recursive info info-am info-recursive install \ distcleancheck distdir distuninstallcheck dvi dvi-am \
install-am install-binPROGRAMS install-data install-data-am \ dvi-recursive info info-am info-recursive install install-am \
install-binPROGRAMS install-data install-data-am \
install-data-recursive install-exec install-exec-am \ install-data-recursive install-exec install-exec-am \
install-exec-recursive install-info install-info-am \ install-exec-recursive install-info install-info-am \
install-info-recursive install-man install-pkgdataDATA \ install-info-recursive install-man install-man1 \
install-recursive install-strip installcheck installcheck-am \ install-pkgdataDATA install-recursive install-strip \
installdirs installdirs-am installdirs-recursive \ installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-generic \ installdirs-recursive maintainer-clean maintainer-clean-generic \
maintainer-clean-recursive mostlyclean mostlyclean-compile \ maintainer-clean-recursive mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
tags tags-recursive uninstall uninstall-am \ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
uninstall-binPROGRAMS uninstall-info-am \ tags-recursive uninstall uninstall-am uninstall-binPROGRAMS \
uninstall-info-recursive uninstall-pkgdataDATA \ uninstall-info-am uninstall-info-recursive uninstall-man \
uninstall-recursive uninstall-man1 uninstall-pkgdataDATA uninstall-recursive
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.
......
README
View file @ d94eaf58
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Music Player Daemon (MPD) Music Player Daemon (MPD)
http://musicpd.sourceforge.net http://musicpd.sourceforge.net
A daemon for playing music (currently mp3 and ogg vorbis). Music is played A daemon for playing music (mp3, ogg vorbis, and flac). Music is played
through the server's audio device. The daemon stores info about all available through the server's audio device. The daemon stores info about all available
music, and this info can be easily searched and retrieved. Player control, info music, and this info can be easily searched and retrieved. Player control, info
retrieval, and playlist management can all be managed remotely. retrieval, and playlist management can all be managed remotely.
......
aclocal.m4
View file @ d94eaf58
# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- # generated automatically by aclocal 1.7.2 -*- Autoconf -*-
# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
# CC etc. in the Makefile, will ask for an AC_PROG_CC use... # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
AC_PREREQ([2.52]) AC_PREREQ([2.54])
# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
# the ones we care about. # the ones we care about.
...@@ -69,6 +69,16 @@ if test "`cd $srcdir && pwd`" != "`pwd`" && ...@@ -69,6 +69,16 @@ if test "`cd $srcdir && pwd`" != "`pwd`" &&
AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi fi
# test whether we have cygpath
if test -z "$CYGPATH_W"; then
if (cygpath --version) >/dev/null 2>/dev/null; then
CYGPATH_W='cygpath -w'
else
CYGPATH_W=echo
fi
fi
AC_SUBST([CYGPATH_W])
# Define the identity of the package. # Define the identity of the package.
dnl Distinguish between old-style and new-style calls. dnl Distinguish between old-style and new-style calls.
m4_ifval([$2], m4_ifval([$2],
...@@ -100,17 +110,29 @@ AC_REQUIRE([AC_PROG_AWK])dnl ...@@ -100,17 +110,29 @@ AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl
_AM_IF_OPTION([no-dependencies],, _AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_][CC], [AC_PROVIDE_IFELSE([AC_PROG_CC],
[_AM_DEPENDENCIES(CC)], [_AM_DEPENDENCIES(CC)],
[define([AC_PROG_][CC], [define([AC_PROG_CC],
defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_][CXX], AC_PROVIDE_IFELSE([AC_PROG_CXX],
[_AM_DEPENDENCIES(CXX)], [_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_][CXX], [define([AC_PROG_CXX],
defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
]) ])
]) ])
# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
# that is generated. The stamp files are numbered to have different names.
# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
# loop where config.status creates the headers, so we can generate
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
# Copyright 2002 Free Software Foundation, Inc. # Copyright 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
...@@ -131,14 +153,14 @@ AC_PROVIDE_IFELSE([AC_PROG_][CXX], ...@@ -131,14 +153,14 @@ AC_PROVIDE_IFELSE([AC_PROG_][CXX],
# ---------------------------- # ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been # Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y. # generated from the m4 files accompanying Automake X.Y.
AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"]) AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
# AM_SET_CURRENT_AUTOMAKE_VERSION # AM_SET_CURRENT_AUTOMAKE_VERSION
# ------------------------------- # -------------------------------
# Call AM_AUTOMAKE_VERSION so it can be traced. # Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.6.3])]) [AM_AUTOMAKE_VERSION([1.7.2])])
# Helper functions for option handling. -*- Autoconf -*- # Helper functions for option handling. -*- Autoconf -*-
...@@ -518,7 +540,7 @@ AC_CACHE_CHECK([dependency style of $depcc], ...@@ -518,7 +540,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
if depmode=$depmode \ if depmode=$depmode \
source=conftest.c object=conftest.o \ source=conftest.c object=conftest.o \
depfile=conftest.Po tmpdepfile=conftest.TPo \ depfile=conftest.Po tmpdepfile=conftest.TPo \
$SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&
grep conftest.h conftest.Po > /dev/null 2>&1 && grep conftest.h conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
am_cv_$1_dependencies_compiler_type=$depmode am_cv_$1_dependencies_compiler_type=$depmode
...@@ -533,6 +555,9 @@ else ...@@ -533,6 +555,9 @@ else
fi fi
]) ])
AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
AM_CONDITIONAL([am__fastdep$1], [
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_$1_dependencies_compiler_type" = gcc3])
]) ])
...@@ -652,7 +677,9 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], ...@@ -652,7 +677,9 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
]) ])
# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*- # Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
...@@ -692,7 +719,7 @@ echo "include confinc" > confmf ...@@ -692,7 +719,7 @@ echo "include confinc" > confmf
# In particular we don't look at `^make:' because GNU make might # In particular we don't look at `^make:' because GNU make might
# be invoked under some other name (usually "gmake"), in which # be invoked under some other name (usually "gmake"), in which
# case it prints its new name instead of `make'. # case it prints its new name instead of `make'.
if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
am__include=include am__include=include
am__quote= am__quote=
_am_result=GNU _am_result=GNU
...@@ -752,7 +779,7 @@ else ...@@ -752,7 +779,7 @@ else
fi fi
AC_CONFIG_COMMANDS_PRE( AC_CONFIG_COMMANDS_PRE(
[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
AC_MSG_ERROR([conditional \"$1\" was never defined. AC_MSG_ERROR([conditional "$1" was never defined.
Usually this means the macro was only invoked conditionally.]) Usually this means the macro was only invoked conditionally.])
fi])]) fi])])
...@@ -760,6 +787,8 @@ fi])]) ...@@ -760,6 +787,8 @@ fi])])
# serial 46 AC_PROG_LIBTOOL # serial 46 AC_PROG_LIBTOOL
builtin([undefine],[symbols])
AC_DEFUN([AC_PROG_LIBTOOL], AC_DEFUN([AC_PROG_LIBTOOL],
[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
...@@ -785,8 +814,6 @@ AC_REQUIRE([AC_PROG_CC])dnl ...@@ -785,8 +814,6 @@ AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_PROG_LD])dnl AC_REQUIRE([AC_PROG_LD])dnl
AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
AC_REQUIRE([AC_PROG_NM])dnl AC_REQUIRE([AC_PROG_NM])dnl
AC_REQUIRE([LT_AC_PROG_SED])dnl
AC_REQUIRE([AC_PROG_LN_S])dnl AC_REQUIRE([AC_PROG_LN_S])dnl
AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
AC_REQUIRE([AC_OBJEXT])dnl AC_REQUIRE([AC_OBJEXT])dnl
...@@ -887,30 +914,9 @@ _LT_AC_LTCONFIG_HACK ...@@ -887,30 +914,9 @@ _LT_AC_LTCONFIG_HACK
]) ])
# AC_LIBTOOL_HEADER_ASSERT
# ------------------------
AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT],
[AC_CACHE_CHECK([whether $CC supports assert without backlinking],
[lt_cv_func_assert_works],
[case $host in
*-*-solaris*)
if test "$GCC" = yes && test "$with_gnu_ld" != yes; then
case `$CC --version 2>/dev/null` in
[[12]].*) lt_cv_func_assert_works=no ;;
*) lt_cv_func_assert_works=yes ;;
esac
fi
;;
esac])
if test "x$lt_cv_func_assert_works" = xyes; then
AC_CHECK_HEADERS(assert.h)
fi
])# AC_LIBTOOL_HEADER_ASSERT
# _LT_AC_CHECK_DLFCN # _LT_AC_CHECK_DLFCN
# -------------------- # --------------------
AC_DEFUN([_LT_AC_CHECK_DLFCN], AC_DEFUN(_LT_AC_CHECK_DLFCN,
[AC_CHECK_HEADERS(dlfcn.h) [AC_CHECK_HEADERS(dlfcn.h)
])# _LT_AC_CHECK_DLFCN ])# _LT_AC_CHECK_DLFCN
...@@ -928,10 +934,10 @@ AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl ...@@ -928,10 +934,10 @@ AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl
# [They come from Ultrix. What could be older than Ultrix?!! ;)] # [They come from Ultrix. What could be older than Ultrix?!! ;)]
# Character class describing NM global symbol codes. # Character class describing NM global symbol codes.
symcode='[[BCDEGRST]]' [symcode='[BCDEGRST]']
# Regexp to match symbols that can be accessed directly from C. # Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' [sympat='\([_A-Za-z][_A-Za-z0-9]*\)']
# Transform the above into a raw symbol and a C symbol. # Transform the above into a raw symbol and a C symbol.
symxfrm='\1 \2\3 \3' symxfrm='\1 \2\3 \3'
...@@ -945,26 +951,23 @@ lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\ ...@@ -945,26 +951,23 @@ lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\
# Define system-specific variables. # Define system-specific variables.
case $host_os in case $host_os in
aix*) aix*)
symcode='[[BCDT]]' [symcode='[BCDT]']
;; ;;
cygwin* | mingw* | pw32*) cygwin* | mingw* | pw32*)
symcode='[[ABCDGISTW]]' [symcode='[ABCDGISTW]']
;; ;;
hpux*) # Its linker distinguishes data from code symbols hpux*) # Its linker distinguishes data from code symbols
lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;; ;;
irix* | nonstopux*) irix*)
symcode='[[BCDEGRST]]' [symcode='[BCDEGRST]']
;;
osf*)
symcode='[[BCDEGQRST]]'
;; ;;
solaris* | sysv5*) solaris* | sysv5*)
symcode='[[BDT]]' [symcode='[BDT]']
;; ;;
sysv4) sysv4)
symcode='[[DFNSTU]]' [symcode='[DFNSTU]']
;; ;;
esac esac
...@@ -978,14 +981,14 @@ esac ...@@ -978,14 +981,14 @@ esac
# If we're using GNU nm, then use its standard symbol codes. # If we're using GNU nm, then use its standard symbol codes.
if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
symcode='[[ABCDGISTW]]' [symcode='[ABCDGISTW]']
fi fi
# Try without a prefix undercore, then with it. # Try without a prefix undercore, then with it.
for ac_symprfx in "" "_"; do for ac_symprfx in "" "_"; do
# Write the raw and C identifiers. # Write the raw and C identifiers.
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" [lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"]
# Check to see that the pipe works correctly. # Check to see that the pipe works correctly.
pipe_works=no pipe_works=no
...@@ -1038,7 +1041,7 @@ const struct { ...@@ -1038,7 +1041,7 @@ const struct {
const char *name; const char *name;
lt_ptr address; lt_ptr address;
} }
lt_preloaded_symbols[[]] = [lt_preloaded_symbols[] =]
{ {
EOF EOF
sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
...@@ -1056,7 +1059,7 @@ EOF ...@@ -1056,7 +1059,7 @@ EOF
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext" LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$no_builtin_flag" CFLAGS="$CFLAGS$no_builtin_flag"
if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then if AC_TRY_EVAL(ac_link) && test -s conftest; then
pipe_works=yes pipe_works=yes
fi fi
LIBS="$save_LIBS" LIBS="$save_LIBS"
...@@ -1111,14 +1114,13 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then ...@@ -1111,14 +1114,13 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then
*-DOS) lt_cv_sys_path_separator=';' ;; *-DOS) lt_cv_sys_path_separator=';' ;;
*) lt_cv_sys_path_separator=':' ;; *) lt_cv_sys_path_separator=':' ;;
esac esac
PATH_SEPARATOR=$lt_cv_sys_path_separator
fi fi
])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR ])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
# _LT_AC_PROG_ECHO_BACKSLASH # _LT_AC_PROG_ECHO_BACKSLASH
# -------------------------- # --------------------------
# Add some code to the start of the generated configure script which # Add some code to the start of the generated configure script which
# will find an echo command which doesn't interpret backslashes. # will find an echo command which doesn;t interpret backslashes.
AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], [ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
[AC_DIVERT_PUSH(NOTICE)]) [AC_DIVERT_PUSH(NOTICE)])
...@@ -1187,7 +1189,7 @@ else ...@@ -1187,7 +1189,7 @@ else
# #
# So, first we look for a working echo in the user's PATH. # So, first we look for a working echo in the user's PATH.
IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
for dir in $PATH /usr/ucb; do for dir in $PATH /usr/ucb; do
if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
...@@ -1276,7 +1278,7 @@ AC_DIVERT_POP ...@@ -1276,7 +1278,7 @@ AC_DIVERT_POP
# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
# ------------------------------------------------------------------ # ------------------------------------------------------------------
AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], AC_DEFUN(_LT_AC_TRY_DLOPEN_SELF,
[if test "$cross_compiling" = yes; then : [if test "$cross_compiling" = yes; then :
[$4] [$4]
else else
...@@ -1363,7 +1365,7 @@ rm -fr conftest* ...@@ -1363,7 +1365,7 @@ rm -fr conftest*
# AC_LIBTOOL_DLOPEN_SELF # AC_LIBTOOL_DLOPEN_SELF
# ------------------- # -------------------
AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF,
[if test "x$enable_dlopen" != xyes; then [if test "x$enable_dlopen" != xyes; then
enable_dlopen=unknown enable_dlopen=unknown
enable_dlopen_self=unknown enable_dlopen_self=unknown
...@@ -1463,10 +1465,10 @@ AC_DEFUN([_LT_AC_LTCONFIG_HACK], ...@@ -1463,10 +1465,10 @@ AC_DEFUN([_LT_AC_LTCONFIG_HACK],
# Sed substitution that helps us do robust quoting. It backslashifies # Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings. # metacharacters that are still active within double-quoted strings.
Xsed='sed -e s/^X//' Xsed='sed -e s/^X//'
sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g' [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references. # Same as above, but do not quote variable references.
double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g' [double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
# Sed substitution to delay expansion of an escaped shell variable in a # Sed substitution to delay expansion of an escaped shell variable in a
# double_quote_subst'ed string. # double_quote_subst'ed string.
...@@ -1600,7 +1602,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, ...@@ -1600,7 +1602,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
# like `-m68040'. # like `-m68040'.
lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
;; ;;
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes. # PIC is the default for these OSes.
;; ;;
darwin* | rhapsody*) darwin* | rhapsody*)
...@@ -1643,7 +1645,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, ...@@ -1643,7 +1645,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
lt_cv_prog_cc_pic='+Z' lt_cv_prog_cc_pic='+Z'
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_wl='-Wl,'
lt_cv_prog_cc_static='-non_shared' lt_cv_prog_cc_static='-non_shared'
# PIC (with -KPIC) is the default. # PIC (with -KPIC) is the default.
...@@ -1687,7 +1689,11 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, ...@@ -1687,7 +1689,11 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_pic='-KPIC'
lt_cv_prog_cc_static='-Bstatic' lt_cv_prog_cc_static='-Bstatic'
lt_cv_prog_cc_wl='-Wl,' if test "x$host_vendor" = xsni; then
lt_cv_prog_cc_wl='-LD'
else
lt_cv_prog_cc_wl='-Wl,'
fi
;; ;;
uts4*) uts4*)
...@@ -1753,7 +1759,7 @@ fi ...@@ -1753,7 +1759,7 @@ fi
# Check for any special shared library compilation flags. # Check for any special shared library compilation flags.
if test -n "$lt_cv_prog_cc_shlib"; then if test -n "$lt_cv_prog_cc_shlib"; then
AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries]) AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries])
if echo "$old_CC $old_CFLAGS " | egrep -e "[[ ]]$lt_cv_prog_cc_shlib[[ ]]" >/dev/null; then : if echo "$old_CC $old_CFLAGS " | [egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]"] >/dev/null; then :
else else
AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure]) AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure])
lt_cv_prog_cc_can_build_shared=no lt_cv_prog_cc_can_build_shared=no
...@@ -2034,7 +2040,7 @@ EOF ...@@ -2034,7 +2040,7 @@ EOF
# can override, but on older systems we have to supply one (in ltdll.c) # can override, but on older systems we have to supply one (in ltdll.c)
if test "x$lt_cv_need_dllmain" = "xyes"; then if test "x$lt_cv_need_dllmain" = "xyes"; then
ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~ ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~
test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
else else
ltdll_obj= ltdll_obj=
...@@ -2047,12 +2053,12 @@ EOF ...@@ -2047,12 +2053,12 @@ EOF
# Be careful not to strip the DATA tag left be newer dlltools. # Be careful not to strip the DATA tag left be newer dlltools.
export_symbols_cmds="$ltdll_cmds"' export_symbols_cmds="$ltdll_cmds"'
$DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols' [sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//"] < $output_objdir/$soname-def > $export_symbols'
# If the export-symbols file already is a .def file (1st line # If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is. # is EXPORTS), use it as is.
# If DATA tags from a recent dlltool are present, honour them! # If DATA tags from a recent dlltool are present, honour them!
archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
cp $export_symbols $output_objdir/$soname-def; cp $export_symbols $output_objdir/$soname-def;
else else
echo EXPORTS > $output_objdir/$soname-def; echo EXPORTS > $output_objdir/$soname-def;
...@@ -2061,7 +2067,6 @@ EOF ...@@ -2061,7 +2067,6 @@ EOF
set dummy \$symbol; set dummy \$symbol;
case \[$]# in case \[$]# in
2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
4) echo " \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
*) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
esac; esac;
_lt_hint=`expr 1 + \$_lt_hint`; _lt_hint=`expr 1 + \$_lt_hint`;
...@@ -2174,12 +2179,10 @@ else ...@@ -2174,12 +2179,10 @@ else
# need to do runtime linking. # need to do runtime linking.
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
for ld_flag in $LDFLAGS; do for ld_flag in $LDFLAGS; do
case $ld_flag in if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
*-brtl*)
aix_use_runtimelinking=yes aix_use_runtimelinking=yes
break break
;; fi
esac
done done
esac esac
...@@ -2251,7 +2254,7 @@ else ...@@ -2251,7 +2254,7 @@ else
allow_undefined_flag='${wl}-berok' allow_undefined_flag='${wl}-berok'
# This is a bit strange, but is similar to how AIX traditionally builds # This is a bit strange, but is similar to how AIX traditionally builds
# it's shared libraries. # it's shared libraries.
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname' archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
fi fi
fi fi
;; ;;
...@@ -2293,9 +2296,8 @@ else ...@@ -2293,9 +2296,8 @@ else
esac esac
# FIXME: Relying on posixy $() will cause problems for # FIXME: Relying on posixy $() will cause problems for
# cross-compilation, but unfortunately the echo tests do not # cross-compilation, but unfortunately the echo tests do not
# yet detect zsh echo's removal of \ escapes. Also zsh mangles # yet detect zsh echo's removal of \ escapes.
# `"' quotes if we put them in here... so don't! archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
# We need to add '_' to the symbols in $export_symbols first # We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes hardcode_direct=yes
...@@ -2347,14 +2349,13 @@ else ...@@ -2347,14 +2349,13 @@ else
export_dynamic_flag_spec='${wl}-E' export_dynamic_flag_spec='${wl}-E'
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
if test "$GCC" = yes; then if test "$GCC" = yes; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='-rpath $libdir'
fi fi
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=: hardcode_libdir_separator=:
link_all_deplibs=yes link_all_deplibs=yes
;; ;;
...@@ -2382,7 +2383,7 @@ else ...@@ -2382,7 +2383,7 @@ else
hardcode_direct=yes hardcode_direct=yes
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir' hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E' export_dynamic_flag_spec='${wl}-E'
else else
...@@ -2392,7 +2393,7 @@ else ...@@ -2392,7 +2393,7 @@ else
hardcode_libdir_flag_spec='-R$libdir' hardcode_libdir_flag_spec='-R$libdir'
;; ;;
*) *)
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir' hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;; ;;
esac esac
...@@ -2445,35 +2446,7 @@ else ...@@ -2445,35 +2446,7 @@ else
;; ;;
solaris*) solaris*)
# gcc --version < 3.0 without binutils cannot create self contained
# shared libraries reliably, requiring libgcc.a to resolve some of
# the object symbols generated in some cases. Libraries that use
# assert need libgcc.a to resolve __eprintf, for example. Linking
# a copy of libgcc.a into every shared library to guarantee resolving
# such symbols causes other problems: According to Tim Van Holder
# <tim.van.holder@pandora.be>, C++ libraries end up with a separate
# (to the application) exception stack for one thing.
no_undefined_flag=' -z defs' no_undefined_flag=' -z defs'
if test "$GCC" = yes; then
case `$CC --version 2>/dev/null` in
[[12]].*)
cat <<EOF 1>&2
*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
*** create self contained shared libraries on Solaris systems, without
*** introducing a dependency on libgcc.a. Therefore, libtool is disabling
*** -no-undefined support, which will at least allow you to build shared
*** libraries. However, you may find that when you link such libraries
*** into an application without using GCC, you have to manually add
*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to
*** upgrade to a newer version of GCC. Another option is to rebuild your
*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
EOF
no_undefined_flag=
;;
esac
fi
# $CC -shared without GNU ld will not create a library from C++ # $CC -shared without GNU ld will not create a library from C++
# object files and a static libstdc++, better avoid it by now # object files and a static libstdc++, better avoid it by now
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
...@@ -2482,7 +2455,7 @@ EOF ...@@ -2482,7 +2455,7 @@ EOF
hardcode_libdir_flag_spec='-R$libdir' hardcode_libdir_flag_spec='-R$libdir'
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
case $host_os in case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; [solaris2.[0-5] | solaris2.[0-5].*]) ;;
*) # Supported since Solaris 2.6 (maybe 2.5.1?) *) # Supported since Solaris 2.6 (maybe 2.5.1?)
whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
esac esac
...@@ -2504,23 +2477,13 @@ EOF ...@@ -2504,23 +2477,13 @@ EOF
;; ;;
sysv4) sysv4)
case $host_vendor in if test "x$host_vendor" = xsno; then
sni) archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes # is this really true???
hardcode_direct=yes # is this really true??? else
;; archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
siemens) hardcode_direct=no #Motorola manual says yes, but my tests say they lie
## LD is ld it makes a PLAMLIB fi
## CC just makes a GrossModule.
archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
reload_cmds='$CC -r -o $output$reload_objs'
hardcode_direct=no
;;
motorola)
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=no #Motorola manual says yes, but my tests say they lie
;;
esac
runpath_var='LD_RUN_PATH' runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
;; ;;
...@@ -2661,9 +2624,6 @@ aix3*) ...@@ -2661,9 +2624,6 @@ aix3*)
aix4* | aix5*) aix4* | aix5*)
version_type=linux version_type=linux
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
if test "$host_cpu" = ia64; then if test "$host_cpu" = ia64; then
# AIX 5 supports IA64 # AIX 5 supports IA64
library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
...@@ -2675,15 +2635,15 @@ aix4* | aix5*) ...@@ -2675,15 +2635,15 @@ aix4* | aix5*)
# depend on `.', always an invalid library. This was fixed in # depend on `.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0. # development snapshots of GCC prior to 3.0.
case $host_os in case $host_os in
aix4 | aix4.[[01]] | aix4.[[01]].*) [ aix4 | aix4.[01] | aix4.[01].*)]
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes ' echo ' yes '
echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
: :
else else
can_build_shared=no can_build_shared=no
fi fi
;; ;;
esac esac
# AIX (on Power*) has no versioning support, so currently we can # AIX (on Power*) has no versioning support, so currently we can
# not hardcode correct soname into executable. Probably we can # not hardcode correct soname into executable. Probably we can
...@@ -2702,13 +2662,12 @@ aix4* | aix5*) ...@@ -2702,13 +2662,12 @@ aix4* | aix5*)
fi fi
shlibpath_var=LIBPATH shlibpath_var=LIBPATH
fi fi
hardcode_into_libs=yes
;; ;;
amigaos*) amigaos*)
library_names_spec='$libname.ixlibrary $libname.a' library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs. # Create ${libname}_ixlibrary.a entries in /sys/libs.
finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | [$Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\'']`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
;; ;;
beos*) beos*)
...@@ -2739,7 +2698,7 @@ cygwin* | mingw* | pw32*) ...@@ -2739,7 +2698,7 @@ cygwin* | mingw* | pw32*)
case $GCC,$host_os in case $GCC,$host_os in
yes,cygwin*) yes,cygwin*)
library_names_spec='$libname.dll.a' library_names_spec='$libname.dll.a'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~ dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~ test -d \$dldir || mkdir -p \$dldir~
...@@ -2749,14 +2708,14 @@ cygwin* | mingw* | pw32*) ...@@ -2749,14 +2708,14 @@ cygwin* | mingw* | pw32*)
$rm \$dlpath' $rm \$dlpath'
;; ;;
yes,mingw*) yes,mingw*)
library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"` sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
;; ;;
yes,pw32*) yes,pw32*)
library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
;; ;;
*) *)
library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib' library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll $libname.lib'
;; ;;
esac esac
dynamic_linker='Win32 ld.exe' dynamic_linker='Win32 ld.exe'
...@@ -2782,18 +2741,6 @@ freebsd1*) ...@@ -2782,18 +2741,6 @@ freebsd1*)
dynamic_linker=no dynamic_linker=no
;; ;;
freebsd*-gnu*)
version_type=linux
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
soname_spec='${libname}${release}.so$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='GNU/FreeBSD ld.so'
;;
freebsd*) freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat version_type=freebsd-$objformat
...@@ -2845,17 +2792,14 @@ hpux9* | hpux10* | hpux11*) ...@@ -2845,17 +2792,14 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib' postinstall_cmds='chmod 555 $lib'
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
case $host_os in version_type=irix
nonstopux*) version_type=nonstopux ;;
*) version_type=irix ;;
esac
need_lib_prefix=no need_lib_prefix=no
need_version=no need_version=no
soname_spec='${libname}${release}.so$major' soname_spec='${libname}${release}.so$major'
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
case $host_os in case $host_os in
irix5* | nonstopux*) irix5*)
libsuff= shlibsuff= libsuff= shlibsuff=
;; ;;
*) *)
...@@ -2959,13 +2903,11 @@ os2*) ...@@ -2959,13 +2903,11 @@ os2*)
osf3* | osf4* | osf5*) osf3* | osf4* | osf5*)
version_type=osf version_type=osf
need_version=no need_version=no
need_lib_prefix=no soname_spec='${libname}${release}.so'
soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
hardcode_into_libs=yes
;; ;;
sco3.2v5*) sco3.2v5*)
...@@ -3008,12 +2950,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ...@@ -3008,12 +2950,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
case $host_vendor in case $host_vendor in
sni) sni)
shlibpath_overrides_runpath=no shlibpath_overrides_runpath=no
need_lib_prefix=no
export_dynamic_flag_spec='${wl}-Blargedynsym'
runpath_var=LD_RUN_PATH
;;
siemens)
need_lib_prefix=no
;; ;;
motorola) motorola)
need_lib_prefix=no need_lib_prefix=no
...@@ -3168,7 +3104,7 @@ if test -f "$ltmain"; then ...@@ -3168,7 +3104,7 @@ if test -f "$ltmain"; then
# Now quote all the things that may contain metacharacters while being # Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the # careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script. # variables and quote the copies for generation of the libtool script.
for var in echo old_CC old_CFLAGS SED \ for var in echo old_CC old_CFLAGS \
AR AR_FLAGS CC LD LN_S NM SHELL \ AR AR_FLAGS CC LD LN_S NM SHELL \
reload_flag reload_cmds wl \ reload_flag reload_cmds wl \
pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
...@@ -3230,11 +3166,8 @@ if test -f "$ltmain"; then ...@@ -3230,11 +3166,8 @@ if test -f "$ltmain"; then
# configuration script generated by Autoconf, you may include it under # configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program. # the same distribution terms that you use for the rest of that program.
# A sed that does not truncate output.
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n. # Sed that helps us avoid accidentally triggering echo(1) options like -n.
Xsed="${SED} -e s/^X//" Xsed="sed -e s/^X//"
# The HP-UX ksh and POSIX shell print the target directory to stdout # The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set. # if CDPATH is set.
...@@ -3903,7 +3836,6 @@ test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) ...@@ -3903,7 +3836,6 @@ test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl
AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
ac_prog=ld ac_prog=ld
if test "$GCC" = yes; then if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path. # Check if gcc -print-prog-name=ld gives a path.
...@@ -3917,8 +3849,8 @@ if test "$GCC" = yes; then ...@@ -3917,8 +3849,8 @@ if test "$GCC" = yes; then
esac esac
case $ac_prog in case $ac_prog in
# Accept absolute paths. # Accept absolute paths.
[[\\/]]* | [[A-Za-z]]:[[\\/]]*) [[\\/]* | [A-Za-z]:[\\/]*)]
re_direlt='/[[^/]][[^/]]*/\.\./' [re_direlt='/[^/][^/]*/\.\./']
# Canonicalize the path of ld # Canonicalize the path of ld
ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
...@@ -3942,7 +3874,7 @@ else ...@@ -3942,7 +3874,7 @@ else
fi fi
AC_CACHE_VAL(lt_cv_path_LD, AC_CACHE_VAL(lt_cv_path_LD,
[if test -z "$LD"; then [if test -z "$LD"; then
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
...@@ -3995,7 +3927,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag" ...@@ -3995,7 +3927,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag"
# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
# -- PORTME fill in with the dynamic library characteristics # -- PORTME fill in with the dynamic library characteristics
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
[AC_CACHE_CHECK([how to recognise dependent libraries], [AC_CACHE_CHECK([how to recognise dependant libraries],
lt_cv_deplibs_check_method, lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD' [lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file= lt_cv_file_magic_test_file=
...@@ -4006,7 +3938,7 @@ lt_cv_deplibs_check_method='unknown' ...@@ -4006,7 +3938,7 @@ lt_cv_deplibs_check_method='unknown'
# `unknown' -- same as none, but documents that we really don't know. # `unknown' -- same as none, but documents that we really don't know.
# 'pass_all' -- all dependencies passed with no checks. # 'pass_all' -- all dependencies passed with no checks.
# 'test_compile' -- check by making test program. # 'test_compile' -- check by making test program.
# 'file_magic [[regex]]' -- check by looking for files in library path # ['file_magic [regex]'] -- check by looking for files in library path
# which responds to the $file_magic_cmd with a given egrep regex. # which responds to the $file_magic_cmd with a given egrep regex.
# If you have `file' or equivalent on your system and you're not sure # If you have `file' or equivalent on your system and you're not sure
# whether `pass_all' will *always* work, you probably want this one. # whether `pass_all' will *always* work, you probably want this one.
...@@ -4021,7 +3953,7 @@ beos*) ...@@ -4021,7 +3953,7 @@ beos*)
;; ;;
bsdi4*) bsdi4*)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_cmd='/usr/bin/file -L'
lt_cv_file_magic_test_file=/shlib/libc.so lt_cv_file_magic_test_file=/shlib/libc.so
;; ;;
...@@ -4050,7 +3982,7 @@ freebsd*) ...@@ -4050,7 +3982,7 @@ freebsd*)
i*86 ) i*86 )
# Not sure whether the presence of OpenBSD here was a mistake. # Not sure whether the presence of OpenBSD here was a mistake.
# Let's accept both of them until this is cleared up. # Let's accept both of them until this is cleared up.
lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' [lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;; ;;
...@@ -4065,14 +3997,14 @@ gnu*) ...@@ -4065,14 +3997,14 @@ gnu*)
;; ;;
hpux10.20*|hpux11*) hpux10.20*|hpux11*)
lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=/usr/lib/libc.sl lt_cv_file_magic_test_file=/usr/lib/libc.sl
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
case $host_os in case $host_os in
irix5* | nonstopux*) irix5*)
# this will be overridden with pass_all, but let us keep it just in case # this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
;; ;;
...@@ -4084,7 +4016,7 @@ irix5* | irix6* | nonstopux*) ...@@ -4084,7 +4016,7 @@ irix5* | irix6* | nonstopux*)
*) libmagic=never-match;; *) libmagic=never-match;;
esac esac
# this will be overridden with pass_all, but let us keep it just in case # this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" [lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
;; ;;
esac esac
lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
...@@ -4094,25 +4026,25 @@ irix5* | irix6* | nonstopux*) ...@@ -4094,25 +4026,25 @@ irix5* | irix6* | nonstopux*)
# This must be Linux ELF. # This must be Linux ELF.
linux-gnu*) linux-gnu*)
case $host_cpu in case $host_cpu in
alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | arm* | m68k) alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
lt_cv_deplibs_check_method=pass_all ;; lt_cv_deplibs_check_method=pass_all ;;
*) *)
# glibc up to 2.1.1 does not perform some relocations on ARM # glibc up to 2.1.1 does not perform some relocations on ARM
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;]
esac esac
lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
;; ;;
netbsd*) netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$' [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
else else
lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$' [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
fi fi
;; ;;
newos6*) newos6*)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=/usr/lib/libnls.so lt_cv_file_magic_test_file=/usr/lib/libnls.so
;; ;;
...@@ -4143,14 +4075,14 @@ solaris*) ...@@ -4143,14 +4075,14 @@ solaris*)
lt_cv_file_magic_test_file=/lib/libc.so lt_cv_file_magic_test_file=/lib/libc.so
;; ;;
sysv5uw[[78]]* | sysv4*uw2*) [sysv5uw[78]* | sysv4*uw2*)]
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
case $host_vendor in case $host_vendor in
motorola) motorola)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
;; ;;
ncr) ncr)
...@@ -4158,16 +4090,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ...@@ -4158,16 +4090,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
;; ;;
sequent) sequent)
lt_cv_file_magic_cmd='/bin/file' lt_cv_file_magic_cmd='/bin/file'
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )']
;; ;;
sni) sni)
lt_cv_file_magic_cmd='/bin/file' lt_cv_file_magic_cmd='/bin/file'
lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" [lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"]
lt_cv_file_magic_test_file=/lib/libc.so lt_cv_file_magic_test_file=/lib/libc.so
;; ;;
siemens)
lt_cv_deplibs_check_method=pass_all
;;
esac esac
;; ;;
esac esac
...@@ -4179,14 +4108,13 @@ deplibs_check_method=$lt_cv_deplibs_check_method ...@@ -4179,14 +4108,13 @@ deplibs_check_method=$lt_cv_deplibs_check_method
# AC_PROG_NM - find the path to a BSD-compatible name lister # AC_PROG_NM - find the path to a BSD-compatible name lister
AC_DEFUN([AC_PROG_NM], AC_DEFUN([AC_PROG_NM],
[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl [AC_MSG_CHECKING([for BSD-compatible nm])
AC_MSG_CHECKING([for BSD-compatible nm])
AC_CACHE_VAL(lt_cv_path_NM, AC_CACHE_VAL(lt_cv_path_NM,
[if test -n "$NM"; then [if test -n "$NM"; then
# Let the user override the test. # Let the user override the test.
lt_cv_path_NM="$NM" lt_cv_path_NM="$NM"
else else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
tmp_nm=$ac_dir/${ac_tool_prefix}nm tmp_nm=$ac_dir/${ac_tool_prefix}nm
...@@ -4233,12 +4161,12 @@ esac ...@@ -4233,12 +4161,12 @@ esac
]) ])
# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
# the libltdl convenience library and LTDLINCL to the include flags for # the libltdl convenience library and INCLTDL to the include flags for
# the libltdl header and adds --enable-ltdl-convenience to the # the libltdl header and adds --enable-ltdl-convenience to the
# configure arguments. Note that LIBLTDL and LTDLINCL are not # configure arguments. Note that LIBLTDL and INCLTDL are not
# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not # AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not
# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed # provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed
# with '${top_builddir}/' and LTDLINCL will be prefixed with # with '${top_builddir}/' and INCLTDL will be prefixed with
# '${top_srcdir}/' (note the single quotes!). If your package is not # '${top_srcdir}/' (note the single quotes!). If your package is not
# flat and you're not using automake, define top_builddir and # flat and you're not using automake, define top_builddir and
# top_srcdir appropriately in the Makefiles. # top_srcdir appropriately in the Makefiles.
...@@ -4250,18 +4178,16 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE], ...@@ -4250,18 +4178,16 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
esac esac
LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
# For backwards non-gettext consistent compatibility...
INCLTDL="$LTDLINCL"
]) ])
# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
# the libltdl installable library and LTDLINCL to the include flags for # the libltdl installable library and INCLTDL to the include flags for
# the libltdl header and adds --enable-ltdl-install to the configure # the libltdl header and adds --enable-ltdl-install to the configure
# arguments. Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is # arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed # AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed
# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will # libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will
# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed # be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
# with '${top_srcdir}/' (note the single quotes!). If your package is # with '${top_srcdir}/' (note the single quotes!). If your package is
# not flat and you're not using automake, define top_builddir and # not flat and you're not using automake, define top_builddir and
# top_srcdir appropriately in the Makefiles. # top_srcdir appropriately in the Makefiles.
...@@ -4279,14 +4205,12 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE], ...@@ -4279,14 +4205,12 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
if test x"$enable_ltdl_install" = x"yes"; then if test x"$enable_ltdl_install" = x"yes"; then
ac_configure_args="$ac_configure_args --enable-ltdl-install" ac_configure_args="$ac_configure_args --enable-ltdl-install"
LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
else else
ac_configure_args="$ac_configure_args --enable-ltdl-install=no" ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
LIBLTDL="-lltdl" LIBLTDL="-lltdl"
LTDLINCL= INCLTDL=
fi fi
# For backwards non-gettext consistent compatibility...
INCLTDL="$LTDLINCL"
]) ])
# old names # old names
...@@ -4301,95 +4225,6 @@ AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) ...@@ -4301,95 +4225,6 @@ AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
# This is just to silence aclocal about the macro not being used # This is just to silence aclocal about the macro not being used
ifelse([AC_DISABLE_FAST_INSTALL]) ifelse([AC_DISABLE_FAST_INSTALL])
# NOTE: This macro has been submitted for inclusion into #
# GNU Autoconf as AC_PROG_SED. When it is available in #
# a released version of Autoconf we should remove this #
# macro and use it instead. #
# LT_AC_PROG_SED
# --------------
# Check for a fully-functional sed program, that truncates
# as few characters as possible. Prefer GNU sed if found.
AC_DEFUN([LT_AC_PROG_SED],
[AC_MSG_CHECKING([for a sed that does not truncate output])
AC_CACHE_VAL(lt_cv_path_SED,
[# Loop through the user's path and test for sed and gsed.
# Then use that list of sed's as ones to test for truncation.
as_executable_p="test -f"
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
_sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
fi
done
done
done
# Create a temporary directory, and hook for its removal unless debugging.
$debug ||
{
trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
trap '{ (exit 1); exit 1; }' 1 2 13 15
}
# Create a (secure) tmp directory for tmp files.
: ${TMPDIR=/tmp}
{
tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
test -n "$tmp" && test -d "$tmp"
} ||
{
tmp=$TMPDIR/sed$$-$RANDOM
(umask 077 && mkdir $tmp)
} ||
{
echo "$me: cannot create a temporary directory in $TMPDIR" >&2
{ (exit 1); exit 1; }
}
_max=0
_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for _sed in $_sed_list /usr/xpg4/bin/sed; do
test ! -f ${_sed} && break
cat /dev/null > "$tmp/sed.in"
_count=0
echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
# Check for GNU sed and select it if it is found.
if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
lt_cv_path_SED=${_sed}
break
fi
while true; do
cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
mv "$tmp/sed.tmp" "$tmp/sed.in"
cp "$tmp/sed.in" "$tmp/sed.nl"
echo >>"$tmp/sed.nl"
${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
# 40000 chars as input seems more than enough
test $_count -gt 10 && break
_count=`expr $_count + 1`
if test $_count -gt $_max; then
_max=$_count
lt_cv_path_SED=$_sed
fi
done
done
rm -rf "$tmp"
])
if test "X$SED" != "X"; then
lt_cv_path_SED=$SED
else
SED=$lt_cv_path_SED
fi
AC_MSG_RESULT([$SED])
])
# ao.m4 # ao.m4
# Configure paths for libao # Configure paths for libao
# Jack Moffitt <jack@icecast.org> 10-21-2000 # Jack Moffitt <jack@icecast.org> 10-21-2000
...@@ -4662,6 +4497,7 @@ dnl ...@@ -4662,6 +4497,7 @@ dnl
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <vorbis/codec.h> #include <vorbis/codec.h>
#include <vorbis/vorbisenc.h>
int main () int main ()
{ {
...@@ -4670,7 +4506,7 @@ int main () ...@@ -4670,7 +4506,7 @@ int main ()
vorbis_info vi; vorbis_info vi;
vorbis_info_init (&vi); vorbis_info_init (&vi);
vorbis_encode_init (&vi, 2, 44100, -1, 128, -1); vorbis_encode_init (&vi, 2, 44100, -1, 128000, -1);
vorbis_analysis_init (&vd, &vi); vorbis_analysis_init (&vd, &vi);
vorbis_block_init (&vd, &vb); vorbis_block_init (&vd, &vb);
/* this function was added in 1.0rc3, so this is what we're testing for */ /* this function was added in 1.0rc3, so this is what we're testing for */
...@@ -4695,7 +4531,7 @@ int main () ...@@ -4695,7 +4531,7 @@ int main ()
else else
echo "*** Could not run Vorbis test program, checking why..." echo "*** Could not run Vorbis test program, checking why..."
CFLAGS="$CFLAGS $VORBIS_CFLAGS" CFLAGS="$CFLAGS $VORBIS_CFLAGS"
LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS" LIBS="$LIBS $VORBIS_LIBS $VORBISENC_LIBS $OGG_LIBS"
AC_TRY_LINK([ AC_TRY_LINK([
#include <stdio.h> #include <stdio.h>
#include <vorbis/codec.h> #include <vorbis/codec.h>
......
command.c
View file @ d94eaf58
...@@ -113,7 +113,7 @@ int processCommand(FILE * fp, int argArrayLength, char ** argArray) { ...@@ -113,7 +113,7 @@ int processCommand(FILE * fp, int argArrayLength, char ** argArray) {
} }
if(0==strcmp(argArray[0],COMMAND_PLAY)) { if(0==strcmp(argArray[0],COMMAND_PLAY)) {
int song; int song = 0;
char * test; char * test;
if(argArrayLength>2) { if(argArrayLength>2) {
myfprintf(fp,"%s too many arguments for \"%s\"\n",COMMAND_RESPOND_ERROR,argArray[0]); myfprintf(fp,"%s too many arguments for \"%s\"\n",COMMAND_RESPOND_ERROR,argArray[0]);
...@@ -126,7 +126,6 @@ int processCommand(FILE * fp, int argArrayLength, char ** argArray) { ...@@ -126,7 +126,6 @@ int processCommand(FILE * fp, int argArrayLength, char ** argArray) {
return -1; return -1;
} }
} }
else song = 0;
return playPlaylist(fp,song); return playPlaylist(fp,song);
} }
else if(0==strcmp(argArray[0],COMMAND_STOP)) { else if(0==strcmp(argArray[0],COMMAND_STOP)) {
......
conf.c
View file @ d94eaf58
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#define MAX_STRING_SIZE MAXPATHLEN+80 #define MAX_STRING_SIZE MAXPATHLEN+80
#define CONF_NUMBER_OF_PARAMS 11 #define CONF_NUMBER_OF_PARAMS 13
#define CONF_NUMBER_OF_PATHS 4 #define CONF_NUMBER_OF_PATHS 4
#define CONF_NUMBER_OF_REQUIRED 5 #define CONF_NUMBER_OF_REQUIRED 5
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
#define CONF_MAX_PLAYLIST_LENGTH_DEFAULT "4096" #define CONF_MAX_PLAYLIST_LENGTH_DEFAULT "4096"
#define CONF_BUFFER_BEFORE_PLAY_DEFAULT "25%" #define CONF_BUFFER_BEFORE_PLAY_DEFAULT "25%"
#define CONF_STOP_ON_ERROR_DEFAULT "yes" #define CONF_STOP_ON_ERROR_DEFAULT "yes"
#define CONF_MAX_COMMAND_LIST_SIZE_DEFAULT "2048"
#define CONF_MAX_OUTPUT_BUFFER_SIZE_DEFAULT "2048"
char conf_strings[CONF_NUMBER_OF_PARAMS][24] = { char conf_strings[CONF_NUMBER_OF_PARAMS][24] = {
"port", "port",
...@@ -50,7 +52,9 @@ char conf_strings[CONF_NUMBER_OF_PARAMS][24] = { ...@@ -50,7 +52,9 @@ char conf_strings[CONF_NUMBER_OF_PARAMS][24] = {
"max_connections", "max_connections",
"max_playlist_length", "max_playlist_length",
"buffer_before_play", "buffer_before_play",
"stop_on_error" "stop_on_error",
"max_command_list_size",
"max_output_buffer_size"
}; };
int conf_absolutePaths[CONF_NUMBER_OF_PATHS] = { int conf_absolutePaths[CONF_NUMBER_OF_PATHS] = {
...@@ -82,6 +86,8 @@ void initConf() { ...@@ -82,6 +86,8 @@ void initConf() {
conf_params[CONF_MAX_PLAYLIST_LENGTH] = strdup(CONF_MAX_PLAYLIST_LENGTH_DEFAULT); conf_params[CONF_MAX_PLAYLIST_LENGTH] = strdup(CONF_MAX_PLAYLIST_LENGTH_DEFAULT);
conf_params[CONF_BUFFER_BEFORE_PLAY] = strdup(CONF_BUFFER_BEFORE_PLAY_DEFAULT); conf_params[CONF_BUFFER_BEFORE_PLAY] = strdup(CONF_BUFFER_BEFORE_PLAY_DEFAULT);
conf_params[CONF_STOP_ON_ERROR] = strdup(CONF_STOP_ON_ERROR_DEFAULT); conf_params[CONF_STOP_ON_ERROR] = strdup(CONF_STOP_ON_ERROR_DEFAULT);
conf_params[CONF_MAX_COMMAND_LIST_SIZE] = strdup(CONF_MAX_COMMAND_LIST_SIZE_DEFAULT);
conf_params[CONF_MAX_OUTPUT_BUFFER_SIZE] = strdup(CONF_MAX_OUTPUT_BUFFER_SIZE_DEFAULT);
} }
char ** readConf(char * file) { char ** readConf(char * file) {
......
conf.h
View file @ d94eaf58
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
#define CONF_MAX_PLAYLIST_LENGTH 8 #define CONF_MAX_PLAYLIST_LENGTH 8
#define CONF_BUFFER_BEFORE_PLAY 9 #define CONF_BUFFER_BEFORE_PLAY 9
#define CONF_STOP_ON_ERROR 10 #define CONF_STOP_ON_ERROR 10
#define CONF_MAX_COMMAND_LIST_SIZE 11
#define CONF_MAX_OUTPUT_BUFFER_SIZE 12
/* do not free the return value, it is a static variable */ /* do not free the return value, it is a static variable */
char ** readConf(char * file); char ** readConf(char * file);
......
config.guess
View file @ d94eaf58
#! /bin/sh #! /bin/sh
# Attempt to guess a canonical system name. # Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. # Free Software Foundation, Inc.
timestamp='2003-05-19' timestamp='2001-08-23'
# This file is free software; you can redistribute it and/or modify it # This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by # under the terms of the GNU General Public License as published by
...@@ -24,9 +24,8 @@ timestamp='2003-05-19' ...@@ -24,9 +24,8 @@ timestamp='2003-05-19'
# configuration script generated by Autoconf, you may include it under # configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program. # the same distribution terms that you use for the rest of that program.
# Originally written by Per Bothner <per@bothner.com>. # Written by Per Bothner <bothner@cygnus.com>.
# Please send patches to <config-patches@gnu.org>. Submit a context # Please send patches to <config-patches@gnu.org>.
# diff and a properly formatted ChangeLog entry.
# #
# This script attempts to guess a canonical system name similar to # This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and # config.sub. If it succeeds, it prints the system name on stdout, and
...@@ -88,41 +87,30 @@ if test $# != 0; then ...@@ -88,41 +87,30 @@ if test $# != 0; then
exit 1 exit 1
fi fi
trap 'exit 1' 1 2 15
# CC_FOR_BUILD -- compiler used by this script. Note that the use of a dummy=dummy-$$
# compiler to aid in system detection is discouraged as it requires trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
# temporary files to be created and, as you can see below, it is a
# headache to deal with in a portable fashion.
# CC_FOR_BUILD -- compiler used by this script.
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
# use `HOST_CC' if defined, but it is deprecated. # use `HOST_CC' if defined, but it is deprecated.
# Portable tmp directory creation inspired by the Autoconf team. set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
,,) echo "int dummy(){}" > $dummy.c ;
set_cc_for_build=' for c in cc gcc c89 ; do
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; if test $? = 0 ; then
: ${TMPDIR=/tmp} ;
{ tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
dummy=$tmp/dummy ;
tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
case $CC_FOR_BUILD,$HOST_CC,$CC in
,,) echo "int x;" > $dummy.c ;
for c in cc gcc c89 c99 ; do
if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
CC_FOR_BUILD="$c"; break ; CC_FOR_BUILD="$c"; break ;
fi ; fi ;
done ; done ;
rm -f $dummy.c $dummy.o $dummy.rel ;
if test x"$CC_FOR_BUILD" = x ; then if test x"$CC_FOR_BUILD" = x ; then
CC_FOR_BUILD=no_compiler_found ; CC_FOR_BUILD=no_compiler_found ;
fi fi
;; ;;
,,*) CC_FOR_BUILD=$CC ;; ,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;;
esac ;' esac'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe. # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi@noc.rutgers.edu 1994-08-24) # (ghazi@noc.rutgers.edu 1994-08-24)
...@@ -139,30 +127,29 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown ...@@ -139,30 +127,29 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*) *:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or # Netbsd (nbsd) targets should (where applicable) match one or
# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old # switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward # object file format. This provides both forward
# compatibility and a consistent mechanism for selecting the # compatibility and a consistent mechanism for selecting the
# object file format. # object file format.
# # Determine the machine/vendor (is the vendor relevant).
# Note: NetBSD doesn't particularly care about the vendor case "${UNAME_MACHINE}" in
# portion of the name. We always set it to "unknown". amiga) machine=m68k-unknown ;;
sysctl="sysctl -n hw.machine_arch" arm32) machine=arm-unknown ;;
UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ atari*) machine=m68k-atari ;;
/usr/sbin/$sysctl 2>/dev/null || echo unknown)` sun3*) machine=m68k-sun ;;
case "${UNAME_MACHINE_ARCH}" in mac68k) machine=m68k-apple ;;
armeb) machine=armeb-unknown ;; macppc) machine=powerpc-apple ;;
arm*) machine=arm-unknown ;; hp3[0-9][05]) machine=m68k-hp ;;
sh3el) machine=shl-unknown ;; ibmrt|romp-ibm) machine=romp-ibm ;;
sh3eb) machine=sh-unknown ;; *) machine=${UNAME_MACHINE}-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac esac
# The Operating System including object format, if it has switched # The Operating System including object format, if it has switched
# to ELF recently, or will in the future. # to ELF recently, or will in the future.
case "${UNAME_MACHINE_ARCH}" in case "${UNAME_MACHINE}" in
arm*|i386|m68k|ns32k|sh3*|sparc|vax) i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
eval $set_cc_for_build eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep __ELF__ >/dev/null | grep __ELF__ >/dev/null
...@@ -179,107 +166,73 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ...@@ -179,107 +166,73 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
;; ;;
esac esac
# The OS release # The OS release
# Debian GNU/NetBSD machines have a different userland, and release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
# thus, need a distinct triplet. However, they do not need
# kernel version information, so it can be replaced with a
# suitable tag, in the style of linux-gnu.
case "${UNAME_VERSION}" in
Debian*)
release='-gnu'
;;
*)
release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form: # contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}" echo "${machine}-${os}${release}"
exit 0 ;; exit 0 ;;
amiga:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
arc:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
hp300:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
mac68k:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
macppc:OpenBSD:*:*)
echo powerpc-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
mvme68k:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
mvme88k:OpenBSD:*:*)
echo m88k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
mvmeppc:OpenBSD:*:*)
echo powerpc-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
pmax:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
sgi:OpenBSD:*:*)
echo mipseb-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
sun3:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
wgrisc:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
*:OpenBSD:*:*)
echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
alpha:OSF1:*:*) alpha:OSF1:*:*)
if test $UNAME_RELEASE = "V4.0"; then if test $UNAME_RELEASE = "V4.0"; then
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
fi fi
# According to Compaq, /usr/sbin/psrinfo has been available on
# OSF/1 and Tru64 systems produced since 1995. I hope that
# covers most systems running today. This code pipes the CPU
# types through head -n 1, so we only detect the type of CPU 0.
ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
case "$ALPHA_CPU_TYPE" in
"EV4 (21064)")
UNAME_MACHINE="alpha" ;;
"EV4.5 (21064)")
UNAME_MACHINE="alpha" ;;
"LCA4 (21066/21068)")
UNAME_MACHINE="alpha" ;;
"EV5 (21164)")
UNAME_MACHINE="alphaev5" ;;
"EV5.6 (21164A)")
UNAME_MACHINE="alphaev56" ;;
"EV5.6 (21164PC)")
UNAME_MACHINE="alphapca56" ;;
"EV5.7 (21164PC)")
UNAME_MACHINE="alphapca57" ;;
"EV6 (21264)")
UNAME_MACHINE="alphaev6" ;;
"EV6.7 (21264A)")
UNAME_MACHINE="alphaev67" ;;
"EV6.8CB (21264C)")
UNAME_MACHINE="alphaev68" ;;
"EV6.8AL (21264B)")
UNAME_MACHINE="alphaev68" ;;
"EV6.8CX (21264D)")
UNAME_MACHINE="alphaev68" ;;
"EV6.9A (21264/EV69A)")
UNAME_MACHINE="alphaev69" ;;
"EV7 (21364)")
UNAME_MACHINE="alphaev7" ;;
"EV7.9 (21364A)")
UNAME_MACHINE="alphaev79" ;;
esac
# A Vn.n version is a released version. # A Vn.n version is a released version.
# A Tn.n version is a released field test version. # A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel. # A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r. # 1.2 uses "1.2" for uname -r.
cat <<EOF >$dummy.s
.data
\$Lformat:
.byte 37,100,45,37,120,10,0 # "%d-%x\n"
.text
.globl main
.align 4
.ent main
main:
.frame \$30,16,\$26,0
ldgp \$29,0(\$27)
.prologue 1
.long 0x47e03d80 # implver \$0
lda \$2,-1
.long 0x47e20c21 # amask \$2,\$1
lda \$16,\$Lformat
mov \$0,\$17
not \$1,\$18
jsr \$26,printf
ldgp \$29,0(\$26)
mov 0,\$16
jsr \$26,exit
.end main
EOF
eval $set_cc_for_build
$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
if test "$?" = 0 ; then
case `./$dummy` in
0-0)
UNAME_MACHINE="alpha"
;;
1-0)
UNAME_MACHINE="alphaev5"
;;
1-1)
UNAME_MACHINE="alphaev56"
;;
1-101)
UNAME_MACHINE="alphapca56"
;;
2-303)
UNAME_MACHINE="alphaev6"
;;
2-307)
UNAME_MACHINE="alphaev67"
;;
2-1307)
UNAME_MACHINE="alphaev68"
;;
esac
fi
rm -f $dummy.s $dummy
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
exit 0 ;; exit 0 ;;
Alpha\ *:Windows_NT*:*) Alpha\ *:Windows_NT*:*)
...@@ -294,11 +247,29 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ...@@ -294,11 +247,29 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
Amiga*:UNIX_System_V:4.0:*) Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4 echo m68k-unknown-sysv4
exit 0;; exit 0;;
amiga:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
*:[Aa]miga[Oo][Ss]:*:*) *:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos echo ${UNAME_MACHINE}-unknown-amigaos
exit 0 ;; exit 0 ;;
*:[Mm]orph[Oo][Ss]:*:*) arc64:OpenBSD:*:*)
echo ${UNAME_MACHINE}-unknown-morphos echo mips64el-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
arc:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
hkmips:OpenBSD:*:*)
echo mips-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
pmax:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
sgi:OpenBSD:*:*)
echo mips-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
wgrisc:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
*:OS/390:*:*) *:OS/390:*:*)
echo i370-ibm-openedition echo i370-ibm-openedition
...@@ -320,10 +291,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ...@@ -320,10 +291,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
NILE*:*:*:dcosx) NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4 echo pyramid-pyramid-svr4
exit 0 ;; exit 0 ;;
DRS?6000:UNIX_SV:4.2*:7*)
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7 && exit 0 ;;
esac ;;
sun4H:SunOS:5.*:*) sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit 0 ;; exit 0 ;;
...@@ -352,7 +319,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ...@@ -352,7 +319,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo m68k-sun-sunos${UNAME_RELEASE} echo m68k-sun-sunos${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
sun*:*:4.2BSD:*) sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
case "`/bin/arch`" in case "`/bin/arch`" in
sun3) sun3)
...@@ -366,6 +333,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ...@@ -366,6 +333,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
aushp:SunOS:*:*) aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE} echo sparc-auspex-sunos${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
sparc*:NetBSD:*)
echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
exit 0 ;;
atari*:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
# The situation for MiNT is a little confusing. The machine name # The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not # can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor # "atarist" or "atariste" at least should have a processor
...@@ -392,6 +365,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ...@@ -392,6 +365,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE} echo m68k-unknown-mint${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
sun3*:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
mac68k:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
mvme68k:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
mvme88k:OpenBSD:*:*)
echo m88k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
powerpc:machten:*:*) powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE} echo powerpc-apple-machten${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
...@@ -408,7 +393,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ...@@ -408,7 +393,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo clipper-intergraph-clix${UNAME_RELEASE} echo clipper-intergraph-clix${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
mips:*:*:UMIPS | mips:*:*:RISCos) mips:*:*:UMIPS | mips:*:*:RISCos)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c sed 's/^ //' << EOF >$dummy.c
#ifdef __cplusplus #ifdef __cplusplus
#include <stdio.h> /* for printf() prototype */ #include <stdio.h> /* for printf() prototype */
...@@ -430,20 +414,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ...@@ -430,20 +414,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
exit (-1); exit (-1);
} }
EOF EOF
$CC_FOR_BUILD -o $dummy $dummy.c \ eval $set_cc_for_build
&& $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ $CC_FOR_BUILD $dummy.c -o $dummy \
&& exit 0 && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
&& rm -f $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
echo mips-mips-riscos${UNAME_RELEASE} echo mips-mips-riscos${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
Motorola:PowerMAX_OS:*:*) Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax echo powerpc-motorola-powermax
exit 0 ;; exit 0 ;;
Motorola:*:4.3:PL8-*)
echo powerpc-harris-powermax
exit 0 ;;
Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
echo powerpc-harris-powermax
exit 0 ;;
Night_Hawk:Power_UNIX:*:*) Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix echo powerpc-harris-powerunix
exit 0 ;; exit 0 ;;
...@@ -504,7 +484,6 @@ EOF ...@@ -504,7 +484,6 @@ EOF
exit 0 ;; exit 0 ;;
*:AIX:2:3) *:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c sed 's/^ //' << EOF >$dummy.c
#include <sys/systemcfg.h> #include <sys/systemcfg.h>
...@@ -516,7 +495,9 @@ EOF ...@@ -516,7 +495,9 @@ EOF
exit(0); exit(0);
} }
EOF EOF
$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 eval $set_cc_for_build
$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
echo rs6000-ibm-aix3.2.5 echo rs6000-ibm-aix3.2.5
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4 echo rs6000-ibm-aix3.2.4
...@@ -525,7 +506,7 @@ EOF ...@@ -525,7 +506,7 @@ EOF
fi fi
exit 0 ;; exit 0 ;;
*:AIX:*:[45]) *:AIX:*:[45])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000 IBM_ARCH=rs6000
else else
...@@ -565,8 +546,10 @@ EOF ...@@ -565,8 +546,10 @@ EOF
9000/31? ) HP_ARCH=m68000 ;; 9000/31? ) HP_ARCH=m68000 ;;
9000/[34]?? ) HP_ARCH=m68k ;; 9000/[34]?? ) HP_ARCH=m68k ;;
9000/[678][0-9][0-9]) 9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then case "${HPUX_REV}" in
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` 11.[0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
case "${sc_cpu_version}" in case "${sc_cpu_version}" in
523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
...@@ -575,13 +558,12 @@ EOF ...@@ -575,13 +558,12 @@ EOF
case "${sc_kernel_bits}" in case "${sc_kernel_bits}" in
32) HP_ARCH="hppa2.0n" ;; 32) HP_ARCH="hppa2.0n" ;;
64) HP_ARCH="hppa2.0w" ;; 64) HP_ARCH="hppa2.0w" ;;
'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
esac ;; esac ;;
esac esac
fi fi ;;
if [ "${HP_ARCH}" = "" ]; then esac
eval $set_cc_for_build if [ "${HP_ARCH}" = "" ]; then
sed 's/^ //' << EOF >$dummy.c sed 's/^ //' << EOF >$dummy.c
#define _HPUX_SOURCE #define _HPUX_SOURCE
#include <stdlib.h> #include <stdlib.h>
...@@ -614,21 +596,12 @@ EOF ...@@ -614,21 +596,12 @@ EOF
exit (0); exit (0);
} }
EOF EOF
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` eval $set_cc_for_build
test -z "$HP_ARCH" && HP_ARCH=hppa (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
fi ;; if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
rm -f $dummy.c $dummy
fi ;;
esac esac
if [ ${HP_ARCH} = "hppa2.0w" ]
then
# avoid double evaluation of $set_cc_for_build
test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
then
HP_ARCH="hppa2.0w"
else
HP_ARCH="hppa64"
fi
fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV} echo ${HP_ARCH}-hp-hpux${HPUX_REV}
exit 0 ;; exit 0 ;;
ia64:HP-UX:*:*) ia64:HP-UX:*:*)
...@@ -636,7 +609,6 @@ EOF ...@@ -636,7 +609,6 @@ EOF
echo ia64-hp-hpux${HPUX_REV} echo ia64-hp-hpux${HPUX_REV}
exit 0 ;; exit 0 ;;
3050*:HI-UX:*:*) 3050*:HI-UX:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c sed 's/^ //' << EOF >$dummy.c
#include <unistd.h> #include <unistd.h>
int int
...@@ -662,7 +634,9 @@ EOF ...@@ -662,7 +634,9 @@ EOF
exit (0); exit (0);
} }
EOF EOF
$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 eval $set_cc_for_build
$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
echo unknown-hitachi-hiuxwe2 echo unknown-hitachi-hiuxwe2
exit 0 ;; exit 0 ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
...@@ -690,6 +664,9 @@ EOF ...@@ -690,6 +664,9 @@ EOF
parisc*:Lites*:*:*) parisc*:Lites*:*:*)
echo hppa1.1-hp-lites echo hppa1.1-hp-lites
exit 0 ;; exit 0 ;;
hppa*:OpenBSD:*:*)
echo hppa-unknown-openbsd
exit 0 ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd echo c1-convex-bsd
exit 0 ;; exit 0 ;;
...@@ -708,6 +685,9 @@ EOF ...@@ -708,6 +685,9 @@ EOF
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd echo c4-convex-bsd
exit 0 ;; exit 0 ;;
CRAY*X-MP:*:*:*)
echo xmp-cray-unicos
exit 0 ;;
CRAY*Y-MP:*:*:*) CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;; exit 0 ;;
...@@ -720,21 +700,27 @@ EOF ...@@ -720,21 +700,27 @@ EOF
CRAY*TS:*:*:*) CRAY*TS:*:*:*)
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;; exit 0 ;;
CRAY*T3D:*:*:*)
echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
CRAY*T3E:*:*:*) CRAY*T3E:*:*:*)
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;; exit 0 ;;
CRAY*SV1:*:*:*) CRAY*SV1:*:*:*)
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;; exit 0 ;;
*:UNICOS/mp:*:*) CRAY-2:*:*:*)
echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' echo cray2-cray-unicos
exit 0 ;; exit 0 ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit 0 ;; exit 0 ;;
hp300:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
...@@ -744,19 +730,11 @@ EOF ...@@ -744,19 +730,11 @@ EOF
*:BSD/OS:*:*) *:BSD/OS:*:*)
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
*:FreeBSD:*:*|*:GNU/FreeBSD:*:*) *:FreeBSD:*:*)
# Determine whether the default compiler uses glibc. echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
eval $set_cc_for_build exit 0 ;;
sed 's/^ //' << EOF >$dummy.c *:OpenBSD:*:*)
#include <features.h> echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
#if __GLIBC__ >= 2
LIBC=gnu
#else
LIBC=
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
exit 0 ;; exit 0 ;;
i*:CYGWIN*:*) i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin echo ${UNAME_MACHINE}-pc-cygwin
...@@ -767,17 +745,11 @@ EOF ...@@ -767,17 +745,11 @@ EOF
i*:PW*:*) i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32 echo ${UNAME_MACHINE}-pc-pw32
exit 0 ;; exit 0 ;;
x86:Interix*:3*)
echo i586-pc-interix3
exit 0 ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit 0 ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*) i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem? # How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386? # UNAME_MACHINE based on the output of uname instead of i386?
echo i586-pc-interix echo i386-pc-interix
exit 0 ;; exit 0 ;;
i*:UWIN*:*) i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin echo ${UNAME_MACHINE}-pc-uwin
...@@ -797,52 +769,17 @@ EOF ...@@ -797,52 +769,17 @@ EOF
arm*:Linux:*:*) arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;; exit 0 ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
exit 0 ;;
ia64:Linux:*:*) ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-unknown-linux
exit 0 ;; exit 0 ;;
m68*:Linux:*:*) m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;; exit 0 ;;
mips:Linux:*:*) mips:Linux:*:*)
eval $set_cc_for_build case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
sed 's/^ //' << EOF >$dummy.c big) echo mips-unknown-linux-gnu && exit 0 ;;
#undef CPU little) echo mipsel-unknown-linux-gnu && exit 0 ;;
#undef mips esac
#undef mipsel
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
CPU=mipsel
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
CPU=mips
#else
CPU=
#endif
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
;;
mips64:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#undef CPU
#undef mips64
#undef mips64el
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
CPU=mips64el
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
CPU=mips64
#else
CPU=
#endif
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
;; ;;
ppc:Linux:*:*) ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu echo powerpc-unknown-linux-gnu
...@@ -891,8 +828,7 @@ EOF ...@@ -891,8 +828,7 @@ EOF
# The BFD linker knows what the default object file format is, so # The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent # first see if it will tell us. cd to the root directory to prevent
# problems with other programs or directories called `ld' in the path. # problems with other programs or directories called `ld' in the path.
# Set LC_ALL=C to ensure ld outputs messages in English. ld_supported_targets=`cd /; ld --help 2>&1 \
ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
| sed -ne '/supported targets:/!d | sed -ne '/supported targets:/!d
s/[ ][ ]*/ /g s/[ ][ ]*/ /g
s/.*supported targets: *// s/.*supported targets: *//
...@@ -904,7 +840,7 @@ EOF ...@@ -904,7 +840,7 @@ EOF
;; ;;
a.out-i386-linux) a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout" echo "${UNAME_MACHINE}-pc-linux-gnuaout"
exit 0 ;; exit 0 ;;
coff-i386) coff-i386)
echo "${UNAME_MACHINE}-pc-linux-gnucoff" echo "${UNAME_MACHINE}-pc-linux-gnucoff"
exit 0 ;; exit 0 ;;
...@@ -915,29 +851,33 @@ EOF ...@@ -915,29 +851,33 @@ EOF
exit 0 ;; exit 0 ;;
esac esac
# Determine whether the default compiler is a.out or elf # Determine whether the default compiler is a.out or elf
eval $set_cc_for_build cat >$dummy.c <<EOF
sed 's/^ //' << EOF >$dummy.c #include <features.h>
#include <features.h> #ifdef __cplusplus
#ifdef __ELF__ #include <stdio.h> /* for printf() prototype */
# ifdef __GLIBC__ int main (int argc, char *argv[]) {
# if __GLIBC__ >= 2 #else
LIBC=gnu int main (argc, argv) int argc; char *argv[]; {
# else #endif
LIBC=gnulibc1 #ifdef __ELF__
# endif # ifdef __GLIBC__
# else # if __GLIBC__ >= 2
LIBC=gnulibc1 printf ("%s-pc-linux-gnu\n", argv[1]);
# endif # else
#else printf ("%s-pc-linux-gnulibc1\n", argv[1]);
#ifdef __INTEL_COMPILER # endif
LIBC=gnu # else
#else printf ("%s-pc-linux-gnulibc1\n", argv[1]);
LIBC=gnuaout # endif
#endif #else
#endif printf ("%s-pc-linux-gnuaout\n", argv[1]);
#endif
return 0;
}
EOF EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` eval $set_cc_for_build
test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
;; ;;
i*86:DYNIX/ptx:4*:*) i*86:DYNIX/ptx:4*:*)
...@@ -954,23 +894,6 @@ EOF ...@@ -954,23 +894,6 @@ EOF
# Use sysv4.2uw... so that sysv4* matches it. # Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit 0 ;; exit 0 ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
echo ${UNAME_MACHINE}-pc-os2-emx
exit 0 ;;
i*86:XTS-300:*:STOP)
echo ${UNAME_MACHINE}-unknown-stop
exit 0 ;;
i*86:atheos:*:*)
echo ${UNAME_MACHINE}-unknown-atheos
exit 0 ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
exit 0 ;;
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
...@@ -992,19 +915,22 @@ EOF ...@@ -992,19 +915,22 @@ EOF
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
echo ${UNAME_MACHINE}-pc-isc$UNAME_REL echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
elif /bin/uname -X 2>/dev/null >/dev/null ; then elif /bin/uname -X 2>/dev/null >/dev/null ; then
UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
&& UNAME_MACHINE=i586 && UNAME_MACHINE=i586
(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
&& UNAME_MACHINE=i686 && UNAME_MACHINE=i686
(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
&& UNAME_MACHINE=i686 && UNAME_MACHINE=i686
echo ${UNAME_MACHINE}-pc-sco$UNAME_REL echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
else else
echo ${UNAME_MACHINE}-pc-sysv32 echo ${UNAME_MACHINE}-pc-sysv32
fi fi
exit 0 ;; exit 0 ;;
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
exit 0 ;;
pc:*:*:*) pc:*:*:*)
# Left here for compatibility: # Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about # uname -m prints for DJGPP always 'pc', but it prints nothing about
...@@ -1028,15 +954,9 @@ EOF ...@@ -1028,15 +954,9 @@ EOF
# "miniframe" # "miniframe"
echo m68010-convergent-sysv echo m68010-convergent-sysv
exit 0 ;; exit 0 ;;
mc68k:UNIX:SYSTEM5:3.51m)
echo m68k-convergent-sysv
exit 0 ;;
M680?0:D-NIX:5.3:*)
echo m68k-diab-dnix
exit 0 ;;
M68*:*:R3V[567]*:*) M68*:*:R3V[567]*:*)
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
OS_REL='' OS_REL=''
test -r /etc/.relid \ test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
...@@ -1053,6 +973,9 @@ EOF ...@@ -1053,6 +973,9 @@ EOF
mc68030:UNIX_System_V:4.*:*) mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4 echo m68k-atari-sysv4
exit 0 ;; exit 0 ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
TSUNAMI:LynxOS:2.*:*) TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE} echo sparc-unknown-lynxos${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
...@@ -1124,9 +1047,6 @@ EOF ...@@ -1124,9 +1047,6 @@ EOF
SX-5:SUPER-UX:*:*) SX-5:SUPER-UX:*:*)
echo sx5-nec-superux${UNAME_RELEASE} echo sx5-nec-superux${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit 0 ;;
Power*:Rhapsody:*:*) Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE} echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
...@@ -1134,24 +1054,18 @@ EOF ...@@ -1134,24 +1054,18 @@ EOF
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
*:Darwin:*:*) *:Darwin:*:*)
case `uname -p` in echo `uname -p`-apple-darwin${UNAME_RELEASE}
*86) UNAME_PROCESSOR=i686 ;;
powerpc) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*) *:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p` if test "${UNAME_MACHINE}" = "x86pc"; then
if test "$UNAME_PROCESSOR" = "x86"; then
UNAME_PROCESSOR=i386
UNAME_MACHINE=pc UNAME_MACHINE=pc
fi fi
echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} echo `uname -p`-${UNAME_MACHINE}-nto-qnx
exit 0 ;; exit 0 ;;
*:QNX:*:4*) *:QNX:*:4*)
echo i386-pc-qnx echo i386-pc-qnx
exit 0 ;; exit 0 ;;
NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) NSR-[KW]:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE} echo nsr-tandem-nsk${UNAME_RELEASE}
exit 0 ;; exit 0 ;;
*:NonStop-UX:*:*) *:NonStop-UX:*:*)
...@@ -1174,6 +1088,11 @@ EOF ...@@ -1174,6 +1088,11 @@ EOF
fi fi
echo ${UNAME_MACHINE}-unknown-plan9 echo ${UNAME_MACHINE}-unknown-plan9
exit 0 ;; exit 0 ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
echo ${UNAME_MACHINE}-pc-os2-emx
exit 0 ;;
*:TOPS-10:*:*) *:TOPS-10:*:*)
echo pdp10-unknown-tops10 echo pdp10-unknown-tops10
exit 0 ;; exit 0 ;;
...@@ -1192,12 +1111,17 @@ EOF ...@@ -1192,12 +1111,17 @@ EOF
*:ITS:*:*) *:ITS:*:*)
echo pdp10-unknown-its echo pdp10-unknown-its
exit 0 ;; exit 0 ;;
i*86:XTS-300:*:STOP)
echo ${UNAME_MACHINE}-unknown-stop
exit 0 ;;
i*86:atheos:*:*)
echo ${UNAME_MACHINE}-unknown-atheos
exit 0 ;;
esac esac
#echo '(No uname command or uname output not recognized.)' 1>&2 #echo '(No uname command or uname output not recognized.)' 1>&2
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
eval $set_cc_for_build
cat >$dummy.c <<EOF cat >$dummy.c <<EOF
#ifdef _SEQUENT_ #ifdef _SEQUENT_
# include <sys/types.h> # include <sys/types.h>
...@@ -1312,7 +1236,9 @@ main () ...@@ -1312,7 +1236,9 @@ main ()
} }
EOF EOF
$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 eval $set_cc_for_build
$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
rm -f $dummy.c $dummy
# Apollos put the system type in the environment. # Apollos put the system type in the environment.
......
config.sub
View file @ d94eaf58
#! /bin/sh #! /bin/sh
# Configuration validation subroutine script. # Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. # Free Software Foundation, Inc.
timestamp='2003-05-09' timestamp='2001-08-23'
# This file is (in principle) common to ALL GNU software. # This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software # The presence of a machine in this file suggests that SOME GNU software
...@@ -29,8 +29,7 @@ timestamp='2003-05-09' ...@@ -29,8 +29,7 @@ timestamp='2003-05-09'
# configuration script generated by Autoconf, you may include it under # configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program. # the same distribution terms that you use for the rest of that program.
# Please send patches to <config-patches@gnu.org>. Submit a context # Please send patches to <config-patches@gnu.org>.
# diff and a properly formatted ChangeLog entry.
# #
# Configuration subroutine to validate and canonicalize a configuration type. # Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument. # Supply the specified configuration type as an argument.
...@@ -118,7 +117,7 @@ esac ...@@ -118,7 +117,7 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations. # Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in case $maybe_os in
nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
os=-$maybe_os os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;; ;;
...@@ -227,44 +226,31 @@ case $basic_machine in ...@@ -227,44 +226,31 @@ case $basic_machine in
1750a | 580 \ 1750a | 580 \
| a29k \ | a29k \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
| clipper \ | c4x | clipper \
| d10v | d30v | dlx | dsp16xx \ | d10v | d30v | dsp16xx \
| fr30 | frv \ | fr30 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \ | i370 | i860 | i960 | ia64 \
| ip2k \
| m32r | m68000 | m68k | m88k | mcore \ | m32r | m68000 | m68k | m88k | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
| mips16 \ | mips64vr4100 | mips64vr4100el | mips64vr4300 \
| mips64 | mips64el \ | mips64vr4300el | mips64vr5000 | mips64vr5000el \
| mips64vr | mips64vrel \ | mipsbe | mipsel | mipsle | mipstx39 | mipstx39el \
| mips64orion | mips64orionel \
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \ | mn10200 | mn10300 \
| msp430 \
| ns16k | ns32k \ | ns16k | ns32k \
| openrisc | or32 \ | openrisc \
| pdp10 | pdp11 | pj | pjl \ | pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \ | pyramid \
| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | s390 | s390x \
| sh64 | sh64le \ | sh | sh[34] | sh[34]eb | shbe | shle \
| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
| strongarm \ | stormy16 | strongarm \
| tahoe | thumb | tic80 | tron \ | tahoe | thumb | tic80 | tron \
| v850 | v850e \ | v850 \
| we32k \ | we32k \
| x86 | xscale | xstormy16 | xtensa \ | x86 | xscale \
| z8k) | z8k)
basic_machine=$basic_machine-unknown basic_machine=$basic_machine-unknown
;; ;;
...@@ -291,55 +277,38 @@ case $basic_machine in ...@@ -291,55 +277,38 @@ case $basic_machine in
580-* \ 580-* \
| a29k-* \ | a29k-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | arc-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armv*-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* \
| bs2000-* \ | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | c[123]* | c30-* | [cjt]90-* | c54x-* \
| clipper-* | cydra-* \ | clipper-* | cray2-* | cydra-* \
| d10v-* | d30v-* | dlx-* \ | d10v-* | d30v-* \
| elxsi-* \ | elxsi-* \
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | f30[01]-* | f700-* | fr30-* | fx80-* \
| h8300-* | h8500-* \ | h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \ | i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* \
| m32r-* \ | m32r-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | mcore-* \ | m88110-* | m88k-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
| mips16-* \ | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
| mips64-* | mips64el-* \ | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipsel-* \
| mips64vr-* | mips64vrel-* \ | mipsle-* | mipstx39-* | mipstx39el-* \
| mips64orion-* | mips64orionel-* \ | none-* | np1-* | ns16k-* | ns32k-* \
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
| msp430-* \
| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
| orion-* \ | orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \ | pyramid-* \
| romp-* | rs6000-* \ | romp-* | rs6000-* \
| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | s390-* | s390x-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ | sparc-* | sparc64-* | sparc86x-* | sparclite-* \
| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
| tahoe-* | thumb-* \ | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | v850-* | vax-* \
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \ | we32k-* \
| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
| xtensa-* \
| ymp-* \ | ymp-* \
| z8k-*) | z8k-*)
;; ;;
...@@ -373,9 +342,6 @@ case $basic_machine in ...@@ -373,9 +342,6 @@ case $basic_machine in
basic_machine=a29k-none basic_machine=a29k-none
os=-bsd os=-bsd
;; ;;
amd64)
basic_machine=x86_64-pc
;;
amdahl) amdahl)
basic_machine=580-amdahl basic_machine=580-amdahl
os=-sysv os=-sysv
...@@ -407,10 +373,6 @@ case $basic_machine in ...@@ -407,10 +373,6 @@ case $basic_machine in
basic_machine=ns32k-sequent basic_machine=ns32k-sequent
os=-dynix os=-dynix
;; ;;
c90)
basic_machine=c90-cray
os=-unicos
;;
convex-c1) convex-c1)
basic_machine=c1-convex basic_machine=c1-convex
os=-bsd os=-bsd
...@@ -431,8 +393,16 @@ case $basic_machine in ...@@ -431,8 +393,16 @@ case $basic_machine in
basic_machine=c38-convex basic_machine=c38-convex
os=-bsd os=-bsd
;; ;;
cray | j90) cray | ymp)
basic_machine=j90-cray basic_machine=ymp-cray
os=-unicos
;;
cray2)
basic_machine=cray2-cray
os=-unicos
;;
[cjt]90)
basic_machine=${basic_machine}-cray
os=-unicos os=-unicos
;; ;;
crds | unos) crds | unos)
...@@ -447,14 +417,6 @@ case $basic_machine in ...@@ -447,14 +417,6 @@ case $basic_machine in
decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
basic_machine=mips-dec basic_machine=mips-dec
;; ;;
decsystem10* | dec10*)
basic_machine=pdp10-dec
os=-tops10
;;
decsystem20* | dec20*)
basic_machine=pdp10-dec
os=-tops20
;;
delta | 3300 | motorola-3300 | motorola-delta \ delta | 3300 | motorola-3300 | motorola-delta \
| 3300-motorola | delta-motorola) | 3300-motorola | delta-motorola)
basic_machine=m68k-motorola basic_machine=m68k-motorola
...@@ -635,6 +597,14 @@ case $basic_machine in ...@@ -635,6 +597,14 @@ case $basic_machine in
basic_machine=m68k-atari basic_machine=m68k-atari
os=-mint os=-mint
;; ;;
mipsel*-linux*)
basic_machine=mipsel-unknown
os=-linux-gnu
;;
mips*-linux*)
basic_machine=mips-unknown
os=-linux-gnu
;;
mips3*-*) mips3*-*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
;; ;;
...@@ -649,10 +619,6 @@ case $basic_machine in ...@@ -649,10 +619,6 @@ case $basic_machine in
basic_machine=m68k-rom68k basic_machine=m68k-rom68k
os=-coff os=-coff
;; ;;
morphos)
basic_machine=powerpc-unknown
os=-morphos
;;
msdos) msdos)
basic_machine=i386-pc basic_machine=i386-pc
os=-msdos os=-msdos
...@@ -725,10 +691,6 @@ case $basic_machine in ...@@ -725,10 +691,6 @@ case $basic_machine in
np1) np1)
basic_machine=np1-gould basic_machine=np1-gould
;; ;;
nv1)
basic_machine=nv1-cray
os=-unicosmp
;;
nsr-tandem) nsr-tandem)
basic_machine=nsr-tandem basic_machine=nsr-tandem
;; ;;
...@@ -736,10 +698,6 @@ case $basic_machine in ...@@ -736,10 +698,6 @@ case $basic_machine in
basic_machine=hppa1.1-oki basic_machine=hppa1.1-oki
os=-proelf os=-proelf
;; ;;
or32 | or32-*)
basic_machine=or32-unknown
os=-coff
;;
OSE68000 | ose68000) OSE68000 | ose68000)
basic_machine=m68000-ericsson basic_machine=m68000-ericsson
os=-ose os=-ose
...@@ -762,19 +720,19 @@ case $basic_machine in ...@@ -762,19 +720,19 @@ case $basic_machine in
pbb) pbb)
basic_machine=m68k-tti basic_machine=m68k-tti
;; ;;
pc532 | pc532-*) pc532 | pc532-*)
basic_machine=ns32k-pc532 basic_machine=ns32k-pc532
;; ;;
pentium | p5 | k5 | k6 | nexgen | viac3) pentium | p5 | k5 | k6 | nexgen)
basic_machine=i586-pc basic_machine=i586-pc
;; ;;
pentiumpro | p6 | 6x86 | athlon | athlon_*) pentiumpro | p6 | 6x86 | athlon)
basic_machine=i686-pc basic_machine=i686-pc
;; ;;
pentiumii | pentium2) pentiumii | pentium2)
basic_machine=i686-pc basic_machine=i686-pc
;; ;;
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) pentium-* | p5-* | k5-* | k6-* | nexgen-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;; ;;
pentiumpro-* | p6-* | 6x86-* | athlon-*) pentiumpro-* | p6-* | 6x86-* | athlon-*)
...@@ -789,22 +747,22 @@ case $basic_machine in ...@@ -789,22 +747,22 @@ case $basic_machine in
power) basic_machine=power-ibm power) basic_machine=power-ibm
;; ;;
ppc) basic_machine=powerpc-unknown ppc) basic_machine=powerpc-unknown
;; ;;
ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;; ;;
ppcle | powerpclittle | ppc-le | powerpc-little) ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown basic_machine=powerpcle-unknown
;; ;;
ppcle-* | powerpclittle-*) ppcle-* | powerpclittle-*)
basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
;; ;;
ppc64) basic_machine=powerpc64-unknown ppc64) basic_machine=powerpc64-unknown
;; ;;
ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;; ;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little) ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown basic_machine=powerpc64le-unknown
;; ;;
ppc64le-* | powerpc64little-*) ppc64le-* | powerpc64little-*)
basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
;; ;;
...@@ -825,22 +783,10 @@ case $basic_machine in ...@@ -825,22 +783,10 @@ case $basic_machine in
rtpc | rtpc-*) rtpc | rtpc-*)
basic_machine=romp-ibm basic_machine=romp-ibm
;; ;;
s390 | s390-*)
basic_machine=s390-ibm
;;
s390x | s390x-*)
basic_machine=s390x-ibm
;;
sa29200) sa29200)
basic_machine=a29k-amd basic_machine=a29k-amd
os=-udi os=-udi
;; ;;
sb1)
basic_machine=mipsisa64sb1-unknown
;;
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
sequent) sequent)
basic_machine=i386-sequent basic_machine=i386-sequent
;; ;;
...@@ -848,7 +794,7 @@ case $basic_machine in ...@@ -848,7 +794,7 @@ case $basic_machine in
basic_machine=sh-hitachi basic_machine=sh-hitachi
os=-hms os=-hms
;; ;;
sparclite-wrs | simso-wrs) sparclite-wrs)
basic_machine=sparclite-wrs basic_machine=sparclite-wrs
os=-vxworks os=-vxworks
;; ;;
...@@ -915,39 +861,19 @@ case $basic_machine in ...@@ -915,39 +861,19 @@ case $basic_machine in
os=-dynix os=-dynix
;; ;;
t3e) t3e)
basic_machine=alphaev5-cray basic_machine=t3e-cray
os=-unicos
;;
t90)
basic_machine=t90-cray
os=-unicos os=-unicos
;; ;;
tic4x | c4x*)
basic_machine=tic4x-unknown
os=-coff
;;
tic54x | c54x*) tic54x | c54x*)
basic_machine=tic54x-unknown basic_machine=tic54x-unknown
os=-coff os=-coff
;; ;;
tic55x | c55x*)
basic_machine=tic55x-unknown
os=-coff
;;
tic6x | c6x*)
basic_machine=tic6x-unknown
os=-coff
;;
tx39) tx39)
basic_machine=mipstx39-unknown basic_machine=mipstx39-unknown
;; ;;
tx39el) tx39el)
basic_machine=mipstx39el-unknown basic_machine=mipstx39el-unknown
;; ;;
toad1)
basic_machine=pdp10-xkl
os=-tops20
;;
tower | tower-32) tower | tower-32)
basic_machine=m68k-ncr basic_machine=m68k-ncr
;; ;;
...@@ -972,8 +898,8 @@ case $basic_machine in ...@@ -972,8 +898,8 @@ case $basic_machine in
os=-vms os=-vms
;; ;;
vpp*|vx|vx-*) vpp*|vx|vx-*)
basic_machine=f301-fujitsu basic_machine=f301-fujitsu
;; ;;
vxworks960) vxworks960)
basic_machine=i960-wrs basic_machine=i960-wrs
os=-vxworks os=-vxworks
...@@ -994,13 +920,17 @@ case $basic_machine in ...@@ -994,13 +920,17 @@ case $basic_machine in
basic_machine=hppa1.1-winbond basic_machine=hppa1.1-winbond
os=-proelf os=-proelf
;; ;;
xps | xps100) windows32)
basic_machine=xps100-honeywell basic_machine=i386-pc
os=-windows32-msvcrt
;; ;;
ymp) xmp)
basic_machine=ymp-cray basic_machine=xmp-cray
os=-unicos os=-unicos
;; ;;
xps | xps100)
basic_machine=xps100-honeywell
;;
z8k-*-coff) z8k-*-coff)
basic_machine=z8k-unknown basic_machine=z8k-unknown
os=-sim os=-sim
...@@ -1021,6 +951,13 @@ case $basic_machine in ...@@ -1021,6 +951,13 @@ case $basic_machine in
op60c) op60c)
basic_machine=hppa1.1-oki basic_machine=hppa1.1-oki
;; ;;
mips)
if [ x$os = x-linux-gnu ]; then
basic_machine=mips-unknown
else
basic_machine=mips-mips
fi
;;
romp) romp)
basic_machine=romp-ibm basic_machine=romp-ibm
;; ;;
...@@ -1040,16 +977,13 @@ case $basic_machine in ...@@ -1040,16 +977,13 @@ case $basic_machine in
we32k) we32k)
basic_machine=we32k-att basic_machine=we32k-att
;; ;;
sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) sh3 | sh4 | sh3eb | sh4eb)
basic_machine=sh-unknown basic_machine=sh-unknown
;; ;;
sh64)
basic_machine=sh64-unknown
;;
sparc | sparcv9 | sparcv9b) sparc | sparcv9 | sparcv9b)
basic_machine=sparc-sun basic_machine=sparc-sun
;; ;;
cydra) cydra)
basic_machine=cydra-cydrome basic_machine=cydra-cydrome
;; ;;
orion) orion)
...@@ -1064,6 +998,10 @@ case $basic_machine in ...@@ -1064,6 +998,10 @@ case $basic_machine in
pmac | pmac-mpw) pmac | pmac-mpw)
basic_machine=powerpc-apple basic_machine=powerpc-apple
;; ;;
c4x*)
basic_machine=c4x-none
os=-coff
;;
*-unknown) *-unknown)
# Make sure to match an already-canonicalized machine name. # Make sure to match an already-canonicalized machine name.
;; ;;
...@@ -1126,12 +1064,10 @@ case $os in ...@@ -1126,12 +1064,10 @@ case $os in
| -chorusos* | -chorusrdb* \ | -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -os2* | -vos*)
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix*)
# Remember, each alternative MUST END IN *, to match a version number. # Remember, each alternative MUST END IN *, to match a version number.
;; ;;
-qnx*) -qnx*)
...@@ -1143,10 +1079,8 @@ case $os in ...@@ -1143,10 +1079,8 @@ case $os in
;; ;;
esac esac
;; ;;
-nto-qnx*)
;;
-nto*) -nto*)
os=`echo $os | sed -e 's|nto|nto-qnx|'` os=-nto-qnx
;; ;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
...@@ -1185,20 +1119,14 @@ case $os in ...@@ -1185,20 +1119,14 @@ case $os in
-acis*) -acis*)
os=-aos os=-aos
;; ;;
-atheos*)
os=-atheos
;;
-386bsd) -386bsd)
os=-bsd os=-bsd
;; ;;
-ctix* | -uts*) -ctix* | -uts*)
os=-sysv os=-sysv
;; ;;
-nova*)
os=-rtmk-nova
;;
-ns2 ) -ns2 )
os=-nextstep2 os=-nextstep2
;; ;;
-nsk*) -nsk*)
os=-nsk os=-nsk
...@@ -1237,14 +1165,8 @@ case $os in ...@@ -1237,14 +1165,8 @@ case $os in
-xenix) -xenix)
os=-xenix os=-xenix
;; ;;
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
os=-mint os=-mint
;;
-aros*)
os=-aros
;;
-kaos*)
os=-kaos
;; ;;
-none) -none)
;; ;;
...@@ -1277,11 +1199,10 @@ case $basic_machine in ...@@ -1277,11 +1199,10 @@ case $basic_machine in
arm*-semi) arm*-semi)
os=-aout os=-aout
;; ;;
# This must come before the *-dec entry.
pdp10-*) pdp10-*)
os=-tops20 os=-tops20
;; ;;
pdp11-*) pdp11-*)
os=-none os=-none
;; ;;
*-dec | vax-*) *-dec | vax-*)
...@@ -1308,9 +1229,6 @@ case $basic_machine in ...@@ -1308,9 +1229,6 @@ case $basic_machine in
mips*-*) mips*-*)
os=-elf os=-elf
;; ;;
or32-*)
os=-coff
;;
*-tti) # must be before sparc entry or we get the wrong os. *-tti) # must be before sparc entry or we get the wrong os.
os=-sysv3 os=-sysv3
;; ;;
...@@ -1374,19 +1292,19 @@ case $basic_machine in ...@@ -1374,19 +1292,19 @@ case $basic_machine in
*-next) *-next)
os=-nextstep3 os=-nextstep3
;; ;;
*-gould) *-gould)
os=-sysv os=-sysv
;; ;;
*-highlevel) *-highlevel)
os=-bsd os=-bsd
;; ;;
*-encore) *-encore)
os=-bsd os=-bsd
;; ;;
*-sgi) *-sgi)
os=-irix os=-irix
;; ;;
*-siemens) *-siemens)
os=-sysv4 os=-sysv4
;; ;;
*-masscomp) *-masscomp)
...@@ -1458,7 +1376,7 @@ case $basic_machine in ...@@ -1458,7 +1376,7 @@ case $basic_machine in
-ptx*) -ptx*)
vendor=sequent vendor=sequent
;; ;;
-vxsim* | -vxworks* | -windiss*) -vxsim* | -vxworks*)
vendor=wrs vendor=wrs
;; ;;
-aux*) -aux*)
......
configure
View file @ d94eaf58
...@@ -248,7 +248,6 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then ...@@ -248,7 +248,6 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then
*-DOS) lt_cv_sys_path_separator=';' ;; *-DOS) lt_cv_sys_path_separator=';' ;;
*) lt_cv_sys_path_separator=':' ;; *) lt_cv_sys_path_separator=':' ;;
esac esac
PATH_SEPARATOR=$lt_cv_sys_path_separator
fi fi
...@@ -315,7 +314,7 @@ else ...@@ -315,7 +314,7 @@ else
# #
# So, first we look for a working echo in the user's PATH. # So, first we look for a working echo in the user's PATH.
IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
for dir in $PATH /usr/ucb; do for dir in $PATH /usr/ucb; do
if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
...@@ -469,7 +468,7 @@ ac_includes_default="\ ...@@ -469,7 +468,7 @@ ac_includes_default="\
ac_subdirs_all="$ac_subdirs_all libid3tag" ac_subdirs_all="$ac_subdirs_all libid3tag"
ac_subdirs_all="$ac_subdirs_all libmad" ac_subdirs_all="$ac_subdirs_all libmad"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL CCAS CCASFLAGS MAD_SUBDIR MAD_LIB ID3_SUBDIR ID3_LIB AO_CFLAGS AO_LIBS subdirs OGG_CFLAGS OGG_LIBS VORBIS_CFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS LIBFLAC_CFLAGS LIBFLAC_LIBS LIBOBJS LTLIBOBJS' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL CCAS CCASFLAGS MAD_SUBDIR MAD_LIB ID3_SUBDIR ID3_LIB MPD_LIBS MPD_CFLAGS AO_CFLAGS AO_LIBS subdirs OGG_CFLAGS OGG_LIBS VORBIS_CFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS LIBFLAC_CFLAGS LIBFLAC_LIBS LIBOBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
...@@ -1459,7 +1458,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ...@@ -1459,7 +1458,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
am__api_version="1.6" am__api_version="1.7"
ac_aux_dir= ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
if test -f $ac_dir/install-sh; then if test -f $ac_dir/install-sh; then
...@@ -1711,9 +1710,19 @@ echo "$as_me: error: source directory already configured; run \"make distclean\" ...@@ -1711,9 +1710,19 @@ echo "$as_me: error: source directory already configured; run \"make distclean\"
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
# test whether we have cygpath
if test -z "$CYGPATH_W"; then
if (cygpath --version) >/dev/null 2>/dev/null; then
CYGPATH_W='cygpath -w'
else
CYGPATH_W=echo
fi
fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE=mpd PACKAGE=mpd
VERSION=0.8.1 VERSION=0.8.2
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
...@@ -2608,7 +2617,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ...@@ -2608,7 +2617,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
for ac_declaration in \ for ac_declaration in \
'' \ ''\
'#include <stdlib.h>' \
'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \ 'extern "C" void exit (int) throw ();' \
...@@ -2622,8 +2632,8 @@ _ACEOF ...@@ -2622,8 +2632,8 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
$ac_declaration
#include <stdlib.h> #include <stdlib.h>
$ac_declaration
int int
main () main ()
{ {
...@@ -2738,7 +2748,7 @@ echo "include confinc" > confmf ...@@ -2738,7 +2748,7 @@ echo "include confinc" > confmf
# In particular we don't look at `^make:' because GNU make might # In particular we don't look at `^make:' because GNU make might
# be invoked under some other name (usually "gmake"), in which # be invoked under some other name (usually "gmake"), in which
# case it prints its new name instead of `make'. # case it prints its new name instead of `make'.
if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
am__include=include am__include=include
am__quote= am__quote=
_am_result=GNU _am_result=GNU
...@@ -2829,7 +2839,7 @@ else ...@@ -2829,7 +2839,7 @@ else
if depmode=$depmode \ if depmode=$depmode \
source=conftest.c object=conftest.o \ source=conftest.c object=conftest.o \
depfile=conftest.Po tmpdepfile=conftest.TPo \ depfile=conftest.Po tmpdepfile=conftest.TPo \
$SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&
grep conftest.h conftest.Po > /dev/null 2>&1 && grep conftest.h conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
am_cv_CC_dependencies_compiler_type=$depmode am_cv_CC_dependencies_compiler_type=$depmode
...@@ -2849,6 +2859,18 @@ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 ...@@ -2849,6 +2859,18 @@ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
am__fastdepCC_FALSE='#'
else
am__fastdepCC_TRUE='#'
am__fastdepCC_FALSE=
fi
# Find a good install program. We prefer a C program (faster), # Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or # so one script is as good as another. But avoid the broken or
# incompatible versions: # incompatible versions:
...@@ -3046,17 +3068,6 @@ host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` ...@@ -3046,17 +3068,6 @@ host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
# Find the correct PATH separator. Usually this is `:', but
# DJGPP uses `;' like DOS.
if test "X${PATH_SEPARATOR+set}" != Xset; then
UNAME=${UNAME-`uname 2>/dev/null`}
case X$UNAME in
*-DOS) lt_cv_sys_path_separator=';' ;;
*) lt_cv_sys_path_separator=':' ;;
esac
PATH_SEPARATOR=$lt_cv_sys_path_separator
fi
# Check whether --with-gnu-ld or --without-gnu-ld was given. # Check whether --with-gnu-ld or --without-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then if test "${with_gnu_ld+set}" = set; then
...@@ -3108,7 +3119,7 @@ if test "${lt_cv_path_LD+set}" = set; then ...@@ -3108,7 +3119,7 @@ if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
if test -z "$LD"; then if test -z "$LD"; then
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
...@@ -3178,7 +3189,7 @@ else ...@@ -3178,7 +3189,7 @@ else
# Let the user override the test. # Let the user override the test.
lt_cv_path_NM="$NM" lt_cv_path_NM="$NM"
else else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
tmp_nm=$ac_dir/${ac_tool_prefix}nm tmp_nm=$ac_dir/${ac_tool_prefix}nm
...@@ -3208,91 +3219,6 @@ NM="$lt_cv_path_NM" ...@@ -3208,91 +3219,6 @@ NM="$lt_cv_path_NM"
echo "$as_me:$LINENO: result: $NM" >&5 echo "$as_me:$LINENO: result: $NM" >&5
echo "${ECHO_T}$NM" >&6 echo "${ECHO_T}$NM" >&6
echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
# Loop through the user's path and test for sed and gsed.
# Then use that list of sed's as ones to test for truncation.
as_executable_p="test -f"
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
_sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
fi
done
done
done
# Create a temporary directory, and hook for its removal unless debugging.
$debug ||
{
trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
trap '{ (exit 1); exit 1; }' 1 2 13 15
}
# Create a (secure) tmp directory for tmp files.
: ${TMPDIR=/tmp}
{
tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
test -n "$tmp" && test -d "$tmp"
} ||
{
tmp=$TMPDIR/sed$$-$RANDOM
(umask 077 && mkdir $tmp)
} ||
{
echo "$me: cannot create a temporary directory in $TMPDIR" >&2
{ (exit 1); exit 1; }
}
_max=0
_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for _sed in $_sed_list /usr/xpg4/bin/sed; do
test ! -f ${_sed} && break
cat /dev/null > "$tmp/sed.in"
_count=0
echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
# Check for GNU sed and select it if it is found.
if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
lt_cv_path_SED=${_sed}
break
fi
while true; do
cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
mv "$tmp/sed.tmp" "$tmp/sed.in"
cp "$tmp/sed.in" "$tmp/sed.nl"
echo >>"$tmp/sed.nl"
${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
# 40000 chars as input seems more than enough
test $_count -gt 10 && break
_count=`expr $_count + 1`
if test $_count -gt $_max; then
_max=$_count
lt_cv_path_SED=$_sed
fi
done
done
rm -rf "$tmp"
fi
if test "X$SED" != "X"; then
lt_cv_path_SED=$SED
else
SED=$lt_cv_path_SED
fi
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
echo "$as_me:$LINENO: checking whether ln -s works" >&5 echo "$as_me:$LINENO: checking whether ln -s works" >&5
echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
LN_S=$as_ln_s LN_S=$as_ln_s
...@@ -3304,8 +3230,8 @@ else ...@@ -3304,8 +3230,8 @@ else
echo "${ECHO_T}no, using $LN_S" >&6 echo "${ECHO_T}no, using $LN_S" >&6
fi fi
echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 echo "$as_me:$LINENO: checking how to recognise dependant libraries" >&5
echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6
if test "${lt_cv_deplibs_check_method+set}" = set; then if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
...@@ -3318,7 +3244,7 @@ lt_cv_deplibs_check_method='unknown' ...@@ -3318,7 +3244,7 @@ lt_cv_deplibs_check_method='unknown'
# `unknown' -- same as none, but documents that we really don't know. # `unknown' -- same as none, but documents that we really don't know.
# 'pass_all' -- all dependencies passed with no checks. # 'pass_all' -- all dependencies passed with no checks.
# 'test_compile' -- check by making test program. # 'test_compile' -- check by making test program.
# 'file_magic [[regex]]' -- check by looking for files in library path # ['file_magic [regex]'] -- check by looking for files in library path
# which responds to the $file_magic_cmd with a given egrep regex. # which responds to the $file_magic_cmd with a given egrep regex.
# If you have `file' or equivalent on your system and you're not sure # If you have `file' or equivalent on your system and you're not sure
# whether `pass_all' will *always* work, you probably want this one. # whether `pass_all' will *always* work, you probably want this one.
...@@ -3382,9 +3308,9 @@ hpux10.20*|hpux11*) ...@@ -3382,9 +3308,9 @@ hpux10.20*|hpux11*)
lt_cv_file_magic_test_file=/usr/lib/libc.sl lt_cv_file_magic_test_file=/usr/lib/libc.sl
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
case $host_os in case $host_os in
irix5* | nonstopux*) irix5*)
# this will be overridden with pass_all, but let us keep it just in case # this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
;; ;;
...@@ -3406,7 +3332,7 @@ irix5* | irix6* | nonstopux*) ...@@ -3406,7 +3332,7 @@ irix5* | irix6* | nonstopux*)
# This must be Linux ELF. # This must be Linux ELF.
linux-gnu*) linux-gnu*)
case $host_cpu in case $host_cpu in
alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | arm* | m68k) alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
lt_cv_deplibs_check_method=pass_all ;; lt_cv_deplibs_check_method=pass_all ;;
*) *)
# glibc up to 2.1.1 does not perform some relocations on ARM # glibc up to 2.1.1 does not perform some relocations on ARM
...@@ -3477,9 +3403,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ...@@ -3477,9 +3403,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
lt_cv_file_magic_test_file=/lib/libc.so lt_cv_file_magic_test_file=/lib/libc.so
;; ;;
siemens)
lt_cv_deplibs_check_method=pass_all
;;
esac esac
;; ;;
esac esac
...@@ -3534,12 +3457,9 @@ hpux*) # Its linker distinguishes data from code symbols ...@@ -3534,12 +3457,9 @@ hpux*) # Its linker distinguishes data from code symbols
lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;; ;;
irix* | nonstopux*) irix*)
symcode='[BCDEGRST]' symcode='[BCDEGRST]'
;; ;;
osf*)
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*) solaris* | sysv5*)
symcode='[BDT]' symcode='[BDT]'
;; ;;
...@@ -3648,7 +3568,7 @@ EOF ...@@ -3648,7 +3568,7 @@ EOF
(eval $ac_link) 2>&5 (eval $ac_link) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest$ac_exeext; then (exit $ac_status); } && test -s conftest; then
pipe_works=yes pipe_works=yes
fi fi
LIBS="$save_LIBS" LIBS="$save_LIBS"
...@@ -4314,7 +4234,6 @@ done ...@@ -4314,7 +4234,6 @@ done
# Only perform the check for file, if the check method requires it # Only perform the check for file, if the check method requires it
case $deplibs_check_method in case $deplibs_check_method in
file_magic*) file_magic*)
...@@ -4630,7 +4549,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ...@@ -4630,7 +4549,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
case $host in case $host in
*-*-irix6*) *-*-irix6*)
# Find out which ABI we are using. # Find out which ABI we are using.
echo '#line 4633 "configure"' > conftest.$ac_ext echo '#line 4552 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
...@@ -4872,7 +4791,7 @@ else ...@@ -4872,7 +4791,7 @@ else
# like `-m68040'. # like `-m68040'.
lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
;; ;;
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes. # PIC is the default for these OSes.
;; ;;
darwin* | rhapsody*) darwin* | rhapsody*)
...@@ -4915,7 +4834,7 @@ else ...@@ -4915,7 +4834,7 @@ else
lt_cv_prog_cc_pic='+Z' lt_cv_prog_cc_pic='+Z'
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_wl='-Wl,'
lt_cv_prog_cc_static='-non_shared' lt_cv_prog_cc_static='-non_shared'
# PIC (with -KPIC) is the default. # PIC (with -KPIC) is the default.
...@@ -4959,7 +4878,11 @@ else ...@@ -4959,7 +4878,11 @@ else
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_pic='-KPIC'
lt_cv_prog_cc_static='-Bstatic' lt_cv_prog_cc_static='-Bstatic'
lt_cv_prog_cc_wl='-Wl,' if test "x$host_vendor" = xsni; then
lt_cv_prog_cc_wl='-LD'
else
lt_cv_prog_cc_wl='-Wl,'
fi
;; ;;
uts4*) uts4*)
...@@ -5159,7 +5082,7 @@ chmod -w . ...@@ -5159,7 +5082,7 @@ chmod -w .
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no compiler_c_o=no
if { (eval echo configure:5162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then if { (eval echo configure:5085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings # So say no if there are warnings
if test -s out/conftest.err; then if test -s out/conftest.err; then
...@@ -5477,7 +5400,7 @@ EOF ...@@ -5477,7 +5400,7 @@ EOF
# can override, but on older systems we have to supply one (in ltdll.c) # can override, but on older systems we have to supply one (in ltdll.c)
if test "x$lt_cv_need_dllmain" = "xyes"; then if test "x$lt_cv_need_dllmain" = "xyes"; then
ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~ ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~
test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
else else
ltdll_obj= ltdll_obj=
...@@ -5495,7 +5418,7 @@ EOF ...@@ -5495,7 +5418,7 @@ EOF
# If the export-symbols file already is a .def file (1st line # If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is. # is EXPORTS), use it as is.
# If DATA tags from a recent dlltool are present, honour them! # If DATA tags from a recent dlltool are present, honour them!
archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
cp $export_symbols $output_objdir/$soname-def; cp $export_symbols $output_objdir/$soname-def;
else else
echo EXPORTS > $output_objdir/$soname-def; echo EXPORTS > $output_objdir/$soname-def;
...@@ -5504,7 +5427,6 @@ EOF ...@@ -5504,7 +5427,6 @@ EOF
set dummy \$symbol; set dummy \$symbol;
case \$# in case \$# in
2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
4) echo " \$2 \$3 \$4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
*) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;; *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
esac; esac;
_lt_hint=`expr 1 + \$_lt_hint`; _lt_hint=`expr 1 + \$_lt_hint`;
...@@ -5617,12 +5539,10 @@ else ...@@ -5617,12 +5539,10 @@ else
# need to do runtime linking. # need to do runtime linking.
case $host_os in aix4.[23]|aix4.[23].*|aix5*) case $host_os in aix4.[23]|aix4.[23].*|aix5*)
for ld_flag in $LDFLAGS; do for ld_flag in $LDFLAGS; do
case $ld_flag in if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
*-brtl*)
aix_use_runtimelinking=yes aix_use_runtimelinking=yes
break break
;; fi
esac
done done
esac esac
...@@ -5694,7 +5614,7 @@ else ...@@ -5694,7 +5614,7 @@ else
allow_undefined_flag='${wl}-berok' allow_undefined_flag='${wl}-berok'
# This is a bit strange, but is similar to how AIX traditionally builds # This is a bit strange, but is similar to how AIX traditionally builds
# it's shared libraries. # it's shared libraries.
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname' archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
fi fi
fi fi
;; ;;
...@@ -5736,9 +5656,8 @@ else ...@@ -5736,9 +5656,8 @@ else
esac esac
# FIXME: Relying on posixy $() will cause problems for # FIXME: Relying on posixy $() will cause problems for
# cross-compilation, but unfortunately the echo tests do not # cross-compilation, but unfortunately the echo tests do not
# yet detect zsh echo's removal of \ escapes. Also zsh mangles # yet detect zsh echo's removal of \ escapes.
# `"' quotes if we put them in here... so don't! archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
# We need to add '_' to the symbols in $export_symbols first # We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes hardcode_direct=yes
...@@ -5790,14 +5709,13 @@ else ...@@ -5790,14 +5709,13 @@ else
export_dynamic_flag_spec='${wl}-E' export_dynamic_flag_spec='${wl}-E'
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
if test "$GCC" = yes; then if test "$GCC" = yes; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='-rpath $libdir'
fi fi
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=: hardcode_libdir_separator=:
link_all_deplibs=yes link_all_deplibs=yes
;; ;;
...@@ -5825,7 +5743,7 @@ else ...@@ -5825,7 +5743,7 @@ else
hardcode_direct=yes hardcode_direct=yes
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir' hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E' export_dynamic_flag_spec='${wl}-E'
else else
...@@ -5835,7 +5753,7 @@ else ...@@ -5835,7 +5753,7 @@ else
hardcode_libdir_flag_spec='-R$libdir' hardcode_libdir_flag_spec='-R$libdir'
;; ;;
*) *)
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir' hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;; ;;
esac esac
...@@ -5888,35 +5806,7 @@ else ...@@ -5888,35 +5806,7 @@ else
;; ;;
solaris*) solaris*)
# gcc --version < 3.0 without binutils cannot create self contained
# shared libraries reliably, requiring libgcc.a to resolve some of
# the object symbols generated in some cases. Libraries that use
# assert need libgcc.a to resolve __eprintf, for example. Linking
# a copy of libgcc.a into every shared library to guarantee resolving
# such symbols causes other problems: According to Tim Van Holder
# <tim.van.holder@pandora.be>, C++ libraries end up with a separate
# (to the application) exception stack for one thing.
no_undefined_flag=' -z defs' no_undefined_flag=' -z defs'
if test "$GCC" = yes; then
case `$CC --version 2>/dev/null` in
[12].*)
cat <<EOF 1>&2
*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
*** create self contained shared libraries on Solaris systems, without
*** introducing a dependency on libgcc.a. Therefore, libtool is disabling
*** -no-undefined support, which will at least allow you to build shared
*** libraries. However, you may find that when you link such libraries
*** into an application without using GCC, you have to manually add
*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to
*** upgrade to a newer version of GCC. Another option is to rebuild your
*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
EOF
no_undefined_flag=
;;
esac
fi
# $CC -shared without GNU ld will not create a library from C++ # $CC -shared without GNU ld will not create a library from C++
# object files and a static libstdc++, better avoid it by now # object files and a static libstdc++, better avoid it by now
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
...@@ -5947,23 +5837,13 @@ EOF ...@@ -5947,23 +5837,13 @@ EOF
;; ;;
sysv4) sysv4)
case $host_vendor in if test "x$host_vendor" = xsno; then
sni) archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes # is this really true???
hardcode_direct=yes # is this really true??? else
;; archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
siemens) hardcode_direct=no #Motorola manual says yes, but my tests say they lie
## LD is ld it makes a PLAMLIB fi
## CC just makes a GrossModule.
archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
reload_cmds='$CC -r -o $output$reload_objs'
hardcode_direct=no
;;
motorola)
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=no #Motorola manual says yes, but my tests say they lie
;;
esac
runpath_var='LD_RUN_PATH' runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
;; ;;
...@@ -6111,9 +5991,6 @@ aix3*) ...@@ -6111,9 +5991,6 @@ aix3*)
aix4* | aix5*) aix4* | aix5*)
version_type=linux version_type=linux
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
if test "$host_cpu" = ia64; then if test "$host_cpu" = ia64; then
# AIX 5 supports IA64 # AIX 5 supports IA64
library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
...@@ -6125,15 +6002,15 @@ aix4* | aix5*) ...@@ -6125,15 +6002,15 @@ aix4* | aix5*)
# depend on `.', always an invalid library. This was fixed in # depend on `.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0. # development snapshots of GCC prior to 3.0.
case $host_os in case $host_os in
aix4 | aix4.[01] | aix4.[01].*) aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes ' echo ' yes '
echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
: :
else else
can_build_shared=no can_build_shared=no
fi fi
;; ;;
esac esac
# AIX (on Power*) has no versioning support, so currently we can # AIX (on Power*) has no versioning support, so currently we can
# not hardcode correct soname into executable. Probably we can # not hardcode correct soname into executable. Probably we can
...@@ -6152,7 +6029,6 @@ aix4* | aix5*) ...@@ -6152,7 +6029,6 @@ aix4* | aix5*)
fi fi
shlibpath_var=LIBPATH shlibpath_var=LIBPATH
fi fi
hardcode_into_libs=yes
;; ;;
amigaos*) amigaos*)
...@@ -6200,7 +6076,7 @@ cygwin* | mingw* | pw32*) ...@@ -6200,7 +6076,7 @@ cygwin* | mingw* | pw32*)
;; ;;
yes,mingw*) yes,mingw*)
library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"` sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
;; ;;
yes,pw32*) yes,pw32*)
library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll' library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll'
...@@ -6232,18 +6108,6 @@ freebsd1*) ...@@ -6232,18 +6108,6 @@ freebsd1*)
dynamic_linker=no dynamic_linker=no
;; ;;
freebsd*-gnu*)
version_type=linux
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
soname_spec='${libname}${release}.so$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='GNU/FreeBSD ld.so'
;;
freebsd*) freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat version_type=freebsd-$objformat
...@@ -6295,17 +6159,14 @@ hpux9* | hpux10* | hpux11*) ...@@ -6295,17 +6159,14 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib' postinstall_cmds='chmod 555 $lib'
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
case $host_os in version_type=irix
nonstopux*) version_type=nonstopux ;;
*) version_type=irix ;;
esac
need_lib_prefix=no need_lib_prefix=no
need_version=no need_version=no
soname_spec='${libname}${release}.so$major' soname_spec='${libname}${release}.so$major'
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
case $host_os in case $host_os in
irix5* | nonstopux*) irix5*)
libsuff= shlibsuff= libsuff= shlibsuff=
;; ;;
*) *)
...@@ -6409,13 +6270,11 @@ os2*) ...@@ -6409,13 +6270,11 @@ os2*)
osf3* | osf4* | osf5*) osf3* | osf4* | osf5*)
version_type=osf version_type=osf
need_version=no need_version=no
need_lib_prefix=no soname_spec='${libname}${release}.so'
soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
hardcode_into_libs=yes
;; ;;
sco3.2v5*) sco3.2v5*)
...@@ -6458,12 +6317,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ...@@ -6458,12 +6317,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
case $host_vendor in case $host_vendor in
sni) sni)
shlibpath_overrides_runpath=no shlibpath_overrides_runpath=no
need_lib_prefix=no
export_dynamic_flag_spec='${wl}-Blargedynsym'
runpath_var=LD_RUN_PATH
;;
siemens)
need_lib_prefix=no
;; ;;
motorola) motorola)
need_lib_prefix=no need_lib_prefix=no
...@@ -7004,7 +6857,7 @@ else ...@@ -7004,7 +6857,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7007 "configure" #line 6860 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
...@@ -7102,7 +6955,7 @@ else ...@@ -7102,7 +6955,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7105 "configure" #line 6958 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
...@@ -7285,7 +7138,7 @@ if test -f "$ltmain"; then ...@@ -7285,7 +7138,7 @@ if test -f "$ltmain"; then
# Now quote all the things that may contain metacharacters while being # Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the # careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script. # variables and quote the copies for generation of the libtool script.
for var in echo old_CC old_CFLAGS SED \ for var in echo old_CC old_CFLAGS \
AR AR_FLAGS CC LD LN_S NM SHELL \ AR AR_FLAGS CC LD LN_S NM SHELL \
reload_flag reload_cmds wl \ reload_flag reload_cmds wl \
pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
...@@ -7347,11 +7200,8 @@ if test -f "$ltmain"; then ...@@ -7347,11 +7200,8 @@ if test -f "$ltmain"; then
# configuration script generated by Autoconf, you may include it under # configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program. # the same distribution terms that you use for the rest of that program.
# A sed that does not truncate output.
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n. # Sed that helps us avoid accidentally triggering echo(1) options like -n.
Xsed="${SED} -e s/^X//" Xsed="sed -e s/^X//"
# The HP-UX ksh and POSIX shell print the target directory to stdout # The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set. # if CDPATH is set.
...@@ -7837,8 +7687,11 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' ...@@ -7837,8 +7687,11 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
set -- $CFLAGS
CFLAGS="-Wall $CFLAGS"
MPD_CFLAGS="-Wall"
MPD_LIBS=""
# Check whether --enable-ogg or --disable-ogg was given. # Check whether --enable-ogg or --disable-ogg was given.
if test "${enable_ogg+set}" = set; then if test "${enable_ogg+set}" = set; then
...@@ -8148,7 +8001,7 @@ fi ...@@ -8148,7 +8001,7 @@ fi
if test "x$no_ao" = "x" ; then if test "x$no_ao" = "x" ; then
echo "$as_me:$LINENO: result: yes" >&5 echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6 echo "${ECHO_T}yes" >&6
LIBS="$LIBS $AO_LIBS" CFLAGS="$CFLAGS $AO_CFLAGS" MPD_LIBS="$MPD_LIBS $AO_LIBS" MPD_CFLAGS="$MPD_CFLAGS $AO_CFLAGS"
else else
echo "$as_me:$LINENO: result: no" >&5 echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
...@@ -8350,9 +8203,9 @@ echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6 ...@@ -8350,9 +8203,9 @@ echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6
fi fi
if test $ac_cv_header_sys_soundcard_h = yes; then if test $ac_cv_header_sys_soundcard_h = yes; then
CFLAGS="$CFLAGS" :
else else
CFLAGS="$CFLAGS -DNO_OSS_MIXER";{ echo "$as_me:$LINENO: WARNING: Soundcard headers not found -- disabling mixer" >&5 MPD_CFLAGS="$MPD_CFLAGS -DNO_OSS_MIXER";{ echo "$as_me:$LINENO: WARNING: Soundcard headers not found -- disabling mixer" >&5
echo "$as_me: WARNING: Soundcard headers not found -- disabling mixer" >&2;} echo "$as_me: WARNING: Soundcard headers not found -- disabling mixer" >&2;}
fi fi
...@@ -8430,7 +8283,7 @@ fi ...@@ -8430,7 +8283,7 @@ fi
CFLAGS=$oldcflags CFLAGS=$oldcflags
fi fi
if test x$use_mpd_id3tag = xyes; then if test x$use_mpd_id3tag = xyes; then
CFLAGS="$CFLAGS -DUSE_MPD_ID3TAG" MPD_CFLAGS="$MPD_CFLAGS -DUSE_MPD_ID3TAG"
ID3_LIB="libid3tag/libid3tag.la" ID3_LIB="libid3tag/libid3tag.la"
ID3_SUBDIR="libid3tag" ID3_SUBDIR="libid3tag"
...@@ -8438,7 +8291,7 @@ fi ...@@ -8438,7 +8291,7 @@ fi
subdirs="$subdirs libid3tag" subdirs="$subdirs libid3tag"
fi fi
CFLAGS="$CFLAGS -DHAVE_ID3TAG" MPD_CFLAGS="$MPD_CFLAGS -DHAVE_ID3TAG"
fi fi
MAD_SUBDIR="" MAD_SUBDIR=""
...@@ -8509,7 +8362,7 @@ fi ...@@ -8509,7 +8362,7 @@ fi
fi fi
if test x$use_mpd_mad = xyes; then if test x$use_mpd_mad = xyes; then
CFLAGS="$CFLAGS -DUSE_MPD_MAD" MPD_CFLAGS="$MPD_CFLAGS -DUSE_MPD_MAD"
MAD_LIB="libmad/libmad.la" MAD_LIB="libmad/libmad.la"
MAD_SUBDIR="libmad" MAD_SUBDIR="libmad"
...@@ -8517,7 +8370,7 @@ fi ...@@ -8517,7 +8370,7 @@ fi
subdirs="$subdirs libmad" subdirs="$subdirs libmad"
fi fi
CFLAGS="$CFLAGS -DHAVE_MAD" MPD_CFLAGS="$MPD_CFLAGS -DHAVE_MAD"
fi fi
if test x$enable_ogg = xyes; then if test x$enable_ogg = xyes; then
...@@ -8635,7 +8488,7 @@ fi ...@@ -8635,7 +8488,7 @@ fi
if test "x$no_ogg" = "x" ; then if test "x$no_ogg" = "x" ; then
echo "$as_me:$LINENO: result: yes" >&5 echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6 echo "${ECHO_T}yes" >&6
LIBS="$LIBS $OGG_LIBS" CFLAGS="$CFLAGS $OGG_CFLAGS" enable_vorbistest=no MPD_LIBS="$MPD_LIBS $OGG_LIBS" MPD_CFLAGS="$MPD_CFLAGS $OGG_CFLAGS" enable_vorbistest=no
else else
echo "$as_me:$LINENO: result: no" >&5 echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
...@@ -8787,6 +8640,7 @@ cat >>conftest.$ac_ext <<_ACEOF ...@@ -8787,6 +8640,7 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <vorbis/codec.h> #include <vorbis/codec.h>
#include <vorbis/vorbisenc.h>
int main () int main ()
{ {
...@@ -8795,7 +8649,7 @@ int main () ...@@ -8795,7 +8649,7 @@ int main ()
vorbis_info vi; vorbis_info vi;
vorbis_info_init (&vi); vorbis_info_init (&vi);
vorbis_encode_init (&vi, 2, 44100, -1, 128, -1); vorbis_encode_init (&vi, 2, 44100, -1, 128000, -1);
vorbis_analysis_init (&vd, &vi); vorbis_analysis_init (&vd, &vi);
vorbis_block_init (&vd, &vb); vorbis_block_init (&vd, &vb);
/* this function was added in 1.0rc3, so this is what we're testing for */ /* this function was added in 1.0rc3, so this is what we're testing for */
...@@ -8836,7 +8690,7 @@ fi ...@@ -8836,7 +8690,7 @@ fi
if test "x$no_vorbis" = "x" ; then if test "x$no_vorbis" = "x" ; then
echo "$as_me:$LINENO: result: yes" >&5 echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6 echo "${ECHO_T}yes" >&6
LIBS="$LIBS $VORBIS_LIBS $VORBISFILE_LIBS" CFLAGS="$CFLAGS $VORBIS_CFLAGS $VORBISFILE_CFLAGS" MPD_LIBS="$MPD_LIBS $VORBIS_LIBS $VORBISFILE_LIBS" MPD_CFLAGS="$MPD_CFLAGS $VORBIS_CFLAGS $VORBISFILE_CFLAGS"
else else
echo "$as_me:$LINENO: result: no" >&5 echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
...@@ -8845,7 +8699,7 @@ echo "${ECHO_T}no" >&6 ...@@ -8845,7 +8699,7 @@ echo "${ECHO_T}no" >&6
else else
echo "*** Could not run Vorbis test program, checking why..." echo "*** Could not run Vorbis test program, checking why..."
CFLAGS="$CFLAGS $VORBIS_CFLAGS" CFLAGS="$CFLAGS $VORBIS_CFLAGS"
LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS" LIBS="$LIBS $VORBIS_LIBS $VORBISENC_LIBS $OGG_LIBS"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
/* confdefs.h. */ /* confdefs.h. */
...@@ -8913,12 +8767,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ...@@ -8913,12 +8767,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi fi
if test x$enable_ogg = xyes; then if test x$enable_ogg = xyes; then
CFLAGS="$CFLAGS -DHAVE_OGG" MPD_CFLAGS="$MPD_CFLAGS -DHAVE_OGG"
fi fi
if test x$enable_flac = xyes; then if test x$enable_flac = xyes; then
oldcflags="$CFLAGS" oldmpdcflags="$MPD_CFLAGS"
oldlibs="$LIBS" oldmpdlibs="$MPD_LIBS"
# Check whether --with-libFLAC or --without-libFLAC was given. # Check whether --with-libFLAC or --without-libFLAC was given.
if test "${with_libFLAC+set}" = set; then if test "${with_libFLAC+set}" = set; then
...@@ -9035,7 +8889,7 @@ fi ...@@ -9035,7 +8889,7 @@ fi
if test "x$no_libFLAC" = "x" ; then if test "x$no_libFLAC" = "x" ; then
echo "$as_me:$LINENO: result: yes" >&5 echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6 echo "${ECHO_T}yes" >&6
LIBS="$LIBS $LIBFLAC_LIBS" CFLAGS="$CFLAGS $LIBFLAC_CFLAGS" MPD_LIBS="$MPD_LIBS $LIBFLAC_LIBS" MPD_CFLAGS="$MPD_CFLAGS $LIBFLAC_CFLAGS"
else else
echo "$as_me:$LINENO: result: no" >&5 echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
...@@ -9109,6 +8963,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ...@@ -9109,6 +8963,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi fi
if test x$enable_flac = xyes; then if test x$enable_flac = xyes; then
oldcflags="$CFLAGS"
oldlibs="$LIBS"
CFLAGS="$CFLAGS $MPD_CFLAGS"
LIBS="$LIBS $MPD_LIBS"
echo "$as_me:$LINENO: checking for FLAC__metadata_object_vorbiscomment_find_entry_from in -lFLAC" >&5 echo "$as_me:$LINENO: checking for FLAC__metadata_object_vorbiscomment_find_entry_from in -lFLAC" >&5
echo $ECHO_N "checking for FLAC__metadata_object_vorbiscomment_find_entry_from in -lFLAC... $ECHO_C" >&6 echo $ECHO_N "checking for FLAC__metadata_object_vorbiscomment_find_entry_from in -lFLAC... $ECHO_C" >&6
...@@ -9177,14 +9035,16 @@ echo "$as_me: WARNING: You need FLAC 1.1 -- disabling flac support" >&2;} ...@@ -9177,14 +9035,16 @@ echo "$as_me: WARNING: You need FLAC 1.1 -- disabling flac support" >&2;}
fi fi
if test x$enable_flac = xno; then if test x$enable_flac = xno; then
CFLAGS="$oldcflags" MPD_CFLAGS="$oldmpdcflags"
LIBS="$oldlibs" MPD_LIBS="$oldmpdlibs"
fi fi
CFLAGS="$oldcflags"
LIBS="$oldlibs"
fi fi
if test x$enable_flac = xyes; then if test x$enable_flac = xyes; then
CFLAGS="$CFLAGS -DHAVE_FLAC" MPD_CFLAGS="$MPD_CFLAGS -DHAVE_FLAC"
fi fi
ac_config_files="$ac_config_files Makefile" ac_config_files="$ac_config_files Makefile"
...@@ -9317,6 +9177,13 @@ echo "$as_me: error: conditional \"AMDEP\" was never defined. ...@@ -9317,6 +9177,13 @@ echo "$as_me: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;} Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
: ${CONFIG_STATUS=./config.status} : ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files ac_clean_files_save=$ac_clean_files
...@@ -9844,6 +9711,7 @@ s,@LIBS@,$LIBS,;t t ...@@ -9844,6 +9711,7 @@ s,@LIBS@,$LIBS,;t t
s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t
s,@CYGPATH_W@,$CYGPATH_W,;t t
s,@PACKAGE@,$PACKAGE,;t t s,@PACKAGE@,$PACKAGE,;t t
s,@VERSION@,$VERSION,;t t s,@VERSION@,$VERSION,;t t
s,@ACLOCAL@,$ACLOCAL,;t t s,@ACLOCAL@,$ACLOCAL,;t t
...@@ -9872,6 +9740,8 @@ s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t ...@@ -9872,6 +9740,8 @@ s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
s,@CCDEPMODE@,$CCDEPMODE,;t t s,@CCDEPMODE@,$CCDEPMODE,;t t
s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
s,@build@,$build,;t t s,@build@,$build,;t t
s,@build_cpu@,$build_cpu,;t t s,@build_cpu@,$build_cpu,;t t
s,@build_vendor@,$build_vendor,;t t s,@build_vendor@,$build_vendor,;t t
...@@ -9893,6 +9763,8 @@ s,@MAD_SUBDIR@,$MAD_SUBDIR,;t t ...@@ -9893,6 +9763,8 @@ s,@MAD_SUBDIR@,$MAD_SUBDIR,;t t
s,@MAD_LIB@,$MAD_LIB,;t t s,@MAD_LIB@,$MAD_LIB,;t t
s,@ID3_SUBDIR@,$ID3_SUBDIR,;t t s,@ID3_SUBDIR@,$ID3_SUBDIR,;t t
s,@ID3_LIB@,$ID3_LIB,;t t s,@ID3_LIB@,$ID3_LIB,;t t
s,@MPD_LIBS@,$MPD_LIBS,;t t
s,@MPD_CFLAGS@,$MPD_CFLAGS,;t t
s,@AO_CFLAGS@,$AO_CFLAGS,;t t s,@AO_CFLAGS@,$AO_CFLAGS,;t t
s,@AO_LIBS@,$AO_LIBS,;t t s,@AO_LIBS@,$AO_LIBS,;t t
s,@subdirs@,$subdirs,;t t s,@subdirs@,$subdirs,;t t
......
configure.in
View file @ d94eaf58
AC_INIT(main.c) AC_INIT(main.c)
AM_INIT_AUTOMAKE(mpd, 0.8.1) AM_INIT_AUTOMAKE(mpd, 0.8.2)
AC_PROG_CC AC_PROG_CC
AC_PROG_INSTALL AC_PROG_INSTALL
...@@ -8,13 +8,16 @@ AC_PROG_LIBTOOL ...@@ -8,13 +8,16 @@ AC_PROG_LIBTOOL
dnl MAD wants this stuff dnl MAD wants this stuff
AC_SUBST(CCAS) AC_SUBST(CCAS)
AC_SUBST(CCASFLAGS) AC_SUBST(CCASFLAGS)
AC_SUBST(MAD_SUBDIR) AC_SUBST(MAD_SUBDIR)
AC_SUBST(MAD_LIB) AC_SUBST(MAD_LIB)
AC_SUBST(ID3_SUBDIR) AC_SUBST(ID3_SUBDIR)
AC_SUBST(ID3_LIB) AC_SUBST(ID3_LIB)
AC_SUBST(MPD_LIBS)
AC_SUBST(MPD_CFLAGS)
set -- $CFLAGS MPD_CFLAGS="-Wall"
CFLAGS="-Wall $CFLAGS" MPD_LIBS=""
AC_ARG_ENABLE(ogg,[ --disable-ogg disable ogg support],,enable_ogg=yes) AC_ARG_ENABLE(ogg,[ --disable-ogg disable ogg support],,enable_ogg=yes)
AC_ARG_ENABLE(flac,[ --disable-flac disable flac support],,enable_flac=yes) AC_ARG_ENABLE(flac,[ --disable-flac disable flac support],,enable_flac=yes)
...@@ -23,8 +26,8 @@ AC_ARG_ENABLE(mpd_mad,[ --enable-mpd-mad use mpd libmad],use_mpd_mad=yes,) ...@@ -23,8 +26,8 @@ AC_ARG_ENABLE(mpd_mad,[ --enable-mpd-mad use mpd libmad],use_mpd_mad=yes,)
AC_ARG_ENABLE(id3,[ --disable-id3 disable id3 support],,enable_id3=yes) AC_ARG_ENABLE(id3,[ --disable-id3 disable id3 support],,enable_id3=yes)
AC_ARG_ENABLE(mpd_id3tag,[ --enable-mpd-id3tag use mpd libid3tag],use_mpd_id3tag=yes,) AC_ARG_ENABLE(mpd_id3tag,[ --enable-mpd-id3tag use mpd libid3tag],use_mpd_id3tag=yes,)
XIPH_PATH_AO(LIBS="$LIBS $AO_LIBS" CFLAGS="$CFLAGS $AO_CFLAGS",AC_MSG_ERROR(Must have libao installed!!!)) XIPH_PATH_AO(MPD_LIBS="$MPD_LIBS $AO_LIBS" MPD_CFLAGS="$MPD_CFLAGS $AO_CFLAGS",AC_MSG_ERROR(Must have libao installed!!!))
AC_CHECK_HEADER(sys/soundcard.h,CFLAGS="$CFLAGS",[CFLAGS="$CFLAGS -DNO_OSS_MIXER";AC_MSG_WARN(Soundcard headers not found -- disabling mixer)]) AC_CHECK_HEADER(sys/soundcard.h,,[MPD_CFLAGS="$MPD_CFLAGS -DNO_OSS_MIXER";AC_MSG_WARN(Soundcard headers not found -- disabling mixer)])
ID3_SUBDIR="" ID3_SUBDIR=""
...@@ -40,12 +43,12 @@ if test x$enable_id3 = xyes; then ...@@ -40,12 +43,12 @@ if test x$enable_id3 = xyes; then
CFLAGS=$oldcflags CFLAGS=$oldcflags
fi fi
if test x$use_mpd_id3tag = xyes; then if test x$use_mpd_id3tag = xyes; then
CFLAGS="$CFLAGS -DUSE_MPD_ID3TAG" MPD_CFLAGS="$MPD_CFLAGS -DUSE_MPD_ID3TAG"
ID3_LIB="libid3tag/libid3tag.la" ID3_LIB="libid3tag/libid3tag.la"
ID3_SUBDIR="libid3tag" ID3_SUBDIR="libid3tag"
AC_CONFIG_SUBDIRS(libid3tag) AC_CONFIG_SUBDIRS(libid3tag)
fi fi
CFLAGS="$CFLAGS -DHAVE_ID3TAG" MPD_CFLAGS="$MPD_CFLAGS -DHAVE_ID3TAG"
fi fi
MAD_SUBDIR="" MAD_SUBDIR=""
...@@ -58,44 +61,50 @@ if test x$enable_mp3 = xyes; then ...@@ -58,44 +61,50 @@ if test x$enable_mp3 = xyes; then
[use_libmad=no;use_mpd_mad=yes]) [use_libmad=no;use_mpd_mad=yes])
fi fi
if test x$use_mpd_mad = xyes; then if test x$use_mpd_mad = xyes; then
CFLAGS="$CFLAGS -DUSE_MPD_MAD" MPD_CFLAGS="$MPD_CFLAGS -DUSE_MPD_MAD"
MAD_LIB="libmad/libmad.la" MAD_LIB="libmad/libmad.la"
MAD_SUBDIR="libmad" MAD_SUBDIR="libmad"
AC_CONFIG_SUBDIRS(libmad) AC_CONFIG_SUBDIRS(libmad)
fi fi
CFLAGS="$CFLAGS -DHAVE_MAD" MPD_CFLAGS="$MPD_CFLAGS -DHAVE_MAD"
fi fi
if test x$enable_ogg = xyes; then if test x$enable_ogg = xyes; then
XIPH_PATH_OGG(LIBS="$LIBS $OGG_LIBS" CFLAGS="$CFLAGS $OGG_CFLAGS" enable_vorbistest=no,enable_ogg=no) XIPH_PATH_OGG(MPD_LIBS="$MPD_LIBS $OGG_LIBS" MPD_CFLAGS="$MPD_CFLAGS $OGG_CFLAGS" enable_vorbistest=no,enable_ogg=no)
fi fi
if test x$enable_ogg = xyes; then if test x$enable_ogg = xyes; then
XIPH_PATH_VORBIS(LIBS="$LIBS $VORBIS_LIBS $VORBISFILE_LIBS" CFLAGS="$CFLAGS $VORBIS_CFLAGS $VORBISFILE_CFLAGS",enable_ogg=no) XIPH_PATH_VORBIS(MPD_LIBS="$MPD_LIBS $VORBIS_LIBS $VORBISFILE_LIBS" MPD_CFLAGS="$MPD_CFLAGS $VORBIS_CFLAGS $VORBISFILE_CFLAGS",enable_ogg=no)
fi fi
if test x$enable_ogg = xyes; then if test x$enable_ogg = xyes; then
CFLAGS="$CFLAGS -DHAVE_OGG" MPD_CFLAGS="$MPD_CFLAGS -DHAVE_OGG"
fi fi
if test x$enable_flac = xyes; then if test x$enable_flac = xyes; then
oldcflags="$CFLAGS" oldmpdcflags="$MPD_CFLAGS"
oldlibs="$LIBS" oldmpdlibs="$MPD_LIBS"
AM_PATH_LIBFLAC(LIBS="$LIBS $LIBFLAC_LIBS" CFLAGS="$CFLAGS $LIBFLAC_CFLAGS",enable_flac=no) AM_PATH_LIBFLAC(MPD_LIBS="$MPD_LIBS $LIBFLAC_LIBS" MPD_CFLAGS="$MPD_CFLAGS $LIBFLAC_CFLAGS",enable_flac=no)
fi fi
if test x$enable_flac = xyes; then if test x$enable_flac = xyes; then
oldcflags="$CFLAGS"
oldlibs="$LIBS"
CFLAGS="$CFLAGS $MPD_CFLAGS"
LIBS="$LIBS $MPD_LIBS"
AC_CHECK_LIB(FLAC, FLAC__metadata_object_vorbiscomment_find_entry_from, AC_CHECK_LIB(FLAC, FLAC__metadata_object_vorbiscomment_find_entry_from,
,[enable_flac=no;AC_MSG_WARN(You need FLAC 1.1 -- disabling flac support)]) ,[enable_flac=no;AC_MSG_WARN(You need FLAC 1.1 -- disabling flac support)])
if test x$enable_flac = xno; then if test x$enable_flac = xno; then
CFLAGS="$oldcflags" MPD_CFLAGS="$oldmpdcflags"
LIBS="$oldlibs" MPD_LIBS="$oldmpdlibs"
fi fi
CFLAGS="$oldcflags"
LIBS="$oldlibs"
fi fi
if test x$enable_flac = xyes; then if test x$enable_flac = xyes; then
CFLAGS="$CFLAGS -DHAVE_FLAC" MPD_CFLAGS="$MPD_CFLAGS -DHAVE_FLAC"
fi fi
AC_OUTPUT(Makefile) AC_OUTPUT(Makefile)
install-sh
View file @ d94eaf58
#!/bin/sh #!/bin/sh
# #
# install - install a program, script, or datafile # install - install a program, script, or datafile
# This comes from X11R5 (mit/util/scripts/install.sh).
# #
# This originates from X11R5 (mit/util/scripts/install.sh), which was # Copyright 1991 by the Massachusetts Institute of Technology
# later released in X11R6 (xc/config/util/install.sh) with the
# following copyright and license.
# #
# Copyright (C) 1994 X Consortium # Permission to use, copy, modify, distribute, and sell this software and its
# # documentation for any purpose is hereby granted without fee, provided that
# Permission is hereby granted, free of charge, to any person obtaining a copy # the above copyright notice appear in all copies and that both that
# of this software and associated documentation files (the "Software"), to # copyright notice and this permission notice appear in supporting
# deal in the Software without restriction, including without limitation the # documentation, and that the name of M.I.T. not be used in advertising or
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or # publicity pertaining to distribution of the software without specific,
# sell copies of the Software, and to permit persons to whom the Software is # written prior permission. M.I.T. makes no representations about the
# furnished to do so, subject to the following conditions: # suitability of this software for any purpose. It is provided "as is"
# # without express or implied warranty.
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
# Except as contained in this notice, the name of the X Consortium shall not
# be used in advertising or otherwise to promote the sale, use or other deal-
# ings in this Software without prior written authorization from the X Consor-
# tium.
#
#
# FSF changes to this file are in the public domain.
# #
# Calling this script install-sh is preferred over install.sh, to prevent # Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it # `make' implicit rules from creating a file called install from it
...@@ -74,7 +56,7 @@ dir_arg="" ...@@ -74,7 +56,7 @@ dir_arg=""
while [ x"$1" != x ]; do while [ x"$1" != x ]; do
case $1 in case $1 in
-c) instcmd="$cpprog" -c) instcmd=$cpprog
shift shift
continue;; continue;;
...@@ -97,7 +79,7 @@ while [ x"$1" != x ]; do ...@@ -97,7 +79,7 @@ while [ x"$1" != x ]; do
shift shift
continue;; continue;;
-s) stripcmd="$stripprog" -s) stripcmd=$stripprog
shift shift
continue;; continue;;
...@@ -124,7 +106,7 @@ done ...@@ -124,7 +106,7 @@ done
if [ x"$src" = x ] if [ x"$src" = x ]
then then
echo "install: no input file specified" echo "$0: no input file specified" >&2
exit 1 exit 1
else else
: :
...@@ -133,8 +115,8 @@ fi ...@@ -133,8 +115,8 @@ fi
if [ x"$dir_arg" != x ]; then if [ x"$dir_arg" != x ]; then
dst=$src dst=$src
src="" src=""
if [ -d $dst ]; then if [ -d "$dst" ]; then
instcmd=: instcmd=:
chmodcmd="" chmodcmd=""
else else
...@@ -143,20 +125,20 @@ if [ x"$dir_arg" != x ]; then ...@@ -143,20 +125,20 @@ if [ x"$dir_arg" != x ]; then
else else
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
# might cause directories to be created, which would be especially bad # might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'. # if $src (and thus $dsttmp) contains '*'.
if [ -f "$src" ] || [ -d "$src" ] if [ -f "$src" ] || [ -d "$src" ]
then then
: :
else else
echo "install: $src does not exist" echo "$0: $src does not exist" >&2
exit 1 exit 1
fi fi
if [ x"$dst" = x ] if [ x"$dst" = x ]
then then
echo "install: no destination specified" echo "$0: no destination specified" >&2
exit 1 exit 1
else else
: :
...@@ -165,16 +147,16 @@ else ...@@ -165,16 +147,16 @@ else
# If destination is a directory, append the input filename; if your system # If destination is a directory, append the input filename; if your system
# does not like double slashes in filenames, you may need to add some logic # does not like double slashes in filenames, you may need to add some logic
if [ -d $dst ] if [ -d "$dst" ]
then then
dst="$dst"/`basename $src` dst=$dst/`basename "$src"`
else else
: :
fi fi
fi fi
## this sed command emulates the dirname command ## this sed command emulates the dirname command
dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
# Make sure that the destination directory exists. # Make sure that the destination directory exists.
# this part is taken from Noah Friedman's mkinstalldirs script # this part is taken from Noah Friedman's mkinstalldirs script
...@@ -183,69 +165,73 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` ...@@ -183,69 +165,73 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
if [ ! -d "$dstdir" ]; then if [ ! -d "$dstdir" ]; then
defaultIFS=' defaultIFS='
' '
IFS="${IFS-${defaultIFS}}" IFS="${IFS-$defaultIFS}"
oIFS="${IFS}" oIFS=$IFS
# Some sh's can't handle IFS=/ for some reason. # Some sh's can't handle IFS=/ for some reason.
IFS='%' IFS='%'
set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
IFS="${oIFS}" IFS=$oIFS
pathcomp='' pathcomp=''
while [ $# -ne 0 ] ; do while [ $# -ne 0 ] ; do
pathcomp="${pathcomp}${1}" pathcomp=$pathcomp$1
shift shift
if [ ! -d "${pathcomp}" ] ; if [ ! -d "$pathcomp" ] ;
then then
$mkdirprog "${pathcomp}" $mkdirprog "$pathcomp"
else else
: :
fi fi
pathcomp="${pathcomp}/" pathcomp=$pathcomp/
done done
fi fi
if [ x"$dir_arg" != x ] if [ x"$dir_arg" != x ]
then then
$doit $instcmd $dst && $doit $instcmd "$dst" &&
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi && if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
else else
# If we're going to rename the final executable, determine the name now. # If we're going to rename the final executable, determine the name now.
if [ x"$transformarg" = x ] if [ x"$transformarg" = x ]
then then
dstfile=`basename $dst` dstfile=`basename "$dst"`
else else
dstfile=`basename $dst $transformbasename | dstfile=`basename "$dst" $transformbasename |
sed $transformarg`$transformbasename sed $transformarg`$transformbasename
fi fi
# don't allow the sed command to completely eliminate the filename # don't allow the sed command to completely eliminate the filename
if [ x"$dstfile" = x ] if [ x"$dstfile" = x ]
then then
dstfile=`basename $dst` dstfile=`basename "$dst"`
else else
: :
fi fi
# Make a temp file name in the proper directory. # Make a couple of temp file names in the proper directory.
dsttmp=$dstdir/#inst.$$# dsttmp=$dstdir/#inst.$$#
rmtmp=$dstdir/#rm.$$#
# Move or copy the file name to the temp name # Trap to clean up temp files at exit.
$doit $instcmd $src $dsttmp && trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
trap '(exit $?); exit' 1 2 13 15
trap "rm -f ${dsttmp}" 0 && # Move or copy the file name to the temp name
$doit $instcmd "$src" "$dsttmp" &&
# and set any options; do chmod last to preserve setuid bits # and set any options; do chmod last to preserve setuid bits
...@@ -253,17 +239,38 @@ else ...@@ -253,17 +239,38 @@ else
# ignore errors from any of these, just make sure not to ignore # ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $instcmd $src $dsttmp" command. # errors from the above "$doit $instcmd $src $dsttmp" command.
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi && if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi && if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi && if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
# Now remove or move aside any old file at destination location. We try this
# two ways since rm can't unlink itself on some systems and the destination
# file might be busy for other reasons. In this case, the final cleanup
# might fail but the new file should still install successfully.
{
if [ -f "$dstdir/$dstfile" ]
then
$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
{
echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
(exit 1); exit
}
else
:
fi
} &&
# Now rename the file to the real destination. # Now rename the file to the real destination.
$doit $rmcmd -f $dstdir/$dstfile && $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
$doit $mvcmd $dsttmp $dstdir/$dstfile
fi && fi &&
# The final little trick to "correctly" pass the exit status to the exit trap.
exit 0 {
(exit 0); exit
}
interface.c
View file @ d94eaf58
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "conf.h" #include "conf.h"
#include "list.h" #include "list.h"
#include "myfprintf.h" #include "myfprintf.h"
#include "listen.h"
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
...@@ -30,9 +31,11 @@ ...@@ -30,9 +31,11 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/select.h>
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <signal.h>
#define GREETING "MPD" #define GREETING "MPD"
...@@ -42,6 +45,8 @@ ...@@ -42,6 +45,8 @@
int interface_max_connections; int interface_max_connections;
int interface_timeout; int interface_timeout;
unsigned long long interface_max_command_list_size;
unsigned long long interface_max_output_buffer_size;
typedef struct _Interface { typedef struct _Interface {
char buffer[INTERFACE_MAX_BUFFER_LENGTH+2]; char buffer[INTERFACE_MAX_BUFFER_LENGTH+2];
...@@ -51,24 +56,35 @@ typedef struct _Interface { ...@@ -51,24 +56,35 @@ typedef struct _Interface {
int open; /* open/used */ int open; /* open/used */
time_t lastTime; time_t lastTime;
List * commandList; /* for when in list mode */ List * commandList; /* for when in list mode */
unsigned long long commandListSize; /* mem commandList consumes */
List * bufferList; /* for output if client is slow */ List * bufferList; /* for output if client is slow */
unsigned long long outputBufferSize; /* mem bufferList consumes */
int expired; /* set wether this interface should be closed on next
check of old interfaces */
} Interface; } Interface;
Interface * interfaces = NULL; Interface * interfaces = NULL;
void flushInterfaceBuffer(Interface * interface);
void openInterface(Interface * interface, int fd) { void openInterface(Interface * interface, int fd) {
int flags;
assert(interface->open==0); assert(interface->open==0);
fcntl(fd,F_SETFD,FD_CLOEXEC);
interface->bufferLength = 0; interface->bufferLength = 0;
interface->fd = fd; interface->fd = fd;
fcntl(interface->fd,F_SETFL,O_NONBLOCK); fcntl(interface->fd,F_SETOWN,(int)getpid());
flags = fcntl(fd,F_GETFL);
flags|=O_NONBLOCK | O_ASYNC;
fcntl(interface->fd,F_SETFL,flags);
interface->fp = fdopen(fd,"rw"); interface->fp = fdopen(fd,"rw");
interface->open = 1; interface->open = 1;
interface->lastTime = time(NULL); interface->lastTime = time(NULL);
interface->commandList = NULL; interface->commandList = NULL;
interface->bufferList = NULL; interface->bufferList = NULL;
interface->expired = 0;
interface->outputBufferSize = 0;
myfprintf(interface->fp,"%s %s %s\n",COMMAND_RESPOND_OK,GREETING,VERSION); myfprintf(interface->fp,"%s %s %s\n",COMMAND_RESPOND_OK,GREETING,VERSION);
} }
...@@ -145,12 +161,23 @@ int interfaceReadInput(Interface * interface) { ...@@ -145,12 +161,23 @@ int interfaceReadInput(Interface * interface) {
interface->commandList = NULL; interface->commandList = NULL;
} }
else { else {
insertInListWithoutKey(interface->commandList,strdup(interface->buffer)); interface->commandListSize+=sizeof(ListNode);
interface->commandListSize+=strlen(interface->buffer)+1;
if(interface->commandListSize>interface_max_command_list_size) {
fprintf(stderr,"command list size (%lli) is larger than the max (%lli)\n",interface->commandListSize,interface_max_command_list_size);
closeInterface(interface);
}
else {
insertInListWithoutKey(interface->commandList,strdup(interface->buffer));
}
} }
} }
else { else {
if(strcmp(argArray[0],INTERFACE_LIST_MODE_BEGIN)==0) { if(strcmp(argArray[0],INTERFACE_LIST_MODE_BEGIN)==0) {
interface->commandList = makeList(free); interface->commandList = makeList(free);
interface->commandListSize =
sizeof(List);
ret = 1; ret = 1;
} }
else { else {
...@@ -177,13 +204,27 @@ int interfaceReadInput(Interface * interface) { ...@@ -177,13 +204,27 @@ int interfaceReadInput(Interface * interface) {
return 1; return 1;
} }
void addInterfacesToFdSet(fd_set * fds) { void addInterfacesReadyToReadAndListenSocketToFdSet(fd_set * fds) {
int i; int i;
FD_ZERO(fds); FD_ZERO(fds);
FD_SET(listenSocket,fds);
for(i=0;i<interface_max_connections;i++) { for(i=0;i<interface_max_connections;i++) {
if(interfaces[i].open && !interfaces[i].bufferList) { if(interfaces[i].open && !interfaces[i].expired && !interfaces[i].bufferList) {
FD_SET(interfaces[i].fd,fds);
}
}
}
void addInterfacesForBufferFlushToFdSet(fd_set * fds) {
int i;
FD_ZERO(fds);
FD_SET(listenSocket,fds);
for(i=0;i<interface_max_connections;i++) {
if(interfaces[i].open && !interfaces[i].expired && interfaces[i].bufferList) {
FD_SET(interfaces[i].fd,fds); FD_SET(interfaces[i].fd,fds);
} }
} }
...@@ -195,7 +236,7 @@ void closeNextErroredInterface() { ...@@ -195,7 +236,7 @@ void closeNextErroredInterface() {
int i; int i;
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = 1000; tv.tv_usec = 0;
for(i=0;i<interface_max_connections;i++) { for(i=0;i<interface_max_connections;i++) {
if(interfaces[i].open) { if(interfaces[i].open) {
...@@ -209,31 +250,41 @@ void closeNextErroredInterface() { ...@@ -209,31 +250,41 @@ void closeNextErroredInterface() {
} }
} }
int readInputFromInterfaces() { int doIOForInterfaces() {
fd_set fds; fd_set rfds;
fd_set wfds;
struct timeval tv; struct timeval tv;
int i; int i;
int selret; int selret;
tv.tv_sec = 0; tv.tv_sec = 1;
tv.tv_usec = 1000; tv.tv_usec = 0;
addInterfacesToFdSet(&fds); addInterfacesReadyToReadAndListenSocketToFdSet(&rfds);
addInterfacesForBufferFlushToFdSet(&wfds);
while((selret = select(FD_SETSIZE,&fds,NULL,NULL,&tv))) { while((selret = select(FD_SETSIZE,&rfds,&wfds,NULL,&tv))) {
if(FD_ISSET(listenSocket,&rfds)) getConnections(listenSocket);
if(selret<0) { if(selret<0) {
closeNextErroredInterface(); closeNextErroredInterface();
continue; continue;
} }
for(i=0;i<interface_max_connections;i++) { for(i=0;i<interface_max_connections;i++) {
if(interfaces[i].open && FD_ISSET(interfaces[i].fd,&fds)) { if(interfaces[i].open && FD_ISSET(interfaces[i].fd,&rfds)) {
if(COMMAND_RETURN_KILL==interfaceReadInput(&(interfaces[i]))) { if(COMMAND_RETURN_KILL==interfaceReadInput(&(interfaces[i]))) {
return COMMAND_RETURN_KILL; return COMMAND_RETURN_KILL;
} }
interfaces[i].lastTime = time(NULL); interfaces[i].lastTime = time(NULL);
} }
if(interfaces[i].open && FD_ISSET(interfaces[i].fd,&wfds)) {
flushInterfaceBuffer(&interfaces[i]);
interfaces[i].lastTime = time(NULL);
}
} }
addInterfacesToFdSet(&fds); tv.tv_sec = 0;
tv.tv_usec = 0;
addInterfacesReadyToReadAndListenSocketToFdSet(&rfds);
addInterfacesForBufferFlushToFdSet(&wfds);
} }
return 1; return 1;
...@@ -244,17 +295,32 @@ void initInterfaces() { ...@@ -244,17 +295,32 @@ void initInterfaces() {
char * test; char * test;
interface_timeout = strtol((getConf())[CONF_CONNECTION_TIMEOUT],&test,10); interface_timeout = strtol((getConf())[CONF_CONNECTION_TIMEOUT],&test,10);
if(*test!='\0') { if(*test!='\0' || interface_timeout<=0) {
fprintf(stderr,"connection timeout \"%s\" is not an integer\n",(getConf())[CONF_CONNECTION_TIMEOUT]); fprintf(stderr,"connection timeout \"%s\" is not a positive integer\n",(getConf())[CONF_CONNECTION_TIMEOUT]);
exit(-1); exit(-1);
} }
interface_max_connections = strtol((getConf())[CONF_MAX_CONNECTIONS],&test,10); interface_max_connections = strtol((getConf())[CONF_MAX_CONNECTIONS],&test,10);
if(*test!='\0') { if(*test!='\0' || interface_max_connections<=0) {
fprintf(stderr,"max connections \"%s\" is not an integer\n",(getConf())[CONF_MAX_CONNECTIONS]); fprintf(stderr,"max connections \"%s\" is not a positive integer\n",(getConf())[CONF_MAX_CONNECTIONS]);
exit(-1); exit(-1);
} }
interface_max_command_list_size = strtoll((getConf())[CONF_MAX_COMMAND_LIST_SIZE],&test,10);
if(*test!='\0' || interface_max_command_list_size<=0) {
fprintf(stderr,"max command list size \"%s\" is not a positive integer\n",(getConf())[CONF_MAX_COMMAND_LIST_SIZE]);
exit(-1);
}
interface_max_output_buffer_size = strtoll((getConf())[CONF_MAX_OUTPUT_BUFFER_SIZE],&test,10);
if(*test!='\0' || interface_max_output_buffer_size<=0) {
fprintf(stderr,"max output buffer size \"%s\" is not a positive integer\n",(getConf())[CONF_MAX_OUTPUT_BUFFER_SIZE]);
exit(-1);
}
interface_max_command_list_size*=1024;
interface_max_output_buffer_size*=1024;
interfaces = malloc(sizeof(Interface)*interface_max_connections); interfaces = malloc(sizeof(Interface)*interface_max_connections);
for(i=0;i<interface_max_connections;i++) { for(i=0;i<interface_max_connections;i++) {
...@@ -284,7 +350,7 @@ void closeOldInterfaces() { ...@@ -284,7 +350,7 @@ void closeOldInterfaces() {
int i; int i;
for(i=0;i<interface_max_connections;i++) { for(i=0;i<interface_max_connections;i++) {
if(interfaces[i].open && (time(NULL)-interfaces[i].lastTime>interface_timeout)) { if(interfaces[i].open && (interfaces[i].expired || (time(NULL)-interfaces[i].lastTime>interface_timeout))) {
closeInterface(&(interfaces[i])); closeInterface(&(interfaces[i]));
} }
} }
...@@ -309,27 +375,36 @@ void flushInterfaceBuffer(Interface * interface) { ...@@ -309,27 +375,36 @@ void flushInterfaceBuffer(Interface * interface) {
str = (char *)node->data; str = (char *)node->data;
if((ret = write(interface->fd,str,strlen(str)))<0) break; if((ret = write(interface->fd,str,strlen(str)))<0) break;
else if(ret<strlen(str)) { else if(ret<strlen(str)) {
interface->outputBufferSize-=ret;
str = strdup(&str[ret]); str = strdup(&str[ret]);
free(node->data); free(node->data);
node->data = str; node->data = str;
} }
else { else {
interface->outputBufferSize-= strlen(str)+1;
interface->outputBufferSize-= sizeof(ListNode);
deleteNodeFromList(interface->bufferList,node); deleteNodeFromList(interface->bufferList,node);
} }
interface->lastTime = time(NULL);
} }
if(!interface->bufferList->firstNode) { if(!interface->bufferList->firstNode) {
freeList(interface->bufferList); freeList(interface->bufferList);
interface->bufferList = NULL; interface->bufferList = NULL;
} }
else if(errno!=EAGAIN) closeInterface(interface); else if(errno!=EAGAIN && errno!=EINTR) {
/* cause interface to close */
free(interface->bufferList);
interface->bufferList = NULL;
interface->expired = 1;
}
} }
void flushAllInterfaceBuffers() { void flushAllInterfaceBuffers() {
int i; int i;
for(i=0;i<interface_max_connections;i++) { for(i=0;i<interface_max_connections;i++) {
if(interfaces[i].open && interfaces[i].bufferList) { if(interfaces[i].open && !interfaces[i].expired && interfaces[i].bufferList) {
flushInterfaceBuffer(&interfaces[i]); flushInterfaceBuffer(&interfaces[i]);
} }
} }
...@@ -345,23 +420,45 @@ void interfacePrintWithFD(int fd,char * buffer) { ...@@ -345,23 +420,45 @@ void interfacePrintWithFD(int fd,char * buffer) {
if(interfaces[i].fd==fd) break; if(interfaces[i].fd==fd) break;
} }
if(i==interface_max_connections) return; /* if fd isn't found or interfaces is going to be closed, do nothing */
if(i==interface_max_connections || interfaces[i].expired) return;
if(interfaces[i].bufferList) { if(interfaces[i].bufferList) {
insertInListWithoutKey(interfaces[i].bufferList,(void *)strdup(buffer)); interfaces[i].outputBufferSize+=sizeof(ListNode);
flushInterfaceBuffer(&interfaces[i]); interfaces[i].outputBufferSize+=strlen(buffer)+1;
if(interfaces[i].outputBufferSize>interface_max_output_buffer_size) {
fprintf(stderr,"output buffer size (%lli) is larger than the max (%lli)\n",interfaces[i].outputBufferSize,interface_max_output_buffer_size);
/* cause interface to close */
free(interfaces[i].bufferList);
interfaces[i].bufferList = NULL;
interfaces[i].expired = 1;
return;
}
else {
insertInListWithoutKey(interfaces[i].bufferList,(void *)strdup(buffer));
flushInterfaceBuffer(&interfaces[i]);
}
} }
else { else {
if((ret = write(fd,buffer,strlen(buffer)))<0) { if((ret = write(fd,buffer,strlen(buffer)))<0) {
if(errno==EAGAIN) { if(errno==EAGAIN || errno==EINTR) {
interfaces[i].bufferList = makeList(free); interfaces[i].bufferList = makeList(free);
insertInListWithoutKey(interfaces[i].bufferList,(void *)strdup(buffer)); insertInListWithoutKey(interfaces[i].bufferList,(void *)strdup(buffer));
} }
else closeInterface(&interfaces[i]); else {
interfaces[i].expired = 1;
return;
}
} }
else if(ret<strlen(buffer)) { else if(ret<strlen(buffer)) {
interfaces[i].bufferList = makeList(free); interfaces[i].bufferList = makeList(free);
insertInListWithoutKey(interfaces[i].bufferList,(void *)strdup(&buffer[ret])); insertInListWithoutKey(interfaces[i].bufferList,(void *)strdup(&buffer[ret]));
} }
/* if we needed to create buffer, initizliaze bufferSize info */
if(interfaces[i].bufferList) {
interfaces[i].outputBufferSize = sizeof(List);
interfaces[i].outputBufferSize+=sizeof(ListNode);
interfaces[i].outputBufferSize+=strlen((char *)interfaces[i].bufferList->firstNode->data)+1;
}
} }
} }
interface.h
View file @ d94eaf58
...@@ -31,6 +31,6 @@ void closeInterfaceWithFD(int fd); ...@@ -31,6 +31,6 @@ void closeInterfaceWithFD(int fd);
void flushAllInterfaceBuffers(); void flushAllInterfaceBuffers();
void interfacePrintWithFD(int fd, char * buffer); void interfacePrintWithFD(int fd, char * buffer);
int readInputFromInterfaces(); int doIOForInterfaces();
#endif #endif
libid3tag/CHANGES
View file @ d94eaf58
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
libid3tag - ID3 tag manipulation library libid3tag - ID3 tag manipulation library
Copyright (C) 2000-2003 Underbit Technologies, Inc. Copyright (C) 2000-2003 Underbit Technologies, Inc.
$Id: CHANGES,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ $Id: CHANGES,v 1.2 2003/07/05 05:18:51 shank Exp $
=============================================================================== ===============================================================================
......
libid3tag/CREDITS
View file @ d94eaf58
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
libid3tag - ID3 tag manipulation library libid3tag - ID3 tag manipulation library
Copyright (C) 2000-2003 Underbit Technologies, Inc. Copyright (C) 2000-2003 Underbit Technologies, Inc.
$Id: CREDITS,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ $Id: CREDITS,v 1.2 2003/07/05 05:18:51 shank Exp $
=============================================================================== ===============================================================================
......
libid3tag/Makefile.am
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
## along with this program; if not, write to the Free Software ## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
## ##
## $Id: Makefile.am,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ ## $Id: Makefile.am,v 1.3 2003/07/05 06:12:40 shank Exp $
## ##
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
......
libid3tag/Makefile.in
View file @ d94eaf58
# Makefile.in generated by automake 1.6.3 from Makefile.am. # Makefile.in generated by automake 1.7.2 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
...@@ -13,77 +13,112 @@ ...@@ -13,77 +13,112 @@
# PARTICULAR PURPOSE. # PARTICULAR PURPOSE.
@SET_MAKE@ @SET_MAKE@
SHELL = @SHELL@
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = . top_builddir = .
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644 install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA) INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@ transform = $(program_transform_name)
NORMAL_INSTALL = : NORMAL_INSTALL = :
PRE_INSTALL = : PRE_INSTALL = :
POST_INSTALL = : POST_INSTALL = :
NORMAL_UNINSTALL = : NORMAL_UNINSTALL = :
PRE_UNINSTALL = : PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@ host_triplet = @host@
ACLOCAL = @ACLOCAL@
EXEEXT = @EXEEXT@ AMDEP_FALSE = @AMDEP_FALSE@
OBJEXT = @OBJEXT@ AMDEP_TRUE = @AMDEP_TRUE@
PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AS = @AS@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
CC = @CC@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEBUG_FALSE = @DEBUG_FALSE@
DEBUG_TRUE = @DEBUG_TRUE@
DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@ ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
LN_S = @LN_S@ LN_S = @LN_S@
OBJDUMP = @OBJDUMP@ LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@ am__include = @am__include@
am__quote = @am__quote@ am__quote = @am__quote@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@ install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
SUBDIRS = SUBDIRS =
...@@ -100,9 +135,9 @@ version_info = $(version_current):$(version_revision):$(version_age) ...@@ -100,9 +135,9 @@ version_info = $(version_current):$(version_revision):$(version_age)
EXTRA_DIST = genre.dat.sed \ EXTRA_DIST = genre.dat.sed \
CHANGES COPYRIGHT CREDITS README TODO VERSION CHANGES COPYRIGHT CREDITS README TODO VERSION
@DEBUG_FALSE@debug =
@DEBUG_TRUE@debug = debug.c debug.h @DEBUG_TRUE@debug = debug.c debug.h
@DEBUG_FALSE@debug =
libid3tag_la_SOURCES = version.c ucs4.c latin1.c utf16.c utf8.c \ libid3tag_la_SOURCES = version.c ucs4.c latin1.c utf16.c utf8.c \
parse.c render.c field.c frametype.c compat.c \ parse.c render.c field.c frametype.c compat.c \
...@@ -129,6 +164,12 @@ CONFIG_CLEAN_FILES = libid3tag.list ...@@ -129,6 +164,12 @@ CONFIG_CLEAN_FILES = libid3tag.list
LTLIBRARIES = $(noinst_LTLIBRARIES) LTLIBRARIES = $(noinst_LTLIBRARIES)
libid3tag_la_LIBADD = libid3tag_la_LIBADD =
am__libid3tag_la_SOURCES_DIST = version.c ucs4.c latin1.c utf16.c utf8.c \
parse.c render.c field.c frametype.c compat.c genre.c frame.c \
crc.c util.c tag.c file.c version.h ucs4.h latin1.h utf16.h \
utf8.h parse.h render.h field.h frametype.h compat.h genre.h \
frame.h crc.h util.h tag.h file.h id3tag.h global.h genre.dat \
debug.c debug.h
@DEBUG_TRUE@am__objects_1 = debug.lo @DEBUG_TRUE@am__objects_1 = debug.lo
@DEBUG_FALSE@am__objects_1 = @DEBUG_FALSE@am__objects_1 =
am_libid3tag_la_OBJECTS = version.lo ucs4.lo latin1.lo utf16.lo utf8.lo \ am_libid3tag_la_OBJECTS = version.lo ucs4.lo latin1.lo utf16.lo utf8.lo \
...@@ -136,11 +177,7 @@ am_libid3tag_la_OBJECTS = version.lo ucs4.lo latin1.lo utf16.lo utf8.lo \ ...@@ -136,11 +177,7 @@ am_libid3tag_la_OBJECTS = version.lo ucs4.lo latin1.lo utf16.lo utf8.lo \
frame.lo crc.lo util.lo tag.lo file.lo $(am__objects_1) frame.lo crc.lo util.lo tag.lo file.lo $(am__objects_1)
libid3tag_la_OBJECTS = $(am_libid3tag_la_OBJECTS) libid3tag_la_OBJECTS = $(am_libid3tag_la_OBJECTS)
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I. DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/../depcomp depcomp = $(SHELL) $(top_srcdir)/../depcomp
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles
@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/compat.Plo ./$(DEPDIR)/crc.Plo \ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/compat.Plo ./$(DEPDIR)/crc.Plo \
...@@ -159,15 +196,16 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ...@@ -159,15 +196,16 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
CCLD = $(CC) CCLD = $(CC)
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@ $(AM_LDFLAGS) $(LDFLAGS) -o $@
CFLAGS = @CFLAGS@ DIST_SOURCES = $(am__libid3tag_la_SOURCES_DIST) \
DIST_SOURCES = $(libid3tag_la_SOURCES) $(EXTRA_libid3tag_la_SOURCES) $(EXTRA_libid3tag_la_SOURCES)
HEADERS = $(noinst_HEADERS) HEADERS = $(noinst_HEADERS)
RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
uninstall-info-recursive all-recursive install-data-recursive \ ps-recursive install-info-recursive uninstall-info-recursive \
install-exec-recursive installdirs-recursive install-recursive \ all-recursive install-data-recursive install-exec-recursive \
uninstall-recursive check-recursive installcheck-recursive installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive
DIST_COMMON = README $(noinst_HEADERS) ../config.guess ../config.sub \ DIST_COMMON = README $(noinst_HEADERS) ../config.guess ../config.sub \
../depcomp ../install-sh ../ltmain.sh ../missing \ ../depcomp ../install-sh ../ltmain.sh ../missing \
../mkinstalldirs COPYING INSTALL Makefile.am Makefile.in TODO \ ../mkinstalldirs COPYING INSTALL Makefile.am Makefile.in TODO \
...@@ -220,7 +258,7 @@ clean-noinstLTLIBRARIES: ...@@ -220,7 +258,7 @@ clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test -z "$dir" && dir=.; \ test "$$dir" = "$$p" && dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \ echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \ rm -f "$${dir}/so_locations"; \
done done
...@@ -255,23 +293,37 @@ distclean-depend: ...@@ -255,23 +293,37 @@ distclean-depend:
-rm -rf ./$(DEPDIR) -rm -rf ./$(DEPDIR)
.c.o: .c.o:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
.c.obj: .c.obj:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
$(COMPILE) -c `cygpath -w $<` @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
.c.lo: .c.lo:
@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
CCDEPMODE = @CCDEPMODE@ @am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
mostlyclean-libtool: mostlyclean-libtool:
-rm -f *.lo -rm -f *.lo
...@@ -337,10 +389,17 @@ tags-recursive: ...@@ -337,10 +389,17 @@ tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \ list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ETAGS = etags ETAGS = etags
ETAGSFLAGS = ETAGSFLAGS =
CTAGS = ctags
CTAGSFLAGS =
tags: TAGS tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
...@@ -371,13 +430,28 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ ...@@ -371,13 +430,28 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique $$tags $$unique
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
GTAGS: GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \ here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \ && cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here && gtags -i $(GTAGS_ARGS) $$here
distclean-tags: distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = . top_distdir = .
...@@ -389,13 +463,20 @@ am__remove_distdir = \ ...@@ -389,13 +463,20 @@ am__remove_distdir = \
&& rm -fr $(distdir); }; } && rm -fr $(distdir); }; }
GZIP_ENV = --best GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print
distdir: $(DISTFILES) distdir: $(DISTFILES)
$(am__remove_distdir) $(am__remove_distdir)
mkdir $(distdir) mkdir $(distdir)
$(mkinstalldirs) $(distdir)/. $(distdir)/.. $(mkinstalldirs) $(distdir)/. $(distdir)/..
@list='$(DISTFILES)'; for file in $$list; do \ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
...@@ -452,8 +533,9 @@ distcheck: dist ...@@ -452,8 +533,9 @@ distcheck: dist
mkdir $(distdir)/=inst mkdir $(distdir)/=inst
chmod a-w $(distdir) chmod a-w $(distdir)
dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& cd $(distdir)/=build \ && cd $(distdir)/=build \
&& ../configure --srcdir=.. --prefix=$$dc_install_base \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) dvi \
...@@ -461,27 +543,44 @@ distcheck: dist ...@@ -461,27 +543,44 @@ distcheck: dist
&& $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
&& $(MAKE) $(AM_MAKEFLAGS) uninstall \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \
&& (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
|| { echo "ERROR: files left after uninstall:" ; \ distuninstallcheck \
find $$dc_install_base -type f -print ; \ && chmod -R a-w "$$dc_install_base" \
exit 1; } >&2 ) \ && ({ \
(cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
} || { rm -rf "$$dc_destdir"; exit 1; }) \
&& rm -rf "$$dc_destdir" \
&& $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
&& rm -f $(distdir).tar.gz \ && rm -f $(distdir).tar.gz \
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
$(am__remove_distdir) $(am__remove_distdir)
@echo "$(distdir).tar.gz is ready for distribution" | \ @echo "$(distdir).tar.gz is ready for distribution" | \
sed 'h;s/./=/g;p;x;p;x' sed 'h;s/./=/g;p;x;p;x'
distuninstallcheck:
cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
echo " (check DESTDIR support)"; \
fi ; \
$(distuninstallcheck_listfiles) ; \
exit 1; } >&2
distcleancheck: distclean distcleancheck: distclean
if test '$(srcdir)' = . ; then \ if test '$(srcdir)' = . ; then \
echo "ERROR: distcleancheck can only run from a VPATH build" ; \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
exit 1 ; \ exit 1 ; \
fi fi
test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left after distclean:" ; \ || { echo "ERROR: files left in build directory after distclean:" ; \
$(distcleancheck_listfiles) ; \ $(distcleancheck_listfiles) ; \
exit 1; } >&2 exit 1; } >&2
check-am: all-am check-am: all-am
check: check-recursive check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-recursive
all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
installdirs: installdirs-recursive installdirs: installdirs-recursive
installdirs-am: installdirs-am:
...@@ -550,27 +649,36 @@ mostlyclean: mostlyclean-recursive ...@@ -550,27 +649,36 @@ mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool mostlyclean-libtool
pdf: pdf-recursive
pdf-am:
ps: ps-recursive
ps-am:
uninstall-am: uninstall-info-am uninstall-am: uninstall-info-am
uninstall-info: uninstall-info-recursive uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
clean-generic clean-libtool clean-noinstLTLIBRARIES \ clean-generic clean-libtool clean-noinstLTLIBRARIES \
clean-recursive dist dist-all dist-gzip distcheck distclean \ clean-recursive ctags ctags-recursive dist dist-all dist-gzip \
distclean-compile distclean-depend distclean-generic \ distcheck distclean distclean-compile distclean-depend \
distclean-hdr distclean-libtool distclean-recursive \ distclean-generic distclean-hdr distclean-libtool \
distclean-tags distcleancheck distdir dvi dvi-am dvi-recursive \ distclean-recursive distclean-tags distcleancheck distdir \
info info-am info-recursive install install-am install-data \ distuninstallcheck dvi dvi-am dvi-recursive info info-am \
install-data-am install-data-recursive install-exec \ info-recursive install install-am install-data install-data-am \
install-exec-am install-exec-recursive install-info \ install-data-recursive install-exec install-exec-am \
install-info-am install-info-recursive install-man \ install-exec-recursive install-info install-info-am \
install-recursive install-strip installcheck installcheck-am \ install-info-recursive install-man install-recursive \
installdirs installdirs-am installdirs-recursive \ install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic \ installdirs-am installdirs-recursive maintainer-clean \
maintainer-clean-recursive mostlyclean mostlyclean-compile \ maintainer-clean-generic maintainer-clean-recursive mostlyclean \
mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
tags tags-recursive uninstall uninstall-am uninstall-info-am \ mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
uninstall-info-recursive uninstall-recursive ps-recursive tags tags-recursive uninstall uninstall-am \
uninstall-info-am uninstall-info-recursive uninstall-recursive
$(srcdir)/frametype.c: $(srcdir)/frametype.gperf Makefile.am $(srcdir)/frametype.c: $(srcdir)/frametype.gperf Makefile.am
......
libid3tag/README
View file @ d94eaf58
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
libid3tag - ID3 tag manipulation library libid3tag - ID3 tag manipulation library
Copyright (C) 2000-2003 Underbit Technologies, Inc. Copyright (C) 2000-2003 Underbit Technologies, Inc.
$Id: README,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ $Id: README,v 1.2 2003/07/05 05:18:51 shank Exp $
=============================================================================== ===============================================================================
......
libid3tag/TODO
View file @ d94eaf58
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
libid3tag - ID3 tag manipulation library libid3tag - ID3 tag manipulation library
Copyright (C) 2000-2003 Underbit Technologies, Inc. Copyright (C) 2000-2003 Underbit Technologies, Inc.
$Id: TODO,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ $Id: TODO,v 1.2 2003/07/05 05:18:51 shank Exp $
=============================================================================== ===============================================================================
......
libid3tag/aclocal.m4
View file @ d94eaf58
# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- # generated automatically by aclocal 1.7.2 -*- Autoconf -*-
# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
# CC etc. in the Makefile, will ask for an AC_PROG_CC use... # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
AC_PREREQ([2.52]) AC_PREREQ([2.54])
# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
# the ones we care about. # the ones we care about.
...@@ -69,6 +69,16 @@ if test "`cd $srcdir && pwd`" != "`pwd`" && ...@@ -69,6 +69,16 @@ if test "`cd $srcdir && pwd`" != "`pwd`" &&
AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi fi
# test whether we have cygpath
if test -z "$CYGPATH_W"; then
if (cygpath --version) >/dev/null 2>/dev/null; then
CYGPATH_W='cygpath -w'
else
CYGPATH_W=echo
fi
fi
AC_SUBST([CYGPATH_W])
# Define the identity of the package. # Define the identity of the package.
dnl Distinguish between old-style and new-style calls. dnl Distinguish between old-style and new-style calls.
m4_ifval([$2], m4_ifval([$2],
...@@ -100,17 +110,29 @@ AC_REQUIRE([AC_PROG_AWK])dnl ...@@ -100,17 +110,29 @@ AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl
_AM_IF_OPTION([no-dependencies],, _AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_][CC], [AC_PROVIDE_IFELSE([AC_PROG_CC],
[_AM_DEPENDENCIES(CC)], [_AM_DEPENDENCIES(CC)],
[define([AC_PROG_][CC], [define([AC_PROG_CC],
defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_][CXX], AC_PROVIDE_IFELSE([AC_PROG_CXX],
[_AM_DEPENDENCIES(CXX)], [_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_][CXX], [define([AC_PROG_CXX],
defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
]) ])
]) ])
# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
# that is generated. The stamp files are numbered to have different names.
# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
# loop where config.status creates the headers, so we can generate
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
# Copyright 2002 Free Software Foundation, Inc. # Copyright 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
...@@ -131,14 +153,14 @@ AC_PROVIDE_IFELSE([AC_PROG_][CXX], ...@@ -131,14 +153,14 @@ AC_PROVIDE_IFELSE([AC_PROG_][CXX],
# ---------------------------- # ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been # Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y. # generated from the m4 files accompanying Automake X.Y.
AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"]) AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
# AM_SET_CURRENT_AUTOMAKE_VERSION # AM_SET_CURRENT_AUTOMAKE_VERSION
# ------------------------------- # -------------------------------
# Call AM_AUTOMAKE_VERSION so it can be traced. # Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.6.3])]) [AM_AUTOMAKE_VERSION([1.7.2])])
# Helper functions for option handling. -*- Autoconf -*- # Helper functions for option handling. -*- Autoconf -*-
...@@ -518,7 +540,7 @@ AC_CACHE_CHECK([dependency style of $depcc], ...@@ -518,7 +540,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
if depmode=$depmode \ if depmode=$depmode \
source=conftest.c object=conftest.o \ source=conftest.c object=conftest.o \
depfile=conftest.Po tmpdepfile=conftest.TPo \ depfile=conftest.Po tmpdepfile=conftest.TPo \
$SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&
grep conftest.h conftest.Po > /dev/null 2>&1 && grep conftest.h conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
am_cv_$1_dependencies_compiler_type=$depmode am_cv_$1_dependencies_compiler_type=$depmode
...@@ -533,6 +555,9 @@ else ...@@ -533,6 +555,9 @@ else
fi fi
]) ])
AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
AM_CONDITIONAL([am__fastdep$1], [
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_$1_dependencies_compiler_type" = gcc3])
]) ])
...@@ -652,7 +677,9 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], ...@@ -652,7 +677,9 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
]) ])
# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*- # Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
...@@ -692,7 +719,7 @@ echo "include confinc" > confmf ...@@ -692,7 +719,7 @@ echo "include confinc" > confmf
# In particular we don't look at `^make:' because GNU make might # In particular we don't look at `^make:' because GNU make might
# be invoked under some other name (usually "gmake"), in which # be invoked under some other name (usually "gmake"), in which
# case it prints its new name instead of `make'. # case it prints its new name instead of `make'.
if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
am__include=include am__include=include
am__quote= am__quote=
_am_result=GNU _am_result=GNU
...@@ -752,7 +779,7 @@ else ...@@ -752,7 +779,7 @@ else
fi fi
AC_CONFIG_COMMANDS_PRE( AC_CONFIG_COMMANDS_PRE(
[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
AC_MSG_ERROR([conditional \"$1\" was never defined. AC_MSG_ERROR([conditional "$1" was never defined.
Usually this means the macro was only invoked conditionally.]) Usually this means the macro was only invoked conditionally.])
fi])]) fi])])
...@@ -779,65 +806,15 @@ AC_PREREQ([2.52]) ...@@ -779,65 +806,15 @@ AC_PREREQ([2.52])
# serial 6 # serial 6
# When config.status generates a header, we must update the stamp-h file. # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
# This file resides in the same directory as the config header AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# that is generated. We must strip everything past the first ":",
# and everything past the last "/".
# _AM_DIRNAME(PATH)
# -----------------
# Like AS_DIRNAME, only do it during macro expansion
AC_DEFUN([_AM_DIRNAME],
[m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
m4_if(regexp([$1], [^/.*]), -1,
[.],
patsubst([$1], [^\(/\).*], [\1])),
patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
])# _AM_DIRNAME
# The stamp files are numbered to have different names.
# We could number them on a directory basis, but that's additional
# complications, let's have a unique counter.
m4_define([_AM_STAMP_Count], [0])
# _AM_STAMP(HEADER)
# -----------------
# The name of the stamp file for HEADER.
AC_DEFUN([_AM_STAMP],
[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
[:.*])))/stamp-h[]_AM_STAMP_Count])
# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
# ------------------------------------------------------------
# We used to try to get a real timestamp in stamp-h. But the fear is that
# that will cause unnecessary cvs conflicts.
AC_DEFUN([_AM_CONFIG_HEADER],
[# Add the stamp file to the list of files AC keeps track of,
# along with our hook.
AC_CONFIG_HEADERS([$1],
[# update the timestamp
echo 'timestamp for $1' >"_AM_STAMP([$1])"
$2],
[$3])
])# _AM_CONFIG_HEADER
# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
# --------------------------------------------------------------
AC_DEFUN([AM_CONFIG_HEADER],
[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
])# AM_CONFIG_HEADER
# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
# serial 46 AC_PROG_LIBTOOL # serial 46 AC_PROG_LIBTOOL
builtin([undefine],[symbols])
AC_DEFUN([AC_PROG_LIBTOOL], AC_DEFUN([AC_PROG_LIBTOOL],
[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
...@@ -863,8 +840,6 @@ AC_REQUIRE([AC_PROG_CC])dnl ...@@ -863,8 +840,6 @@ AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_PROG_LD])dnl AC_REQUIRE([AC_PROG_LD])dnl
AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
AC_REQUIRE([AC_PROG_NM])dnl AC_REQUIRE([AC_PROG_NM])dnl
AC_REQUIRE([LT_AC_PROG_SED])dnl
AC_REQUIRE([AC_PROG_LN_S])dnl AC_REQUIRE([AC_PROG_LN_S])dnl
AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
AC_REQUIRE([AC_OBJEXT])dnl AC_REQUIRE([AC_OBJEXT])dnl
...@@ -965,30 +940,9 @@ _LT_AC_LTCONFIG_HACK ...@@ -965,30 +940,9 @@ _LT_AC_LTCONFIG_HACK
]) ])
# AC_LIBTOOL_HEADER_ASSERT
# ------------------------
AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT],
[AC_CACHE_CHECK([whether $CC supports assert without backlinking],
[lt_cv_func_assert_works],
[case $host in
*-*-solaris*)
if test "$GCC" = yes && test "$with_gnu_ld" != yes; then
case `$CC --version 2>/dev/null` in
[[12]].*) lt_cv_func_assert_works=no ;;
*) lt_cv_func_assert_works=yes ;;
esac
fi
;;
esac])
if test "x$lt_cv_func_assert_works" = xyes; then
AC_CHECK_HEADERS(assert.h)
fi
])# AC_LIBTOOL_HEADER_ASSERT
# _LT_AC_CHECK_DLFCN # _LT_AC_CHECK_DLFCN
# -------------------- # --------------------
AC_DEFUN([_LT_AC_CHECK_DLFCN], AC_DEFUN(_LT_AC_CHECK_DLFCN,
[AC_CHECK_HEADERS(dlfcn.h) [AC_CHECK_HEADERS(dlfcn.h)
])# _LT_AC_CHECK_DLFCN ])# _LT_AC_CHECK_DLFCN
...@@ -1006,10 +960,10 @@ AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl ...@@ -1006,10 +960,10 @@ AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl
# [They come from Ultrix. What could be older than Ultrix?!! ;)] # [They come from Ultrix. What could be older than Ultrix?!! ;)]
# Character class describing NM global symbol codes. # Character class describing NM global symbol codes.
symcode='[[BCDEGRST]]' [symcode='[BCDEGRST]']
# Regexp to match symbols that can be accessed directly from C. # Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' [sympat='\([_A-Za-z][_A-Za-z0-9]*\)']
# Transform the above into a raw symbol and a C symbol. # Transform the above into a raw symbol and a C symbol.
symxfrm='\1 \2\3 \3' symxfrm='\1 \2\3 \3'
...@@ -1023,26 +977,23 @@ lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\ ...@@ -1023,26 +977,23 @@ lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\
# Define system-specific variables. # Define system-specific variables.
case $host_os in case $host_os in
aix*) aix*)
symcode='[[BCDT]]' [symcode='[BCDT]']
;; ;;
cygwin* | mingw* | pw32*) cygwin* | mingw* | pw32*)
symcode='[[ABCDGISTW]]' [symcode='[ABCDGISTW]']
;; ;;
hpux*) # Its linker distinguishes data from code symbols hpux*) # Its linker distinguishes data from code symbols
lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;; ;;
irix* | nonstopux*) irix*)
symcode='[[BCDEGRST]]' [symcode='[BCDEGRST]']
;;
osf*)
symcode='[[BCDEGQRST]]'
;; ;;
solaris* | sysv5*) solaris* | sysv5*)
symcode='[[BDT]]' [symcode='[BDT]']
;; ;;
sysv4) sysv4)
symcode='[[DFNSTU]]' [symcode='[DFNSTU]']
;; ;;
esac esac
...@@ -1056,14 +1007,14 @@ esac ...@@ -1056,14 +1007,14 @@ esac
# If we're using GNU nm, then use its standard symbol codes. # If we're using GNU nm, then use its standard symbol codes.
if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
symcode='[[ABCDGISTW]]' [symcode='[ABCDGISTW]']
fi fi
# Try without a prefix undercore, then with it. # Try without a prefix undercore, then with it.
for ac_symprfx in "" "_"; do for ac_symprfx in "" "_"; do
# Write the raw and C identifiers. # Write the raw and C identifiers.
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" [lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"]
# Check to see that the pipe works correctly. # Check to see that the pipe works correctly.
pipe_works=no pipe_works=no
...@@ -1116,7 +1067,7 @@ const struct { ...@@ -1116,7 +1067,7 @@ const struct {
const char *name; const char *name;
lt_ptr address; lt_ptr address;
} }
lt_preloaded_symbols[[]] = [lt_preloaded_symbols[] =]
{ {
EOF EOF
sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
...@@ -1134,7 +1085,7 @@ EOF ...@@ -1134,7 +1085,7 @@ EOF
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext" LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$no_builtin_flag" CFLAGS="$CFLAGS$no_builtin_flag"
if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then if AC_TRY_EVAL(ac_link) && test -s conftest; then
pipe_works=yes pipe_works=yes
fi fi
LIBS="$save_LIBS" LIBS="$save_LIBS"
...@@ -1189,14 +1140,13 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then ...@@ -1189,14 +1140,13 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then
*-DOS) lt_cv_sys_path_separator=';' ;; *-DOS) lt_cv_sys_path_separator=';' ;;
*) lt_cv_sys_path_separator=':' ;; *) lt_cv_sys_path_separator=':' ;;
esac esac
PATH_SEPARATOR=$lt_cv_sys_path_separator
fi fi
])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR ])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
# _LT_AC_PROG_ECHO_BACKSLASH # _LT_AC_PROG_ECHO_BACKSLASH
# -------------------------- # --------------------------
# Add some code to the start of the generated configure script which # Add some code to the start of the generated configure script which
# will find an echo command which doesn't interpret backslashes. # will find an echo command which doesn;t interpret backslashes.
AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], [ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
[AC_DIVERT_PUSH(NOTICE)]) [AC_DIVERT_PUSH(NOTICE)])
...@@ -1265,7 +1215,7 @@ else ...@@ -1265,7 +1215,7 @@ else
# #
# So, first we look for a working echo in the user's PATH. # So, first we look for a working echo in the user's PATH.
IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
for dir in $PATH /usr/ucb; do for dir in $PATH /usr/ucb; do
if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
...@@ -1354,7 +1304,7 @@ AC_DIVERT_POP ...@@ -1354,7 +1304,7 @@ AC_DIVERT_POP
# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
# ------------------------------------------------------------------ # ------------------------------------------------------------------
AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], AC_DEFUN(_LT_AC_TRY_DLOPEN_SELF,
[if test "$cross_compiling" = yes; then : [if test "$cross_compiling" = yes; then :
[$4] [$4]
else else
...@@ -1441,7 +1391,7 @@ rm -fr conftest* ...@@ -1441,7 +1391,7 @@ rm -fr conftest*
# AC_LIBTOOL_DLOPEN_SELF # AC_LIBTOOL_DLOPEN_SELF
# ------------------- # -------------------
AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF,
[if test "x$enable_dlopen" != xyes; then [if test "x$enable_dlopen" != xyes; then
enable_dlopen=unknown enable_dlopen=unknown
enable_dlopen_self=unknown enable_dlopen_self=unknown
...@@ -1541,10 +1491,10 @@ AC_DEFUN([_LT_AC_LTCONFIG_HACK], ...@@ -1541,10 +1491,10 @@ AC_DEFUN([_LT_AC_LTCONFIG_HACK],
# Sed substitution that helps us do robust quoting. It backslashifies # Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings. # metacharacters that are still active within double-quoted strings.
Xsed='sed -e s/^X//' Xsed='sed -e s/^X//'
sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g' [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references. # Same as above, but do not quote variable references.
double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g' [double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
# Sed substitution to delay expansion of an escaped shell variable in a # Sed substitution to delay expansion of an escaped shell variable in a
# double_quote_subst'ed string. # double_quote_subst'ed string.
...@@ -1678,7 +1628,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, ...@@ -1678,7 +1628,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
# like `-m68040'. # like `-m68040'.
lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
;; ;;
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes. # PIC is the default for these OSes.
;; ;;
darwin* | rhapsody*) darwin* | rhapsody*)
...@@ -1721,7 +1671,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, ...@@ -1721,7 +1671,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
lt_cv_prog_cc_pic='+Z' lt_cv_prog_cc_pic='+Z'
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_wl='-Wl,'
lt_cv_prog_cc_static='-non_shared' lt_cv_prog_cc_static='-non_shared'
# PIC (with -KPIC) is the default. # PIC (with -KPIC) is the default.
...@@ -1765,7 +1715,11 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, ...@@ -1765,7 +1715,11 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_pic='-KPIC'
lt_cv_prog_cc_static='-Bstatic' lt_cv_prog_cc_static='-Bstatic'
lt_cv_prog_cc_wl='-Wl,' if test "x$host_vendor" = xsni; then
lt_cv_prog_cc_wl='-LD'
else
lt_cv_prog_cc_wl='-Wl,'
fi
;; ;;
uts4*) uts4*)
...@@ -1831,7 +1785,7 @@ fi ...@@ -1831,7 +1785,7 @@ fi
# Check for any special shared library compilation flags. # Check for any special shared library compilation flags.
if test -n "$lt_cv_prog_cc_shlib"; then if test -n "$lt_cv_prog_cc_shlib"; then
AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries]) AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries])
if echo "$old_CC $old_CFLAGS " | egrep -e "[[ ]]$lt_cv_prog_cc_shlib[[ ]]" >/dev/null; then : if echo "$old_CC $old_CFLAGS " | [egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]"] >/dev/null; then :
else else
AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure]) AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure])
lt_cv_prog_cc_can_build_shared=no lt_cv_prog_cc_can_build_shared=no
...@@ -2112,7 +2066,7 @@ EOF ...@@ -2112,7 +2066,7 @@ EOF
# can override, but on older systems we have to supply one (in ltdll.c) # can override, but on older systems we have to supply one (in ltdll.c)
if test "x$lt_cv_need_dllmain" = "xyes"; then if test "x$lt_cv_need_dllmain" = "xyes"; then
ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~ ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~
test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
else else
ltdll_obj= ltdll_obj=
...@@ -2125,12 +2079,12 @@ EOF ...@@ -2125,12 +2079,12 @@ EOF
# Be careful not to strip the DATA tag left be newer dlltools. # Be careful not to strip the DATA tag left be newer dlltools.
export_symbols_cmds="$ltdll_cmds"' export_symbols_cmds="$ltdll_cmds"'
$DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols' [sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//"] < $output_objdir/$soname-def > $export_symbols'
# If the export-symbols file already is a .def file (1st line # If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is. # is EXPORTS), use it as is.
# If DATA tags from a recent dlltool are present, honour them! # If DATA tags from a recent dlltool are present, honour them!
archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
cp $export_symbols $output_objdir/$soname-def; cp $export_symbols $output_objdir/$soname-def;
else else
echo EXPORTS > $output_objdir/$soname-def; echo EXPORTS > $output_objdir/$soname-def;
...@@ -2139,7 +2093,6 @@ EOF ...@@ -2139,7 +2093,6 @@ EOF
set dummy \$symbol; set dummy \$symbol;
case \[$]# in case \[$]# in
2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
4) echo " \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
*) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
esac; esac;
_lt_hint=`expr 1 + \$_lt_hint`; _lt_hint=`expr 1 + \$_lt_hint`;
...@@ -2252,12 +2205,10 @@ else ...@@ -2252,12 +2205,10 @@ else
# need to do runtime linking. # need to do runtime linking.
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
for ld_flag in $LDFLAGS; do for ld_flag in $LDFLAGS; do
case $ld_flag in if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
*-brtl*)
aix_use_runtimelinking=yes aix_use_runtimelinking=yes
break break
;; fi
esac
done done
esac esac
...@@ -2329,7 +2280,7 @@ else ...@@ -2329,7 +2280,7 @@ else
allow_undefined_flag='${wl}-berok' allow_undefined_flag='${wl}-berok'
# This is a bit strange, but is similar to how AIX traditionally builds # This is a bit strange, but is similar to how AIX traditionally builds
# it's shared libraries. # it's shared libraries.
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname' archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
fi fi
fi fi
;; ;;
...@@ -2371,9 +2322,8 @@ else ...@@ -2371,9 +2322,8 @@ else
esac esac
# FIXME: Relying on posixy $() will cause problems for # FIXME: Relying on posixy $() will cause problems for
# cross-compilation, but unfortunately the echo tests do not # cross-compilation, but unfortunately the echo tests do not
# yet detect zsh echo's removal of \ escapes. Also zsh mangles # yet detect zsh echo's removal of \ escapes.
# `"' quotes if we put them in here... so don't! archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
# We need to add '_' to the symbols in $export_symbols first # We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes hardcode_direct=yes
...@@ -2425,14 +2375,13 @@ else ...@@ -2425,14 +2375,13 @@ else
export_dynamic_flag_spec='${wl}-E' export_dynamic_flag_spec='${wl}-E'
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
if test "$GCC" = yes; then if test "$GCC" = yes; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='-rpath $libdir'
fi fi
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=: hardcode_libdir_separator=:
link_all_deplibs=yes link_all_deplibs=yes
;; ;;
...@@ -2460,7 +2409,7 @@ else ...@@ -2460,7 +2409,7 @@ else
hardcode_direct=yes hardcode_direct=yes
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir' hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E' export_dynamic_flag_spec='${wl}-E'
else else
...@@ -2470,7 +2419,7 @@ else ...@@ -2470,7 +2419,7 @@ else
hardcode_libdir_flag_spec='-R$libdir' hardcode_libdir_flag_spec='-R$libdir'
;; ;;
*) *)
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir' hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;; ;;
esac esac
...@@ -2523,35 +2472,7 @@ else ...@@ -2523,35 +2472,7 @@ else
;; ;;
solaris*) solaris*)
# gcc --version < 3.0 without binutils cannot create self contained
# shared libraries reliably, requiring libgcc.a to resolve some of
# the object symbols generated in some cases. Libraries that use
# assert need libgcc.a to resolve __eprintf, for example. Linking
# a copy of libgcc.a into every shared library to guarantee resolving
# such symbols causes other problems: According to Tim Van Holder
# <tim.van.holder@pandora.be>, C++ libraries end up with a separate
# (to the application) exception stack for one thing.
no_undefined_flag=' -z defs' no_undefined_flag=' -z defs'
if test "$GCC" = yes; then
case `$CC --version 2>/dev/null` in
[[12]].*)
cat <<EOF 1>&2
*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
*** create self contained shared libraries on Solaris systems, without
*** introducing a dependency on libgcc.a. Therefore, libtool is disabling
*** -no-undefined support, which will at least allow you to build shared
*** libraries. However, you may find that when you link such libraries
*** into an application without using GCC, you have to manually add
*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to
*** upgrade to a newer version of GCC. Another option is to rebuild your
*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
EOF
no_undefined_flag=
;;
esac
fi
# $CC -shared without GNU ld will not create a library from C++ # $CC -shared without GNU ld will not create a library from C++
# object files and a static libstdc++, better avoid it by now # object files and a static libstdc++, better avoid it by now
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
...@@ -2560,7 +2481,7 @@ EOF ...@@ -2560,7 +2481,7 @@ EOF
hardcode_libdir_flag_spec='-R$libdir' hardcode_libdir_flag_spec='-R$libdir'
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
case $host_os in case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; [solaris2.[0-5] | solaris2.[0-5].*]) ;;
*) # Supported since Solaris 2.6 (maybe 2.5.1?) *) # Supported since Solaris 2.6 (maybe 2.5.1?)
whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
esac esac
...@@ -2582,23 +2503,13 @@ EOF ...@@ -2582,23 +2503,13 @@ EOF
;; ;;
sysv4) sysv4)
case $host_vendor in if test "x$host_vendor" = xsno; then
sni) archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes # is this really true???
hardcode_direct=yes # is this really true??? else
;; archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
siemens) hardcode_direct=no #Motorola manual says yes, but my tests say they lie
## LD is ld it makes a PLAMLIB fi
## CC just makes a GrossModule.
archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
reload_cmds='$CC -r -o $output$reload_objs'
hardcode_direct=no
;;
motorola)
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=no #Motorola manual says yes, but my tests say they lie
;;
esac
runpath_var='LD_RUN_PATH' runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
;; ;;
...@@ -2739,9 +2650,6 @@ aix3*) ...@@ -2739,9 +2650,6 @@ aix3*)
aix4* | aix5*) aix4* | aix5*)
version_type=linux version_type=linux
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
if test "$host_cpu" = ia64; then if test "$host_cpu" = ia64; then
# AIX 5 supports IA64 # AIX 5 supports IA64
library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
...@@ -2753,15 +2661,15 @@ aix4* | aix5*) ...@@ -2753,15 +2661,15 @@ aix4* | aix5*)
# depend on `.', always an invalid library. This was fixed in # depend on `.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0. # development snapshots of GCC prior to 3.0.
case $host_os in case $host_os in
aix4 | aix4.[[01]] | aix4.[[01]].*) [ aix4 | aix4.[01] | aix4.[01].*)]
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes ' echo ' yes '
echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
: :
else else
can_build_shared=no can_build_shared=no
fi fi
;; ;;
esac esac
# AIX (on Power*) has no versioning support, so currently we can # AIX (on Power*) has no versioning support, so currently we can
# not hardcode correct soname into executable. Probably we can # not hardcode correct soname into executable. Probably we can
...@@ -2780,13 +2688,12 @@ aix4* | aix5*) ...@@ -2780,13 +2688,12 @@ aix4* | aix5*)
fi fi
shlibpath_var=LIBPATH shlibpath_var=LIBPATH
fi fi
hardcode_into_libs=yes
;; ;;
amigaos*) amigaos*)
library_names_spec='$libname.ixlibrary $libname.a' library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs. # Create ${libname}_ixlibrary.a entries in /sys/libs.
finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | [$Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\'']`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
;; ;;
beos*) beos*)
...@@ -2817,7 +2724,7 @@ cygwin* | mingw* | pw32*) ...@@ -2817,7 +2724,7 @@ cygwin* | mingw* | pw32*)
case $GCC,$host_os in case $GCC,$host_os in
yes,cygwin*) yes,cygwin*)
library_names_spec='$libname.dll.a' library_names_spec='$libname.dll.a'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~ dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~ test -d \$dldir || mkdir -p \$dldir~
...@@ -2827,14 +2734,14 @@ cygwin* | mingw* | pw32*) ...@@ -2827,14 +2734,14 @@ cygwin* | mingw* | pw32*)
$rm \$dlpath' $rm \$dlpath'
;; ;;
yes,mingw*) yes,mingw*)
library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"` sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
;; ;;
yes,pw32*) yes,pw32*)
library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
;; ;;
*) *)
library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib' library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll $libname.lib'
;; ;;
esac esac
dynamic_linker='Win32 ld.exe' dynamic_linker='Win32 ld.exe'
...@@ -2860,18 +2767,6 @@ freebsd1*) ...@@ -2860,18 +2767,6 @@ freebsd1*)
dynamic_linker=no dynamic_linker=no
;; ;;
freebsd*-gnu*)
version_type=linux
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
soname_spec='${libname}${release}.so$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='GNU/FreeBSD ld.so'
;;
freebsd*) freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat version_type=freebsd-$objformat
...@@ -2923,17 +2818,14 @@ hpux9* | hpux10* | hpux11*) ...@@ -2923,17 +2818,14 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib' postinstall_cmds='chmod 555 $lib'
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
case $host_os in version_type=irix
nonstopux*) version_type=nonstopux ;;
*) version_type=irix ;;
esac
need_lib_prefix=no need_lib_prefix=no
need_version=no need_version=no
soname_spec='${libname}${release}.so$major' soname_spec='${libname}${release}.so$major'
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
case $host_os in case $host_os in
irix5* | nonstopux*) irix5*)
libsuff= shlibsuff= libsuff= shlibsuff=
;; ;;
*) *)
...@@ -3037,13 +2929,11 @@ os2*) ...@@ -3037,13 +2929,11 @@ os2*)
osf3* | osf4* | osf5*) osf3* | osf4* | osf5*)
version_type=osf version_type=osf
need_version=no need_version=no
need_lib_prefix=no soname_spec='${libname}${release}.so'
soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
hardcode_into_libs=yes
;; ;;
sco3.2v5*) sco3.2v5*)
...@@ -3086,12 +2976,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ...@@ -3086,12 +2976,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
case $host_vendor in case $host_vendor in
sni) sni)
shlibpath_overrides_runpath=no shlibpath_overrides_runpath=no
need_lib_prefix=no
export_dynamic_flag_spec='${wl}-Blargedynsym'
runpath_var=LD_RUN_PATH
;;
siemens)
need_lib_prefix=no
;; ;;
motorola) motorola)
need_lib_prefix=no need_lib_prefix=no
...@@ -3246,7 +3130,7 @@ if test -f "$ltmain"; then ...@@ -3246,7 +3130,7 @@ if test -f "$ltmain"; then
# Now quote all the things that may contain metacharacters while being # Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the # careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script. # variables and quote the copies for generation of the libtool script.
for var in echo old_CC old_CFLAGS SED \ for var in echo old_CC old_CFLAGS \
AR AR_FLAGS CC LD LN_S NM SHELL \ AR AR_FLAGS CC LD LN_S NM SHELL \
reload_flag reload_cmds wl \ reload_flag reload_cmds wl \
pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
...@@ -3308,11 +3192,8 @@ if test -f "$ltmain"; then ...@@ -3308,11 +3192,8 @@ if test -f "$ltmain"; then
# configuration script generated by Autoconf, you may include it under # configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program. # the same distribution terms that you use for the rest of that program.
# A sed that does not truncate output.
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n. # Sed that helps us avoid accidentally triggering echo(1) options like -n.
Xsed="${SED} -e s/^X//" Xsed="sed -e s/^X//"
# The HP-UX ksh and POSIX shell print the target directory to stdout # The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set. # if CDPATH is set.
...@@ -3981,7 +3862,6 @@ test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) ...@@ -3981,7 +3862,6 @@ test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl
AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
ac_prog=ld ac_prog=ld
if test "$GCC" = yes; then if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path. # Check if gcc -print-prog-name=ld gives a path.
...@@ -3995,8 +3875,8 @@ if test "$GCC" = yes; then ...@@ -3995,8 +3875,8 @@ if test "$GCC" = yes; then
esac esac
case $ac_prog in case $ac_prog in
# Accept absolute paths. # Accept absolute paths.
[[\\/]]* | [[A-Za-z]]:[[\\/]]*) [[\\/]* | [A-Za-z]:[\\/]*)]
re_direlt='/[[^/]][[^/]]*/\.\./' [re_direlt='/[^/][^/]*/\.\./']
# Canonicalize the path of ld # Canonicalize the path of ld
ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
...@@ -4020,7 +3900,7 @@ else ...@@ -4020,7 +3900,7 @@ else
fi fi
AC_CACHE_VAL(lt_cv_path_LD, AC_CACHE_VAL(lt_cv_path_LD,
[if test -z "$LD"; then [if test -z "$LD"; then
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
...@@ -4073,7 +3953,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag" ...@@ -4073,7 +3953,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag"
# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
# -- PORTME fill in with the dynamic library characteristics # -- PORTME fill in with the dynamic library characteristics
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
[AC_CACHE_CHECK([how to recognise dependent libraries], [AC_CACHE_CHECK([how to recognise dependant libraries],
lt_cv_deplibs_check_method, lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD' [lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file= lt_cv_file_magic_test_file=
...@@ -4084,7 +3964,7 @@ lt_cv_deplibs_check_method='unknown' ...@@ -4084,7 +3964,7 @@ lt_cv_deplibs_check_method='unknown'
# `unknown' -- same as none, but documents that we really don't know. # `unknown' -- same as none, but documents that we really don't know.
# 'pass_all' -- all dependencies passed with no checks. # 'pass_all' -- all dependencies passed with no checks.
# 'test_compile' -- check by making test program. # 'test_compile' -- check by making test program.
# 'file_magic [[regex]]' -- check by looking for files in library path # ['file_magic [regex]'] -- check by looking for files in library path
# which responds to the $file_magic_cmd with a given egrep regex. # which responds to the $file_magic_cmd with a given egrep regex.
# If you have `file' or equivalent on your system and you're not sure # If you have `file' or equivalent on your system and you're not sure
# whether `pass_all' will *always* work, you probably want this one. # whether `pass_all' will *always* work, you probably want this one.
...@@ -4099,7 +3979,7 @@ beos*) ...@@ -4099,7 +3979,7 @@ beos*)
;; ;;
bsdi4*) bsdi4*)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_cmd='/usr/bin/file -L'
lt_cv_file_magic_test_file=/shlib/libc.so lt_cv_file_magic_test_file=/shlib/libc.so
;; ;;
...@@ -4128,7 +4008,7 @@ freebsd*) ...@@ -4128,7 +4008,7 @@ freebsd*)
i*86 ) i*86 )
# Not sure whether the presence of OpenBSD here was a mistake. # Not sure whether the presence of OpenBSD here was a mistake.
# Let's accept both of them until this is cleared up. # Let's accept both of them until this is cleared up.
lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' [lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;; ;;
...@@ -4143,14 +4023,14 @@ gnu*) ...@@ -4143,14 +4023,14 @@ gnu*)
;; ;;
hpux10.20*|hpux11*) hpux10.20*|hpux11*)
lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=/usr/lib/libc.sl lt_cv_file_magic_test_file=/usr/lib/libc.sl
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
case $host_os in case $host_os in
irix5* | nonstopux*) irix5*)
# this will be overridden with pass_all, but let us keep it just in case # this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
;; ;;
...@@ -4162,7 +4042,7 @@ irix5* | irix6* | nonstopux*) ...@@ -4162,7 +4042,7 @@ irix5* | irix6* | nonstopux*)
*) libmagic=never-match;; *) libmagic=never-match;;
esac esac
# this will be overridden with pass_all, but let us keep it just in case # this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" [lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
;; ;;
esac esac
lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
...@@ -4172,25 +4052,25 @@ irix5* | irix6* | nonstopux*) ...@@ -4172,25 +4052,25 @@ irix5* | irix6* | nonstopux*)
# This must be Linux ELF. # This must be Linux ELF.
linux-gnu*) linux-gnu*)
case $host_cpu in case $host_cpu in
alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | arm* | m68k) alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
lt_cv_deplibs_check_method=pass_all ;; lt_cv_deplibs_check_method=pass_all ;;
*) *)
# glibc up to 2.1.1 does not perform some relocations on ARM # glibc up to 2.1.1 does not perform some relocations on ARM
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;]
esac esac
lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
;; ;;
netbsd*) netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$' [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
else else
lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$' [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
fi fi
;; ;;
newos6*) newos6*)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=/usr/lib/libnls.so lt_cv_file_magic_test_file=/usr/lib/libnls.so
;; ;;
...@@ -4221,14 +4101,14 @@ solaris*) ...@@ -4221,14 +4101,14 @@ solaris*)
lt_cv_file_magic_test_file=/lib/libc.so lt_cv_file_magic_test_file=/lib/libc.so
;; ;;
sysv5uw[[78]]* | sysv4*uw2*) [sysv5uw[78]* | sysv4*uw2*)]
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
case $host_vendor in case $host_vendor in
motorola) motorola)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
;; ;;
ncr) ncr)
...@@ -4236,16 +4116,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ...@@ -4236,16 +4116,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
;; ;;
sequent) sequent)
lt_cv_file_magic_cmd='/bin/file' lt_cv_file_magic_cmd='/bin/file'
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )']
;; ;;
sni) sni)
lt_cv_file_magic_cmd='/bin/file' lt_cv_file_magic_cmd='/bin/file'
lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" [lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"]
lt_cv_file_magic_test_file=/lib/libc.so lt_cv_file_magic_test_file=/lib/libc.so
;; ;;
siemens)
lt_cv_deplibs_check_method=pass_all
;;
esac esac
;; ;;
esac esac
...@@ -4257,14 +4134,13 @@ deplibs_check_method=$lt_cv_deplibs_check_method ...@@ -4257,14 +4134,13 @@ deplibs_check_method=$lt_cv_deplibs_check_method
# AC_PROG_NM - find the path to a BSD-compatible name lister # AC_PROG_NM - find the path to a BSD-compatible name lister
AC_DEFUN([AC_PROG_NM], AC_DEFUN([AC_PROG_NM],
[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl [AC_MSG_CHECKING([for BSD-compatible nm])
AC_MSG_CHECKING([for BSD-compatible nm])
AC_CACHE_VAL(lt_cv_path_NM, AC_CACHE_VAL(lt_cv_path_NM,
[if test -n "$NM"; then [if test -n "$NM"; then
# Let the user override the test. # Let the user override the test.
lt_cv_path_NM="$NM" lt_cv_path_NM="$NM"
else else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
tmp_nm=$ac_dir/${ac_tool_prefix}nm tmp_nm=$ac_dir/${ac_tool_prefix}nm
...@@ -4311,12 +4187,12 @@ esac ...@@ -4311,12 +4187,12 @@ esac
]) ])
# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
# the libltdl convenience library and LTDLINCL to the include flags for # the libltdl convenience library and INCLTDL to the include flags for
# the libltdl header and adds --enable-ltdl-convenience to the # the libltdl header and adds --enable-ltdl-convenience to the
# configure arguments. Note that LIBLTDL and LTDLINCL are not # configure arguments. Note that LIBLTDL and INCLTDL are not
# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not # AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not
# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed # provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed
# with '${top_builddir}/' and LTDLINCL will be prefixed with # with '${top_builddir}/' and INCLTDL will be prefixed with
# '${top_srcdir}/' (note the single quotes!). If your package is not # '${top_srcdir}/' (note the single quotes!). If your package is not
# flat and you're not using automake, define top_builddir and # flat and you're not using automake, define top_builddir and
# top_srcdir appropriately in the Makefiles. # top_srcdir appropriately in the Makefiles.
...@@ -4328,18 +4204,16 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE], ...@@ -4328,18 +4204,16 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
esac esac
LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
# For backwards non-gettext consistent compatibility...
INCLTDL="$LTDLINCL"
]) ])
# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
# the libltdl installable library and LTDLINCL to the include flags for # the libltdl installable library and INCLTDL to the include flags for
# the libltdl header and adds --enable-ltdl-install to the configure # the libltdl header and adds --enable-ltdl-install to the configure
# arguments. Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is # arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed # AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed
# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will # libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will
# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed # be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
# with '${top_srcdir}/' (note the single quotes!). If your package is # with '${top_srcdir}/' (note the single quotes!). If your package is
# not flat and you're not using automake, define top_builddir and # not flat and you're not using automake, define top_builddir and
# top_srcdir appropriately in the Makefiles. # top_srcdir appropriately in the Makefiles.
...@@ -4357,14 +4231,12 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE], ...@@ -4357,14 +4231,12 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
if test x"$enable_ltdl_install" = x"yes"; then if test x"$enable_ltdl_install" = x"yes"; then
ac_configure_args="$ac_configure_args --enable-ltdl-install" ac_configure_args="$ac_configure_args --enable-ltdl-install"
LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
else else
ac_configure_args="$ac_configure_args --enable-ltdl-install=no" ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
LIBLTDL="-lltdl" LIBLTDL="-lltdl"
LTDLINCL= INCLTDL=
fi fi
# For backwards non-gettext consistent compatibility...
INCLTDL="$LTDLINCL"
]) ])
# old names # old names
...@@ -4379,92 +4251,3 @@ AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) ...@@ -4379,92 +4251,3 @@ AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
# This is just to silence aclocal about the macro not being used # This is just to silence aclocal about the macro not being used
ifelse([AC_DISABLE_FAST_INSTALL]) ifelse([AC_DISABLE_FAST_INSTALL])
# NOTE: This macro has been submitted for inclusion into #
# GNU Autoconf as AC_PROG_SED. When it is available in #
# a released version of Autoconf we should remove this #
# macro and use it instead. #
# LT_AC_PROG_SED
# --------------
# Check for a fully-functional sed program, that truncates
# as few characters as possible. Prefer GNU sed if found.
AC_DEFUN([LT_AC_PROG_SED],
[AC_MSG_CHECKING([for a sed that does not truncate output])
AC_CACHE_VAL(lt_cv_path_SED,
[# Loop through the user's path and test for sed and gsed.
# Then use that list of sed's as ones to test for truncation.
as_executable_p="test -f"
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
_sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
fi
done
done
done
# Create a temporary directory, and hook for its removal unless debugging.
$debug ||
{
trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
trap '{ (exit 1); exit 1; }' 1 2 13 15
}
# Create a (secure) tmp directory for tmp files.
: ${TMPDIR=/tmp}
{
tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
test -n "$tmp" && test -d "$tmp"
} ||
{
tmp=$TMPDIR/sed$$-$RANDOM
(umask 077 && mkdir $tmp)
} ||
{
echo "$me: cannot create a temporary directory in $TMPDIR" >&2
{ (exit 1); exit 1; }
}
_max=0
_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for _sed in $_sed_list /usr/xpg4/bin/sed; do
test ! -f ${_sed} && break
cat /dev/null > "$tmp/sed.in"
_count=0
echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
# Check for GNU sed and select it if it is found.
if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
lt_cv_path_SED=${_sed}
break
fi
while true; do
cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
mv "$tmp/sed.tmp" "$tmp/sed.in"
cp "$tmp/sed.in" "$tmp/sed.nl"
echo >>"$tmp/sed.nl"
${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
# 40000 chars as input seems more than enough
test $_count -gt 10 && break
_count=`expr $_count + 1`
if test $_count -gt $_max; then
_max=$_count
lt_cv_path_SED=$_sed
fi
done
done
rm -rf "$tmp"
])
if test "X$SED" != "X"; then
lt_cv_path_SED=$SED
else
SED=$lt_cv_path_SED
fi
AC_MSG_RESULT([$SED])
])
libid3tag/compat.c
View file @ d94eaf58
/* C code produced by gperf version 3.0 */ /* C code produced by gperf version 2.7.2 */
/* Command-line: gperf -tCcTonD -K id -N id3_compat_lookup -s -3 -k '*' compat.gperf */ /* Command-line: gperf -tCcTonD -K id -N id3_compat_lookup -s -3 -k '*' compat.gperf */
#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
&& ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
&& (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
&& ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
&& ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
&& ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
&& ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
&& ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
&& ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
&& ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
&& ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
&& ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
&& ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
&& ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
&& ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
&& ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
&& ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
&& ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
&& ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
&& ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
&& ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
&& ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
&& ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
/* The character set is not based on ISO-646. */
error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
#endif
#line 1 "compat.gperf"
/* /*
* libid3tag - ID3 tag manipulation library * libid3tag - ID3 tag manipulation library
* Copyright (C) 2000-2003 Underbit Technologies, Inc. * Copyright (C) 2000-2003 Underbit Technologies, Inc.
...@@ -48,7 +18,7 @@ error "gperf generated tables don't work with this execution character set. Plea ...@@ -48,7 +18,7 @@ error "gperf generated tables don't work with this execution character set. Plea
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* Id: compat.gperf,v 1.1.1.1 2003/07/15 15:51:33 shank Exp * Id: compat.gperf,v 1.2 2003/07/05 05:18:51 shank Exp
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
...@@ -80,9 +50,9 @@ static id3_compat_func_t translate_TCON; ...@@ -80,9 +50,9 @@ static id3_compat_func_t translate_TCON;
#define TOTAL_KEYWORDS 73 #define TOTAL_KEYWORDS 73
#define MIN_WORD_LENGTH 3 #define MIN_WORD_LENGTH 3
#define MAX_WORD_LENGTH 4 #define MAX_WORD_LENGTH 4
#define MIN_HASH_VALUE 6 #define MIN_HASH_VALUE 1
#define MAX_HASH_VALUE 127 #define MAX_HASH_VALUE 84
/* maximum key range = 122, duplicates = 0 */ /* maximum key range = 84, duplicates = 10 */
#ifdef __GNUC__ #ifdef __GNUC__
__inline __inline
...@@ -98,46 +68,44 @@ hash (str, len) ...@@ -98,46 +68,44 @@ hash (str, len)
{ {
static const unsigned char asso_values[] = static const unsigned char asso_values[] =
{ {
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
128, 128, 128, 128, 128, 128, 128, 128, 128, 64, 85, 85, 85, 85, 85, 85, 85, 85, 85, 22,
58, 20, 15, 128, 128, 128, 128, 128, 128, 128, 21, 27, 26, 85, 85, 85, 85, 85, 85, 85,
128, 128, 128, 128, 128, 10, 18, 3, 6, 1, 85, 85, 85, 85, 85, 9, 3, 0, 27, 16,
47, 0, 128, 42, 62, 30, 31, 0, 19, 52, 6, 30, 85, 15, 85, 22, 2, 15, 4, 1,
10, 24, 8, 30, 5, 3, 30, 8, 25, 47, 0, 30, 13, 17, 22, 0, 24, 5, 31, 25,
3, 128, 128, 128, 128, 128, 128, 128, 128, 128, 15, 85, 85, 85, 85, 85, 85, 85, 85, 85,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
128, 128, 128, 128, 128, 128, 128 85, 85, 85, 85, 85, 85
}; };
register int hval = 0; register int hval = 0;
switch (len) switch (len)
{ {
default: default:
case 4:
hval += asso_values[(unsigned char)str[3]]; hval += asso_values[(unsigned char)str[3]];
/*FALLTHROUGH*/
case 3: case 3:
hval += asso_values[(unsigned char)str[2]]; hval += asso_values[(unsigned char)str[2]];
/*FALLTHROUGH*/
case 2: case 2:
hval += asso_values[(unsigned char)str[1]+1]; hval += asso_values[(unsigned char)str[1]];
/*FALLTHROUGH*/
case 1: case 1:
hval += asso_values[(unsigned char)str[0]]; hval += asso_values[(unsigned char)str[0]];
break; break;
...@@ -155,166 +123,95 @@ id3_compat_lookup (str, len) ...@@ -155,166 +123,95 @@ id3_compat_lookup (str, len)
{ {
static const struct id3_compat wordlist[] = static const struct id3_compat wordlist[] =
{ {
#line 97 "compat.gperf" {"POP", EQ(POPM) /* Popularimeter */},
{"TLE", EQ(TLEN) /* Length */}, {"WCP", EQ(WCOP) /* Copyright/legal information */},
#line 68 "compat.gperf" {"WPB", EQ(WPUB) /* Publishers official webpage */},
{"ETC", EQ(ETCO) /* Event timing codes */}, {"BUF", EQ(RBUF) /* Recommended buffer size */},
#line 126 "compat.gperf" {"PIC", EQ(APIC) /* Attached picture */},
{"ULT", EQ(USLT) /* Unsynchronised lyric/text transcription */},
#line 123 "compat.gperf"
{"TYE", OBSOLETE /* Year [obsolete] */},
#line 92 "compat.gperf"
{"TFT", EQ(TFLT) /* File type */},
#line 84 "compat.gperf"
{"TCM", EQ(TCOM) /* Composer */},
#line 66 "compat.gperf"
{"EQU", OBSOLETE /* Equalization [obsolete] */},
#line 63 "compat.gperf"
{"COM", EQ(COMM) /* Comments */}, {"COM", EQ(COMM) /* Comments */},
#line 130 "compat.gperf" {"IPL", EQ(TIPL) /* Involved people list */},
{"MLL", EQ(MLLT) /* MPEG location lookup table */},
{"WAF", EQ(WOAF) /* Official audio file webpage */},
{"WCM", EQ(WCOM) /* Commercial information */}, {"WCM", EQ(WCOM) /* Commercial information */},
#line 96 "compat.gperf" {"UFI", EQ(UFID) /* Unique file identifier */},
{"TLA", EQ(TLAN) /* Language(s) */}, {"CRA", EQ(AENC) /* Audio encryption */},
#line 88 "compat.gperf" {"TCO", TX(TCON) /* Content type */},
{"TDA", OBSOLETE /* Date [obsolete] */}, {"ULT", EQ(USLT) /* Unsynchronised lyric/text transcription */},
#line 124 "compat.gperf" {"TOL", EQ(TOLY) /* Original lyricist(s)/text writer(s) */},
{"TYER", OBSOLETE /* Year [obsolete] */},
#line 83 "compat.gperf"
{"TBP", EQ(TBPM) /* BPM (beats per minute) */}, {"TBP", EQ(TBPM) /* BPM (beats per minute) */},
#line 87 "compat.gperf" {"TPB", EQ(TPUB) /* Publisher */},
{"CNT", EQ(PCNT) /* Play counter */},
{"TCON", TX(TCON) /* Content type */},
{"WAR", EQ(WOAR) /* Official artist/performer webpage */},
{"LNK", EQ(LINK) /* Linked information */},
{"CRM", OBSOLETE /* Encrypted meta frame [obsolete] */},
{"TOF", EQ(TOFN) /* Original filename */},
{"MCI", EQ(MCDI) /* Music CD identifier */},
{"TPA", EQ(TPOS) /* Part of a set */},
{"WAS", EQ(WOAS) /* Official audio source webpage */},
{"TOA", EQ(TOPE) /* Original artist(s)/performer(s) */},
{"TAL", EQ(TALB) /* Album/movie/show title */},
{"TLA", EQ(TLAN) /* Language(s) */},
{"IPLS", EQ(TIPL) /* Involved people list */},
{"TCR", EQ(TCOP) /* Copyright message */}, {"TCR", EQ(TCOP) /* Copyright message */},
#line 104 "compat.gperf" {"TRC", EQ(TSRC) /* ISRC (international standard recording code) */},
{"TOT", EQ(TOAL) /* Original album/movie/show title */},
#line 89 "compat.gperf"
{"TDAT", OBSOLETE /* Date [obsolete] */},
#line 67 "compat.gperf"
{"EQUA", OBSOLETE /* Equalization [obsolete] */},
#line 102 "compat.gperf"
{"TOR", EQ(TDOR) /* Original release year [obsolete] */}, {"TOR", EQ(TDOR) /* Original release year [obsolete] */},
#line 131 "compat.gperf" {"TCM", EQ(TCOM) /* Composer */},
{"WCP", EQ(WCOP) /* Copyright/legal information */}, {"ETC", EQ(ETCO) /* Event timing codes */},
#line 99 "compat.gperf"
{"TOA", EQ(TOPE) /* Original artist(s)/performer(s) */},
#line 78 "compat.gperf"
{"RVA", OBSOLETE /* Relative volume adjustment [obsolete] */},
#line 120 "compat.gperf"
{"TT3", EQ(TIT3) /* Subtitle/description refinement */},
#line 98 "compat.gperf"
{"TMT", EQ(TMED) /* Media type */},
#line 76 "compat.gperf"
{"POP", EQ(POPM) /* Popularimeter */},
#line 74 "compat.gperf"
{"MLL", EQ(MLLT) /* MPEG location lookup table */},
#line 79 "compat.gperf"
{"RVAD", OBSOLETE /* Relative volume adjustment [obsolete] */},
#line 65 "compat.gperf"
{"CRM", OBSOLETE /* Encrypted meta frame [obsolete] */},
#line 128 "compat.gperf"
{"WAR", EQ(WOAR) /* Official artist/performer webpage */},
#line 80 "compat.gperf"
{"SLT", EQ(SYLT) /* Synchronised lyric/text */},
#line 81 "compat.gperf"
{"STC", EQ(SYTC) /* Synchronised tempo codes */}, {"STC", EQ(SYTC) /* Synchronised tempo codes */},
#line 95 "compat.gperf" {"TLE", EQ(TLEN) /* Length */},
{"TKE", EQ(TKEY) /* Initial key */}, {"SLT", EQ(SYLT) /* Synchronised lyric/text */},
#line 111 "compat.gperf" {"TEN", EQ(TENC) /* Encoded by */},
{"TRC", EQ(TSRC) /* ISRC (international standard recording code) */}, {"TP2", EQ(TPE2) /* Band/orchestra/accompaniment */},
#line 109 "compat.gperf" {"TP1", EQ(TPE1) /* Lead performer(s)/soloist(s) */},
{"TPA", EQ(TPOS) /* Part of a set */}, {"TOT", EQ(TOAL) /* Original album/movie/show title */},
#line 117 "compat.gperf" {"EQU", OBSOLETE /* Equalization [obsolete] */},
{"TSS", EQ(TSSE) /* Software/hardware and settings used for encoding */}, {"RVA", OBSOLETE /* Relative volume adjustment [obsolete] */},
#line 112 "compat.gperf" {"GEO", EQ(GEOB) /* General encapsulated object */},
{"TRD", OBSOLETE /* Recording dates [obsolete] */},
#line 64 "compat.gperf"
{"CRA", EQ(AENC) /* Audio encryption */},
#line 108 "compat.gperf"
{"TP4", EQ(TPE4) /* Interpreted, remixed, or otherwise modified by */}, {"TP4", EQ(TPE4) /* Interpreted, remixed, or otherwise modified by */},
#line 125 "compat.gperf"
{"UFI", EQ(UFID) /* Unique file identifier */},
#line 101 "compat.gperf"
{"TOL", EQ(TOLY) /* Original lyricist(s)/text writer(s) */},
#line 110 "compat.gperf"
{"TPB", EQ(TPUB) /* Publisher */},
#line 73 "compat.gperf"
{"MCI", EQ(MCDI) /* Music CD identifier */},
#line 107 "compat.gperf"
{"TP3", EQ(TPE3) /* Conductor/performer refinement */}, {"TP3", EQ(TPE3) /* Conductor/performer refinement */},
#line 132 "compat.gperf" {"TFT", EQ(TFLT) /* File type */},
{"WPB", EQ(WPUB) /* Publishers official webpage */}, {"TIM", OBSOLETE /* Time [obsolete] */},
#line 113 "compat.gperf" {"REV", EQ(RVRB) /* Reverb */},
{"TRDA", OBSOLETE /* Recording dates [obsolete] */},
#line 115 "compat.gperf"
{"TSI", OBSOLETE /* Size [obsolete] */}, {"TSI", OBSOLETE /* Size [obsolete] */},
#line 90 "compat.gperf" {"EQUA", OBSOLETE /* Equalization [obsolete] */},
{"TDY", EQ(TDLY) /* Playlist delay */}, {"TSS", EQ(TSSE) /* Software/hardware and settings used for encoding */},
#line 82 "compat.gperf"
{"TAL", EQ(TALB) /* Album/movie/show title */},
#line 116 "compat.gperf"
{"TSIZ", OBSOLETE /* Size [obsolete] */},
#line 129 "compat.gperf"
{"WAS", EQ(WOAS) /* Official audio source webpage */},
#line 121 "compat.gperf"
{"TXT", EQ(TEXT) /* Lyricist/text writer */},
#line 62 "compat.gperf"
{"CNT", EQ(PCNT) /* Play counter */},
#line 100 "compat.gperf"
{"TOF", EQ(TOFN) /* Original filename */},
#line 85 "compat.gperf"
{"TCO", TX(TCON) /* Content type */},
#line 114 "compat.gperf"
{"TRK", EQ(TRCK) /* Track number/position in set */}, {"TRK", EQ(TRCK) /* Track number/position in set */},
#line 119 "compat.gperf" {"TDA", OBSOLETE /* Date [obsolete] */},
{"TT2", EQ(TIT2) /* Title/songname/content description */}, {"TMT", EQ(TMED) /* Media type */},
#line 93 "compat.gperf" {"TKE", EQ(TKEY) /* Initial key */},
{"TIM", OBSOLETE /* Time [obsolete] */},
#line 94 "compat.gperf"
{"TIME", OBSOLETE /* Time [obsolete] */},
#line 103 "compat.gperf"
{"TORY", EQ(TDOR) /* Original release year [obsolete] */}, {"TORY", EQ(TDOR) /* Original release year [obsolete] */},
#line 91 "compat.gperf" {"TRD", OBSOLETE /* Recording dates [obsolete] */},
{"TEN", EQ(TENC) /* Encoded by */}, {"TYE", OBSOLETE /* Year [obsolete] */},
#line 118 "compat.gperf" {"TT2", EQ(TIT2) /* Title/songname/content description */},
{"TT1", EQ(TIT1) /* Content group description */}, {"TT1", EQ(TIT1) /* Content group description */},
#line 127 "compat.gperf"
{"WAF", EQ(WOAF) /* Official audio file webpage */},
#line 75 "compat.gperf"
{"PIC", EQ(APIC) /* Attached picture */},
#line 122 "compat.gperf"
{"TXX", EQ(TXXX) /* User defined text information frame */},
#line 133 "compat.gperf"
{"WXX", EQ(WXXX) /* User defined URL link frame */}, {"WXX", EQ(WXXX) /* User defined URL link frame */},
#line 86 "compat.gperf" {"TIME", OBSOLETE /* Time [obsolete] */},
{"TCON", TX(TCON) /* Content type */}, {"TSIZ", OBSOLETE /* Size [obsolete] */},
#line 77 "compat.gperf" {"TT3", EQ(TIT3) /* Subtitle/description refinement */},
{"REV", EQ(RVRB) /* Reverb */}, {"TRDA", OBSOLETE /* Recording dates [obsolete] */},
#line 106 "compat.gperf" {"RVAD", OBSOLETE /* Relative volume adjustment [obsolete] */},
{"TP2", EQ(TPE2) /* Band/orchestra/accompaniment */}, {"TDY", EQ(TDLY) /* Playlist delay */},
#line 105 "compat.gperf" {"TXT", EQ(TEXT) /* Lyricist/text writer */},
{"TP1", EQ(TPE1) /* Lead performer(s)/soloist(s) */}, {"TYER", OBSOLETE /* Year [obsolete] */},
#line 61 "compat.gperf" {"TDAT", OBSOLETE /* Date [obsolete] */},
{"BUF", EQ(RBUF) /* Recommended buffer size */}, {"TXX", EQ(TXXX) /* User defined text information frame */}
#line 70 "compat.gperf"
{"IPL", EQ(TIPL) /* Involved people list */},
#line 69 "compat.gperf"
{"GEO", EQ(GEOB) /* General encapsulated object */},
#line 72 "compat.gperf"
{"LNK", EQ(LINK) /* Linked information */},
#line 71 "compat.gperf"
{"IPLS", EQ(TIPL) /* Involved people list */}
}; };
static const short lookup[] = static const short lookup[] =
{ {
-1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, -1, 0, -1, -53, -2, 1, -49, -2,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, -1, 2, 3, -1, -46, -2, -43, -2, 4,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 5, 6, -1, 7, -163, 10, 11, 12,
-1, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 13, -161, 17, -159, -77, 22, 23, -80,
48, 49, -1, -1, 50, -1, 51, 52, -1, 53, 54, 55, 56, -1, 26, -85, 29, -87, 32, 33, 34, 35,
57, 58, 59, 60, -1, 61, -1, 62, -1, -1, 63, -1, 64, -1, 36, 37, 38, 39, 40, 41, -155, 44,
-1, 65, -1, 66, -1, -1, -1, -1, -1, 67, -1, 68, -1, 69, 45, 46, 47, -1, 48, 49, 50, 51,
-1, 70, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 52, 53, 54, 55, 56, 57, 58, 59,
-1, 71, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 60, 61, 62, 63, 64, -1, -151,
-1, 72 -1, 67, 68, 69, 70, -8, -2, -1,
71, -31, -2, -1, 72, -55, -2, -59,
-3, -65, -2
}; };
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
...@@ -332,12 +229,25 @@ id3_compat_lookup (str, len) ...@@ -332,12 +229,25 @@ id3_compat_lookup (str, len)
if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0') if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
return &wordlist[index]; return &wordlist[index];
} }
else if (index < -TOTAL_KEYWORDS)
{
register int offset = - 1 - TOTAL_KEYWORDS - index;
register const struct id3_compat *wordptr = &wordlist[TOTAL_KEYWORDS + lookup[offset]];
register const struct id3_compat *wordendptr = wordptr + -lookup[offset + 1];
while (wordptr < wordendptr)
{
register const char *s = wordptr->id;
if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
return wordptr;
wordptr++;
}
}
} }
} }
return 0; return 0;
} }
#line 134 "compat.gperf"
static static
int translate_TCON(struct id3_frame *frame, char const *oldid, int translate_TCON(struct id3_frame *frame, char const *oldid,
......
libid3tag/compat.gperf
View file @ d94eaf58
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: compat.gperf,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: compat.gperf,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libid3tag/compat.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: compat.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: compat.h,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifndef LIBID3TAG_COMPAT_H # ifndef LIBID3TAG_COMPAT_H
......
libid3tag/configure
View file @ d94eaf58
#! /bin/sh #! /bin/sh
# From configure.ac Id: configure.ac,v 1.1.1.1 2003/07/15 15:51:33 shank Exp . # From configure.ac Id: configure.ac,v 1.3 2003/07/05 05:39:48 shank Exp .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for ID3 Tag 0.15.0b. # Generated by GNU Autoconf 2.57 for ID3 Tag 0.15.0b.
# #
...@@ -251,7 +251,6 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then ...@@ -251,7 +251,6 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then
*-DOS) lt_cv_sys_path_separator=';' ;; *-DOS) lt_cv_sys_path_separator=';' ;;
*) lt_cv_sys_path_separator=':' ;; *) lt_cv_sys_path_separator=':' ;;
esac esac
PATH_SEPARATOR=$lt_cv_sys_path_separator
fi fi
...@@ -318,7 +317,7 @@ else ...@@ -318,7 +317,7 @@ else
# #
# So, first we look for a working echo in the user's PATH. # So, first we look for a working echo in the user's PATH.
IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
for dir in $PATH /usr/ucb; do for dir in $PATH /usr/ucb; do
if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
...@@ -470,7 +469,7 @@ ac_includes_default="\ ...@@ -470,7 +469,7 @@ ac_includes_default="\
# include <unistd.h> # include <unistd.h>
#endif" #endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL LIBTOOL_DEPS DEBUG_TRUE DEBUG_FALSE LIBOBJS LTLIBOBJS' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL LIBTOOL_DEPS DEBUG_TRUE DEBUG_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
...@@ -1458,7 +1457,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ...@@ -1458,7 +1457,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
am__api_version="1.6" am__api_version="1.7"
ac_aux_dir= ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
if test -f $ac_dir/install-sh; then if test -f $ac_dir/install-sh; then
...@@ -1710,6 +1709,16 @@ echo "$as_me: error: source directory already configured; run \"make distclean\" ...@@ -1710,6 +1709,16 @@ echo "$as_me: error: source directory already configured; run \"make distclean\"
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
# test whether we have cygpath
if test -z "$CYGPATH_W"; then
if (cygpath --version) >/dev/null 2>/dev/null; then
CYGPATH_W='cygpath -w'
else
CYGPATH_W=echo
fi
fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE=libid3tag PACKAGE=libid3tag
VERSION=0.15.0b VERSION=0.15.0b
...@@ -1839,14 +1848,10 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ...@@ -1839,14 +1848,10 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
# Add the stamp file to the list of files AC keeps track of,
# along with our hook.
ac_config_headers="$ac_config_headers config.h" ac_config_headers="$ac_config_headers config.h"
# Make sure we can run config.sub. # Make sure we can run config.sub.
$ac_config_sub sun4 >/dev/null 2>&1 || $ac_config_sub sun4 >/dev/null 2>&1 ||
{ { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
...@@ -2671,7 +2676,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ...@@ -2671,7 +2676,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
for ac_declaration in \ for ac_declaration in \
'' \ ''\
'#include <stdlib.h>' \
'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \ 'extern "C" void exit (int) throw ();' \
...@@ -2685,8 +2691,8 @@ _ACEOF ...@@ -2685,8 +2691,8 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
$ac_declaration
#include <stdlib.h> #include <stdlib.h>
$ac_declaration
int int
main () main ()
{ {
...@@ -2801,7 +2807,7 @@ echo "include confinc" > confmf ...@@ -2801,7 +2807,7 @@ echo "include confinc" > confmf
# In particular we don't look at `^make:' because GNU make might # In particular we don't look at `^make:' because GNU make might
# be invoked under some other name (usually "gmake"), in which # be invoked under some other name (usually "gmake"), in which
# case it prints its new name instead of `make'. # case it prints its new name instead of `make'.
if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
am__include=include am__include=include
am__quote= am__quote=
_am_result=GNU _am_result=GNU
...@@ -2892,7 +2898,7 @@ else ...@@ -2892,7 +2898,7 @@ else
if depmode=$depmode \ if depmode=$depmode \
source=conftest.c object=conftest.o \ source=conftest.c object=conftest.o \
depfile=conftest.Po tmpdepfile=conftest.TPo \ depfile=conftest.Po tmpdepfile=conftest.TPo \
$SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&
grep conftest.h conftest.Po > /dev/null 2>&1 && grep conftest.h conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
am_cv_CC_dependencies_compiler_type=$depmode am_cv_CC_dependencies_compiler_type=$depmode
...@@ -2913,6 +2919,18 @@ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type ...@@ -2913,6 +2919,18 @@ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
am__fastdepCC_FALSE='#'
else
am__fastdepCC_TRUE='#'
am__fastdepCC_FALSE=
fi
if test "$GCC" = yes if test "$GCC" = yes
then then
case "$host" in case "$host" in
...@@ -2994,17 +3012,6 @@ esac ...@@ -2994,17 +3012,6 @@ esac
else else
enable_fast_install=yes enable_fast_install=yes
fi; fi;
# Find the correct PATH separator. Usually this is `:', but
# DJGPP uses `;' like DOS.
if test "X${PATH_SEPARATOR+set}" != Xset; then
UNAME=${UNAME-`uname 2>/dev/null`}
case X$UNAME in
*-DOS) lt_cv_sys_path_separator=';' ;;
*) lt_cv_sys_path_separator=':' ;;
esac
PATH_SEPARATOR=$lt_cv_sys_path_separator
fi
# Check whether --with-gnu-ld or --without-gnu-ld was given. # Check whether --with-gnu-ld or --without-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then if test "${with_gnu_ld+set}" = set; then
...@@ -3056,7 +3063,7 @@ if test "${lt_cv_path_LD+set}" = set; then ...@@ -3056,7 +3063,7 @@ if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
if test -z "$LD"; then if test -z "$LD"; then
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
...@@ -3126,7 +3133,7 @@ else ...@@ -3126,7 +3133,7 @@ else
# Let the user override the test. # Let the user override the test.
lt_cv_path_NM="$NM" lt_cv_path_NM="$NM"
else else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
tmp_nm=$ac_dir/${ac_tool_prefix}nm tmp_nm=$ac_dir/${ac_tool_prefix}nm
...@@ -3156,91 +3163,6 @@ NM="$lt_cv_path_NM" ...@@ -3156,91 +3163,6 @@ NM="$lt_cv_path_NM"
echo "$as_me:$LINENO: result: $NM" >&5 echo "$as_me:$LINENO: result: $NM" >&5
echo "${ECHO_T}$NM" >&6 echo "${ECHO_T}$NM" >&6
echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
# Loop through the user's path and test for sed and gsed.
# Then use that list of sed's as ones to test for truncation.
as_executable_p="test -f"
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
_sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
fi
done
done
done
# Create a temporary directory, and hook for its removal unless debugging.
$debug ||
{
trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
trap '{ (exit 1); exit 1; }' 1 2 13 15
}
# Create a (secure) tmp directory for tmp files.
: ${TMPDIR=/tmp}
{
tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
test -n "$tmp" && test -d "$tmp"
} ||
{
tmp=$TMPDIR/sed$$-$RANDOM
(umask 077 && mkdir $tmp)
} ||
{
echo "$me: cannot create a temporary directory in $TMPDIR" >&2
{ (exit 1); exit 1; }
}
_max=0
_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for _sed in $_sed_list /usr/xpg4/bin/sed; do
test ! -f ${_sed} && break
cat /dev/null > "$tmp/sed.in"
_count=0
echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
# Check for GNU sed and select it if it is found.
if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
lt_cv_path_SED=${_sed}
break
fi
while true; do
cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
mv "$tmp/sed.tmp" "$tmp/sed.in"
cp "$tmp/sed.in" "$tmp/sed.nl"
echo >>"$tmp/sed.nl"
${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
# 40000 chars as input seems more than enough
test $_count -gt 10 && break
_count=`expr $_count + 1`
if test $_count -gt $_max; then
_max=$_count
lt_cv_path_SED=$_sed
fi
done
done
rm -rf "$tmp"
fi
if test "X$SED" != "X"; then
lt_cv_path_SED=$SED
else
SED=$lt_cv_path_SED
fi
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
echo "$as_me:$LINENO: checking whether ln -s works" >&5 echo "$as_me:$LINENO: checking whether ln -s works" >&5
echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
LN_S=$as_ln_s LN_S=$as_ln_s
...@@ -3252,8 +3174,8 @@ else ...@@ -3252,8 +3174,8 @@ else
echo "${ECHO_T}no, using $LN_S" >&6 echo "${ECHO_T}no, using $LN_S" >&6
fi fi
echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 echo "$as_me:$LINENO: checking how to recognise dependant libraries" >&5
echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6
if test "${lt_cv_deplibs_check_method+set}" = set; then if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
...@@ -3266,7 +3188,7 @@ lt_cv_deplibs_check_method='unknown' ...@@ -3266,7 +3188,7 @@ lt_cv_deplibs_check_method='unknown'
# `unknown' -- same as none, but documents that we really don't know. # `unknown' -- same as none, but documents that we really don't know.
# 'pass_all' -- all dependencies passed with no checks. # 'pass_all' -- all dependencies passed with no checks.
# 'test_compile' -- check by making test program. # 'test_compile' -- check by making test program.
# 'file_magic [[regex]]' -- check by looking for files in library path # ['file_magic [regex]'] -- check by looking for files in library path
# which responds to the $file_magic_cmd with a given egrep regex. # which responds to the $file_magic_cmd with a given egrep regex.
# If you have `file' or equivalent on your system and you're not sure # If you have `file' or equivalent on your system and you're not sure
# whether `pass_all' will *always* work, you probably want this one. # whether `pass_all' will *always* work, you probably want this one.
...@@ -3330,9 +3252,9 @@ hpux10.20*|hpux11*) ...@@ -3330,9 +3252,9 @@ hpux10.20*|hpux11*)
lt_cv_file_magic_test_file=/usr/lib/libc.sl lt_cv_file_magic_test_file=/usr/lib/libc.sl
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
case $host_os in case $host_os in
irix5* | nonstopux*) irix5*)
# this will be overridden with pass_all, but let us keep it just in case # this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
;; ;;
...@@ -3354,7 +3276,7 @@ irix5* | irix6* | nonstopux*) ...@@ -3354,7 +3276,7 @@ irix5* | irix6* | nonstopux*)
# This must be Linux ELF. # This must be Linux ELF.
linux-gnu*) linux-gnu*)
case $host_cpu in case $host_cpu in
alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | arm* | m68k) alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
lt_cv_deplibs_check_method=pass_all ;; lt_cv_deplibs_check_method=pass_all ;;
*) *)
# glibc up to 2.1.1 does not perform some relocations on ARM # glibc up to 2.1.1 does not perform some relocations on ARM
...@@ -3425,9 +3347,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ...@@ -3425,9 +3347,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
lt_cv_file_magic_test_file=/lib/libc.so lt_cv_file_magic_test_file=/lib/libc.so
;; ;;
siemens)
lt_cv_deplibs_check_method=pass_all
;;
esac esac
;; ;;
esac esac
...@@ -3482,12 +3401,9 @@ hpux*) # Its linker distinguishes data from code symbols ...@@ -3482,12 +3401,9 @@ hpux*) # Its linker distinguishes data from code symbols
lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;; ;;
irix* | nonstopux*) irix*)
symcode='[BCDEGRST]' symcode='[BCDEGRST]'
;; ;;
osf*)
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*) solaris* | sysv5*)
symcode='[BDT]' symcode='[BDT]'
;; ;;
...@@ -3596,7 +3512,7 @@ EOF ...@@ -3596,7 +3512,7 @@ EOF
(eval $ac_link) 2>&5 (eval $ac_link) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest$ac_exeext; then (exit $ac_status); } && test -s conftest; then
pipe_works=yes pipe_works=yes
fi fi
LIBS="$save_LIBS" LIBS="$save_LIBS"
...@@ -4262,7 +4178,6 @@ done ...@@ -4262,7 +4178,6 @@ done
# Only perform the check for file, if the check method requires it # Only perform the check for file, if the check method requires it
case $deplibs_check_method in case $deplibs_check_method in
file_magic*) file_magic*)
...@@ -4578,7 +4493,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ...@@ -4578,7 +4493,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
case $host in case $host in
*-*-irix6*) *-*-irix6*)
# Find out which ABI we are using. # Find out which ABI we are using.
echo '#line 4581 "configure"' > conftest.$ac_ext echo '#line 4496 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
...@@ -4820,7 +4735,7 @@ else ...@@ -4820,7 +4735,7 @@ else
# like `-m68040'. # like `-m68040'.
lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
;; ;;
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes. # PIC is the default for these OSes.
;; ;;
darwin* | rhapsody*) darwin* | rhapsody*)
...@@ -4863,7 +4778,7 @@ else ...@@ -4863,7 +4778,7 @@ else
lt_cv_prog_cc_pic='+Z' lt_cv_prog_cc_pic='+Z'
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_wl='-Wl,'
lt_cv_prog_cc_static='-non_shared' lt_cv_prog_cc_static='-non_shared'
# PIC (with -KPIC) is the default. # PIC (with -KPIC) is the default.
...@@ -4907,7 +4822,11 @@ else ...@@ -4907,7 +4822,11 @@ else
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_pic='-KPIC'
lt_cv_prog_cc_static='-Bstatic' lt_cv_prog_cc_static='-Bstatic'
lt_cv_prog_cc_wl='-Wl,' if test "x$host_vendor" = xsni; then
lt_cv_prog_cc_wl='-LD'
else
lt_cv_prog_cc_wl='-Wl,'
fi
;; ;;
uts4*) uts4*)
...@@ -5107,7 +5026,7 @@ chmod -w . ...@@ -5107,7 +5026,7 @@ chmod -w .
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no compiler_c_o=no
if { (eval echo configure:5110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then if { (eval echo configure:5029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings # So say no if there are warnings
if test -s out/conftest.err; then if test -s out/conftest.err; then
...@@ -5425,7 +5344,7 @@ EOF ...@@ -5425,7 +5344,7 @@ EOF
# can override, but on older systems we have to supply one (in ltdll.c) # can override, but on older systems we have to supply one (in ltdll.c)
if test "x$lt_cv_need_dllmain" = "xyes"; then if test "x$lt_cv_need_dllmain" = "xyes"; then
ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~ ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~
test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
else else
ltdll_obj= ltdll_obj=
...@@ -5443,7 +5362,7 @@ EOF ...@@ -5443,7 +5362,7 @@ EOF
# If the export-symbols file already is a .def file (1st line # If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is. # is EXPORTS), use it as is.
# If DATA tags from a recent dlltool are present, honour them! # If DATA tags from a recent dlltool are present, honour them!
archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
cp $export_symbols $output_objdir/$soname-def; cp $export_symbols $output_objdir/$soname-def;
else else
echo EXPORTS > $output_objdir/$soname-def; echo EXPORTS > $output_objdir/$soname-def;
...@@ -5452,7 +5371,6 @@ EOF ...@@ -5452,7 +5371,6 @@ EOF
set dummy \$symbol; set dummy \$symbol;
case \$# in case \$# in
2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
4) echo " \$2 \$3 \$4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
*) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;; *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
esac; esac;
_lt_hint=`expr 1 + \$_lt_hint`; _lt_hint=`expr 1 + \$_lt_hint`;
...@@ -5565,12 +5483,10 @@ else ...@@ -5565,12 +5483,10 @@ else
# need to do runtime linking. # need to do runtime linking.
case $host_os in aix4.[23]|aix4.[23].*|aix5*) case $host_os in aix4.[23]|aix4.[23].*|aix5*)
for ld_flag in $LDFLAGS; do for ld_flag in $LDFLAGS; do
case $ld_flag in if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
*-brtl*)
aix_use_runtimelinking=yes aix_use_runtimelinking=yes
break break
;; fi
esac
done done
esac esac
...@@ -5642,7 +5558,7 @@ else ...@@ -5642,7 +5558,7 @@ else
allow_undefined_flag='${wl}-berok' allow_undefined_flag='${wl}-berok'
# This is a bit strange, but is similar to how AIX traditionally builds # This is a bit strange, but is similar to how AIX traditionally builds
# it's shared libraries. # it's shared libraries.
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname' archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
fi fi
fi fi
;; ;;
...@@ -5684,9 +5600,8 @@ else ...@@ -5684,9 +5600,8 @@ else
esac esac
# FIXME: Relying on posixy $() will cause problems for # FIXME: Relying on posixy $() will cause problems for
# cross-compilation, but unfortunately the echo tests do not # cross-compilation, but unfortunately the echo tests do not
# yet detect zsh echo's removal of \ escapes. Also zsh mangles # yet detect zsh echo's removal of \ escapes.
# `"' quotes if we put them in here... so don't! archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
# We need to add '_' to the symbols in $export_symbols first # We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes hardcode_direct=yes
...@@ -5738,14 +5653,13 @@ else ...@@ -5738,14 +5653,13 @@ else
export_dynamic_flag_spec='${wl}-E' export_dynamic_flag_spec='${wl}-E'
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
if test "$GCC" = yes; then if test "$GCC" = yes; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='-rpath $libdir'
fi fi
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=: hardcode_libdir_separator=:
link_all_deplibs=yes link_all_deplibs=yes
;; ;;
...@@ -5773,7 +5687,7 @@ else ...@@ -5773,7 +5687,7 @@ else
hardcode_direct=yes hardcode_direct=yes
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir' hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E' export_dynamic_flag_spec='${wl}-E'
else else
...@@ -5783,7 +5697,7 @@ else ...@@ -5783,7 +5697,7 @@ else
hardcode_libdir_flag_spec='-R$libdir' hardcode_libdir_flag_spec='-R$libdir'
;; ;;
*) *)
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir' hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;; ;;
esac esac
...@@ -5836,35 +5750,7 @@ else ...@@ -5836,35 +5750,7 @@ else
;; ;;
solaris*) solaris*)
# gcc --version < 3.0 without binutils cannot create self contained
# shared libraries reliably, requiring libgcc.a to resolve some of
# the object symbols generated in some cases. Libraries that use
# assert need libgcc.a to resolve __eprintf, for example. Linking
# a copy of libgcc.a into every shared library to guarantee resolving
# such symbols causes other problems: According to Tim Van Holder
# <tim.van.holder@pandora.be>, C++ libraries end up with a separate
# (to the application) exception stack for one thing.
no_undefined_flag=' -z defs' no_undefined_flag=' -z defs'
if test "$GCC" = yes; then
case `$CC --version 2>/dev/null` in
[12].*)
cat <<EOF 1>&2
*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
*** create self contained shared libraries on Solaris systems, without
*** introducing a dependency on libgcc.a. Therefore, libtool is disabling
*** -no-undefined support, which will at least allow you to build shared
*** libraries. However, you may find that when you link such libraries
*** into an application without using GCC, you have to manually add
*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to
*** upgrade to a newer version of GCC. Another option is to rebuild your
*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
EOF
no_undefined_flag=
;;
esac
fi
# $CC -shared without GNU ld will not create a library from C++ # $CC -shared without GNU ld will not create a library from C++
# object files and a static libstdc++, better avoid it by now # object files and a static libstdc++, better avoid it by now
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
...@@ -5895,23 +5781,13 @@ EOF ...@@ -5895,23 +5781,13 @@ EOF
;; ;;
sysv4) sysv4)
case $host_vendor in if test "x$host_vendor" = xsno; then
sni) archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes # is this really true???
hardcode_direct=yes # is this really true??? else
;; archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
siemens) hardcode_direct=no #Motorola manual says yes, but my tests say they lie
## LD is ld it makes a PLAMLIB fi
## CC just makes a GrossModule.
archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
reload_cmds='$CC -r -o $output$reload_objs'
hardcode_direct=no
;;
motorola)
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=no #Motorola manual says yes, but my tests say they lie
;;
esac
runpath_var='LD_RUN_PATH' runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
;; ;;
...@@ -6059,9 +5935,6 @@ aix3*) ...@@ -6059,9 +5935,6 @@ aix3*)
aix4* | aix5*) aix4* | aix5*)
version_type=linux version_type=linux
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
if test "$host_cpu" = ia64; then if test "$host_cpu" = ia64; then
# AIX 5 supports IA64 # AIX 5 supports IA64
library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
...@@ -6073,15 +5946,15 @@ aix4* | aix5*) ...@@ -6073,15 +5946,15 @@ aix4* | aix5*)
# depend on `.', always an invalid library. This was fixed in # depend on `.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0. # development snapshots of GCC prior to 3.0.
case $host_os in case $host_os in
aix4 | aix4.[01] | aix4.[01].*) aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes ' echo ' yes '
echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
: :
else else
can_build_shared=no can_build_shared=no
fi fi
;; ;;
esac esac
# AIX (on Power*) has no versioning support, so currently we can # AIX (on Power*) has no versioning support, so currently we can
# not hardcode correct soname into executable. Probably we can # not hardcode correct soname into executable. Probably we can
...@@ -6100,7 +5973,6 @@ aix4* | aix5*) ...@@ -6100,7 +5973,6 @@ aix4* | aix5*)
fi fi
shlibpath_var=LIBPATH shlibpath_var=LIBPATH
fi fi
hardcode_into_libs=yes
;; ;;
amigaos*) amigaos*)
...@@ -6148,7 +6020,7 @@ cygwin* | mingw* | pw32*) ...@@ -6148,7 +6020,7 @@ cygwin* | mingw* | pw32*)
;; ;;
yes,mingw*) yes,mingw*)
library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"` sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
;; ;;
yes,pw32*) yes,pw32*)
library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll' library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll'
...@@ -6180,18 +6052,6 @@ freebsd1*) ...@@ -6180,18 +6052,6 @@ freebsd1*)
dynamic_linker=no dynamic_linker=no
;; ;;
freebsd*-gnu*)
version_type=linux
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
soname_spec='${libname}${release}.so$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='GNU/FreeBSD ld.so'
;;
freebsd*) freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat version_type=freebsd-$objformat
...@@ -6243,17 +6103,14 @@ hpux9* | hpux10* | hpux11*) ...@@ -6243,17 +6103,14 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib' postinstall_cmds='chmod 555 $lib'
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
case $host_os in version_type=irix
nonstopux*) version_type=nonstopux ;;
*) version_type=irix ;;
esac
need_lib_prefix=no need_lib_prefix=no
need_version=no need_version=no
soname_spec='${libname}${release}.so$major' soname_spec='${libname}${release}.so$major'
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
case $host_os in case $host_os in
irix5* | nonstopux*) irix5*)
libsuff= shlibsuff= libsuff= shlibsuff=
;; ;;
*) *)
...@@ -6357,13 +6214,11 @@ os2*) ...@@ -6357,13 +6214,11 @@ os2*)
osf3* | osf4* | osf5*) osf3* | osf4* | osf5*)
version_type=osf version_type=osf
need_version=no need_version=no
need_lib_prefix=no soname_spec='${libname}${release}.so'
soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
hardcode_into_libs=yes
;; ;;
sco3.2v5*) sco3.2v5*)
...@@ -6406,12 +6261,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ...@@ -6406,12 +6261,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
case $host_vendor in case $host_vendor in
sni) sni)
shlibpath_overrides_runpath=no shlibpath_overrides_runpath=no
need_lib_prefix=no
export_dynamic_flag_spec='${wl}-Blargedynsym'
runpath_var=LD_RUN_PATH
;;
siemens)
need_lib_prefix=no
;; ;;
motorola) motorola)
need_lib_prefix=no need_lib_prefix=no
...@@ -6952,7 +6801,7 @@ else ...@@ -6952,7 +6801,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6955 "configure" #line 6804 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
...@@ -7050,7 +6899,7 @@ else ...@@ -7050,7 +6899,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7053 "configure" #line 6902 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
...@@ -7233,7 +7082,7 @@ if test -f "$ltmain"; then ...@@ -7233,7 +7082,7 @@ if test -f "$ltmain"; then
# Now quote all the things that may contain metacharacters while being # Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the # careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script. # variables and quote the copies for generation of the libtool script.
for var in echo old_CC old_CFLAGS SED \ for var in echo old_CC old_CFLAGS \
AR AR_FLAGS CC LD LN_S NM SHELL \ AR AR_FLAGS CC LD LN_S NM SHELL \
reload_flag reload_cmds wl \ reload_flag reload_cmds wl \
pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
...@@ -7295,11 +7144,8 @@ if test -f "$ltmain"; then ...@@ -7295,11 +7144,8 @@ if test -f "$ltmain"; then
# configuration script generated by Autoconf, you may include it under # configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program. # the same distribution terms that you use for the rest of that program.
# A sed that does not truncate output.
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n. # Sed that helps us avoid accidentally triggering echo(1) options like -n.
Xsed="${SED} -e s/^X//" Xsed="sed -e s/^X//"
# The HP-UX ksh and POSIX shell print the target directory to stdout # The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set. # if CDPATH is set.
...@@ -8831,6 +8677,13 @@ echo "$as_me: error: conditional \"AMDEP\" was never defined. ...@@ -8831,6 +8677,13 @@ echo "$as_me: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;} Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"DEBUG\" was never defined. { { echo "$as_me:$LINENO: error: conditional \"DEBUG\" was never defined.
Usually this means the macro was only invoked conditionally." >&5 Usually this means the macro was only invoked conditionally." >&5
...@@ -9373,6 +9226,7 @@ s,@LIBS@,$LIBS,;t t ...@@ -9373,6 +9226,7 @@ s,@LIBS@,$LIBS,;t t
s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t
s,@CYGPATH_W@,$CYGPATH_W,;t t
s,@PACKAGE@,$PACKAGE,;t t s,@PACKAGE@,$PACKAGE,;t t
s,@VERSION@,$VERSION,;t t s,@VERSION@,$VERSION,;t t
s,@ACLOCAL@,$ACLOCAL,;t t s,@ACLOCAL@,$ACLOCAL,;t t
...@@ -9409,6 +9263,8 @@ s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t ...@@ -9409,6 +9263,8 @@ s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
s,@CCDEPMODE@,$CCDEPMODE,;t t s,@CCDEPMODE@,$CCDEPMODE,;t t
s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
s,@LN_S@,$LN_S,;t t s,@LN_S@,$LN_S,;t t
s,@ECHO@,$ECHO,;t t s,@ECHO@,$ECHO,;t t
s,@RANLIB@,$RANLIB,;t t s,@RANLIB@,$RANLIB,;t t
...@@ -9846,12 +9702,19 @@ echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} ...@@ -9846,12 +9702,19 @@ echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
cat $tmp/config.h cat $tmp/config.h
rm -f $tmp/config.h rm -f $tmp/config.h
fi fi
# Run the commands associated with the file. _am_stamp_count=`expr ${_am_stamp_count-0} + 1`
case $ac_file in echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
config.h ) # update the timestamp $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
echo 'timestamp for config.h' >"./stamp-h1" X$ac_file : 'X\(//\)[^/]' \| \
;; X$ac_file : 'X\(//\)$' \| \
esac X$ac_file : 'X\(/\)' \| \
. : '\(.\)' 2>/dev/null ||
echo X$ac_file |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
/^X\(\/\/\)$/{ s//\1/; q; }
/^X\(\/\).*/{ s//\1/; q; }
s/.*/./; q'`/stamp-h$_am_stamp_count
done done
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF
......
libid3tag/configure.ac
View file @ d94eaf58
...@@ -17,7 +17,7 @@ dnl You should have received a copy of the GNU General Public License ...@@ -17,7 +17,7 @@ dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
dnl dnl
AC_REVISION([$Id: configure.ac,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $])dnl AC_REVISION([$Id: configure.ac,v 1.3 2003/07/05 05:39:48 shank Exp $])dnl
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
......
libid3tag/crc.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: crc.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: crc.c,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libid3tag/crc.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: crc.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: crc.h,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifndef LIBID3TAG_CRC_H # ifndef LIBID3TAG_CRC_H
......
libid3tag/debug.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: debug.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: debug.c,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libid3tag/debug.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: debug.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: debug.h,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifndef LIBID3TAG_DEBUG_H # ifndef LIBID3TAG_DEBUG_H
......
libid3tag/field.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: field.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: field.c,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libid3tag/field.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: field.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: field.h,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifndef LIBID3TAG_FIELD_H # ifndef LIBID3TAG_FIELD_H
......
libid3tag/file.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: file.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: file.c,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libid3tag/file.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: file.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: file.h,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifndef LIBID3TAG_FILE_H # ifndef LIBID3TAG_FILE_H
......
libid3tag/frame.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: frame.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: frame.c,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libid3tag/frame.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: frame.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: frame.h,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifndef LIBID3TAG_FRAME_H # ifndef LIBID3TAG_FRAME_H
......
libid3tag/frametype.c
View file @ d94eaf58
/* C code produced by gperf version 3.0 */ /* C code produced by gperf version 2.7.2 */
/* Command-line: gperf -tCcTonD -K id -N id3_frametype_lookup -s -3 -k '*' frametype.gperf */ /* Command-line: gperf -tCcTonD -K id -N id3_frametype_lookup -s -3 -k '*' frametype.gperf */
#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
&& ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
&& (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
&& ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
&& ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
&& ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
&& ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
&& ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
&& ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
&& ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
&& ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
&& ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
&& ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
&& ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
&& ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
&& ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
&& ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
&& ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
&& ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
&& ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
&& ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
&& ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
&& ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
/* The character set is not based on ISO-646. */
error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
#endif
#line 1 "frametype.gperf"
/* /*
* libid3tag - ID3 tag manipulation library * libid3tag - ID3 tag manipulation library
* Copyright (C) 2000-2003 Underbit Technologies, Inc. * Copyright (C) 2000-2003 Underbit Technologies, Inc.
...@@ -48,7 +18,7 @@ error "gperf generated tables don't work with this execution character set. Plea ...@@ -48,7 +18,7 @@ error "gperf generated tables don't work with this execution character set. Plea
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* Id: frametype.gperf,v 1.1.1.1 2003/07/15 15:51:33 shank Exp * Id: frametype.gperf,v 1.2 2003/07/05 05:18:51 shank Exp
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
...@@ -303,9 +273,9 @@ FRAMETYPE(obsolete, unknown, OBSOLETE, "Obsolete frame"); ...@@ -303,9 +273,9 @@ FRAMETYPE(obsolete, unknown, OBSOLETE, "Obsolete frame");
#define TOTAL_KEYWORDS 84 #define TOTAL_KEYWORDS 84
#define MIN_WORD_LENGTH 4 #define MIN_WORD_LENGTH 4
#define MAX_WORD_LENGTH 4 #define MAX_WORD_LENGTH 4
#define MIN_HASH_VALUE 7 #define MIN_HASH_VALUE 0
#define MAX_HASH_VALUE 155 #define MAX_HASH_VALUE 111
/* maximum key range = 149, duplicates = 0 */ /* maximum key range = 112, duplicates = 12 */
#ifdef __GNUC__ #ifdef __GNUC__
__inline __inline
...@@ -321,34 +291,49 @@ hash (str, len) ...@@ -321,34 +291,49 @@ hash (str, len)
{ {
static const unsigned char asso_values[] = static const unsigned char asso_values[] =
{ {
156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 112, 112, 112, 112, 112, 112, 112, 112, 112, 20,
43, 4, 47, 49, 156, 156, 156, 156, 156, 156, 18, 2, 25, 112, 112, 112, 112, 112, 112, 112,
156, 156, 156, 156, 156, 31, 53, 3, 15, 3, 112, 112, 112, 112, 112, 19, 26, 1, 28, 15,
24, 25, 10, 52, 69, 34, 23, 30, 1, 5, 9, 31, 112, 0, 112, 29, 3, 0, 10, 0,
10, 62, 20, 0, 28, 28, 22, 19, 47, 3, 30, 0, 8, 5, 0, 29, 31, 24, 29, 24,
10, 156, 156, 156, 156, 156, 156, 156, 156, 156, 30, 112, 112, 112, 112, 112, 112, 112, 112, 112,
156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
156, 156, 156, 156, 156, 156, 156, 156, 156, 156, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112,
156, 156, 156, 156, 156, 156, 156 112, 112, 112, 112, 112, 112
}; };
return asso_values[(unsigned char)str[3]+1] + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[1]] + asso_values[(unsigned char)str[0]]; register int hval = 0;
switch (len)
{
default:
case 4:
hval += asso_values[(unsigned char)str[3]];
case 3:
hval += asso_values[(unsigned char)str[2]];
case 2:
hval += asso_values[(unsigned char)str[1]];
case 1:
hval += asso_values[(unsigned char)str[0]];
break;
}
return hval;
} }
#ifdef __GNUC__ #ifdef __GNUC__
...@@ -361,190 +346,108 @@ id3_frametype_lookup (str, len) ...@@ -361,190 +346,108 @@ id3_frametype_lookup (str, len)
{ {
static const struct id3_frametype wordlist[] = static const struct id3_frametype wordlist[] =
{ {
#line 282 "frametype.gperf" {"TMOO", FRAME(text), PRESERVE, "Mood"},
{"ENCR", FRAME(ENCR), PRESERVE, "Encryption method registration"},
#line 292 "frametype.gperf"
{"POPM", FRAME(POPM), PRESERVE, "Popularimeter"},
#line 351 "frametype.gperf"
{"WCOM", FRAME(url), PRESERVE, "Commercial information"},
#line 298 "frametype.gperf"
{"SEEK", FRAME(SEEK), DISCARD, "Seek frame"},
#line 349 "frametype.gperf"
{"USER", FRAME(USER), PRESERVE, "Terms of use"},
#line 285 "frametype.gperf"
{"GEOB", FRAME(GEOB), PRESERVE, "General encapsulated object"},
#line 304 "frametype.gperf"
{"TCOM", FRAME(text), PRESERVE, "Composer"}, {"TCOM", FRAME(text), PRESERVE, "Composer"},
#line 281 "frametype.gperf"
{"COMR", FRAME(COMR), PRESERVE, "Commercial frame"},
#line 280 "frametype.gperf"
{"COMM", FRAME(COMM), PRESERVE, "Comments"}, {"COMM", FRAME(COMM), PRESERVE, "Comments"},
#line 305 "frametype.gperf" {"TIT3", FRAME(text), PRESERVE, "Subtitle/description refinement"},
{"TMCL", FRAME(text), PRESERVE, "Musician credits list"},
{"TSOT", FRAME(text), PRESERVE, "Title sort order"},
{"MLLT", FRAME(MLLT), DISCARD, "MPEG location lookup table"},
{"COMR", FRAME(COMR), PRESERVE, "Commercial frame"},
{"TSST", FRAME(text), PRESERVE, "Set subtitle"},
{"TCON", FRAME(text), PRESERVE, "Content type"}, {"TCON", FRAME(text), PRESERVE, "Content type"},
#line 291 "frametype.gperf" {"TFLT", FRAME(text), PRESERVE, "File type"},
{"PCNT", FRAME(PCNT), PRESERVE, "Play counter"}, {"TRSO", FRAME(text), PRESERVE, "Internet radio station owner"},
#line 293 "frametype.gperf" {"TSRC", FRAME(text), PRESERVE, "ISRC (international standard recording code)"},
{"POSS", FRAME(POSS), DISCARD, "Position synchronisation frame"},
#line 284 "frametype.gperf"
{"ETCO", FRAME(ETCO), DISCARD, "Event timing codes"}, {"ETCO", FRAME(ETCO), DISCARD, "Event timing codes"},
#line 332 "frametype.gperf" {"TIT2", FRAME(text), PRESERVE, "Title/songname/content description"},
{"TPE2", FRAME(text), PRESERVE, "Band/orchestra/accompaniment"}, {"TOFN", FRAME(text), PRESERVE, "Original filename"},
#line 301 "frametype.gperf" {"TIT1", FRAME(text), PRESERVE, "Content group description"},
{"SYTC", FRAME(SYTC), DISCARD, "Synchronised tempo codes"}, {"TOAL", FRAME(text), PRESERVE, "Original album/movie/show title"},
#line 313 "frametype.gperf"
{"TENC", FRAME(text), DISCARD, "Encoded by"},
#line 309 "frametype.gperf"
{"TDOR", FRAME(text), PRESERVE, "Original release time"},
#line 290 "frametype.gperf"
{"OWNE", FRAME(OWNE), PRESERVE, "Ownership frame"},
#line 277 "frametype.gperf"
{"AENC", FRAME(AENC), DISCARD, "Audio encryption"},
#line 307 "frametype.gperf"
{"TDEN", FRAME(text), PRESERVE, "Encoding time"},
#line 345 "frametype.gperf"
{"TSSE", FRAME(text), PRESERVE, "Software/hardware and settings used for encoding"},
#line 339 "frametype.gperf"
{"TRSN", FRAME(text), PRESERVE, "Internet radio station name"}, {"TRSN", FRAME(text), PRESERVE, "Internet radio station name"},
#line 300 "frametype.gperf" {"TSOA", FRAME(text), PRESERVE, "Album sort order"},
{"TSSE", FRAME(text), PRESERVE, "Software/hardware and settings used for encoding"},
{"WCOM", FRAME(url), PRESERVE, "Commercial information"},
{"TENC", FRAME(text), DISCARD, "Encoded by"},
{"TOLY", FRAME(text), PRESERVE, "Original lyricist(s)/text writer(s)"},
{"TLEN", FRAME(text), DISCARD, "Length"},
{"MCDI", FRAME(MCDI), PRESERVE, "Music CD identifier"},
{"SYTC", FRAME(SYTC), DISCARD, "Synchronised tempo codes"},
{"TCOP", FRAME(text), PRESERVE, "Copyright message"},
{"SYLT", FRAME(SYLT), DISCARD, "Synchronised lyric/text"}, {"SYLT", FRAME(SYLT), DISCARD, "Synchronised lyric/text"},
#line 354 "frametype.gperf" {"TLAN", FRAME(text), PRESERVE, "Language(s)"},
{"WOAR", FRAME(url), PRESERVE, "Official artist/performer webpage"}, {"TIPL", FRAME(text), PRESERVE, "Involved people list"},
#line 346 "frametype.gperf" {"ENCR", FRAME(ENCR), PRESERVE, "Encryption method registration"},
{"TSST", FRAME(text), PRESERVE, "Set subtitle"},
#line 330 "frametype.gperf"
{"TOWN", FRAME(text), PRESERVE, "File owner/licensee"}, {"TOWN", FRAME(text), PRESERVE, "File owner/licensee"},
#line 340 "frametype.gperf"
{"TRSO", FRAME(text), PRESERVE, "Internet radio station owner"},
#line 322 "frametype.gperf"
{"TLEN", FRAME(text), DISCARD, "Length"},
#line 358 "frametype.gperf"
{"WPUB", FRAME(url), PRESERVE, "Publishers official webpage"},
#line 343 "frametype.gperf"
{"TSOT", FRAME(text), PRESERVE, "Title sort order"},
#line 327 "frametype.gperf"
{"TOFN", FRAME(text), PRESERVE, "Original filename"},
#line 344 "frametype.gperf"
{"TSRC", FRAME(text), PRESERVE, "ISRC (international standard recording code)"},
#line 324 "frametype.gperf"
{"TMED", FRAME(text), PRESERVE, "Media type"},
#line 297 "frametype.gperf"
{"RVRB", FRAME(RVRB), PRESERVE, "Reverb"},
#line 328 "frametype.gperf"
{"TOLY", FRAME(text), PRESERVE, "Original lyricist(s)/text writer(s)"},
#line 329 "frametype.gperf"
{"TOPE", FRAME(text), PRESERVE, "Original artist(s)/performer(s)"},
#line 336 "frametype.gperf"
{"TPRO", FRAME(text), PRESERVE, "Produced notice"},
#line 337 "frametype.gperf"
{"TPUB", FRAME(text), PRESERVE, "Publisher"},
#line 357 "frametype.gperf"
{"WPAY", FRAME(url), PRESERVE, "Payment"},
#line 335 "frametype.gperf"
{"TPOS", FRAME(text), PRESERVE, "Part of a set"}, {"TPOS", FRAME(text), PRESERVE, "Part of a set"},
#line 356 "frametype.gperf" {"TSOP", FRAME(text), PRESERVE, "Performer sort order"},
{"WORS", FRAME(url), PRESERVE, "Official Internet radio station homepage"}, {"TDOR", FRAME(text), PRESERVE, "Original release time"},
#line 325 "frametype.gperf"
{"TMOO", FRAME(text), PRESERVE, "Mood"},
#line 338 "frametype.gperf"
{"TRCK", FRAME(text), PRESERVE, "Track number/position in set"},
#line 320 "frametype.gperf"
{"TKEY", FRAME(text), PRESERVE, "Initial key"},
#line 308 "frametype.gperf"
{"TDLY", FRAME(text), PRESERVE, "Playlist delay"},
#line 296 "frametype.gperf"
{"RVA2", FRAME(RVA2), DISCARD, "Relative volume adjustment (2)"},
#line 310 "frametype.gperf"
{"TDRC", FRAME(text), PRESERVE, "Recording time"}, {"TDRC", FRAME(text), PRESERVE, "Recording time"},
#line 350 "frametype.gperf" {"WORS", FRAME(url), PRESERVE, "Official Internet radio station homepage"},
{"USLT", FRAME(USLT), PRESERVE, "Unsynchronised lyric/text transcription"}, {"USLT", FRAME(USLT), PRESERVE, "Unsynchronised lyric/text transcription"},
#line 353 "frametype.gperf" {"TRCK", FRAME(text), PRESERVE, "Track number/position in set"},
{"WOAF", FRAME(url), PRESERVE, "Official audio file webpage"}, {"TPRO", FRAME(text), PRESERVE, "Produced notice"},
#line 312 "frametype.gperf" {"TDRL", FRAME(text), PRESERVE, "Release time"},
{"TDTG", FRAME(text), PRESERVE, "Tagging time"}, {"POSS", FRAME(POSS), DISCARD, "Position synchronisation frame"},
#line 299 "frametype.gperf" {"PCNT", FRAME(PCNT), PRESERVE, "Play counter"},
{"LINK", FRAME(LINK), PRESERVE, "Linked information"},
{"TMED", FRAME(text), PRESERVE, "Media type"},
{"TEXT", FRAME(text), PRESERVE, "Lyricist/text writer"},
{"TOPE", FRAME(text), PRESERVE, "Original artist(s)/performer(s)"},
{"AENC", FRAME(AENC), DISCARD, "Audio encryption"},
{"SIGN", FRAME(SIGN), PRESERVE, "Signature frame"}, {"SIGN", FRAME(SIGN), PRESERVE, "Signature frame"},
#line 355 "frametype.gperf" {"TPE3", FRAME(text), PRESERVE, "Conductor/performer refinement"},
{"WOAS", FRAME(url), PRESERVE, "Official audio source webpage"}, {"WOAS", FRAME(url), PRESERVE, "Official audio source webpage"},
#line 331 "frametype.gperf"
{"TPE1", FRAME(text), PRESERVE, "Lead performer(s)/soloist(s)"},
#line 302 "frametype.gperf"
{"TALB", FRAME(text), PRESERVE, "Album/movie/show title"}, {"TALB", FRAME(text), PRESERVE, "Album/movie/show title"},
#line 341 "frametype.gperf" {"OWNE", FRAME(OWNE), PRESERVE, "Ownership frame"},
{"TSOA", FRAME(text), PRESERVE, "Album sort order"}, {"APIC", FRAME(APIC), PRESERVE, "Attached picture"},
#line 321 "frametype.gperf" {"WOAR", FRAME(url), PRESERVE, "Official artist/performer webpage"},
{"TLAN", FRAME(text), PRESERVE, "Language(s)"}, {"WOAF", FRAME(url), PRESERVE, "Official audio file webpage"},
#line 333 "frametype.gperf" {"TDEN", FRAME(text), PRESERVE, "Encoding time"},
{"TPE3", FRAME(text), PRESERVE, "Conductor/performer refinement"}, {"ASPI", FRAME(ASPI), DISCARD, "Audio seek point index"},
#line 352 "frametype.gperf"
{"WCOP", FRAME(url), PRESERVE, "Copyright/legal information"}, {"WCOP", FRAME(url), PRESERVE, "Copyright/legal information"},
#line 334 "frametype.gperf" {"TDLY", FRAME(text), PRESERVE, "Playlist delay"},
{"TPE4", FRAME(text), PRESERVE, "Interpreted, remixed, or otherwise modified by"},
#line 323 "frametype.gperf"
{"TMCL", FRAME(text), PRESERVE, "Musician credits list"},
#line 303 "frametype.gperf"
{"TBPM", FRAME(text), PRESERVE, "BPM (beats per minute)"}, {"TBPM", FRAME(text), PRESERVE, "BPM (beats per minute)"},
#line 311 "frametype.gperf" {"USER", FRAME(USER), PRESERVE, "Terms of use"},
{"TDRL", FRAME(text), PRESERVE, "Release time"}, {"TDTG", FRAME(text), PRESERVE, "Tagging time"},
#line 326 "frametype.gperf" {"POPM", FRAME(POPM), PRESERVE, "Popularimeter"},
{"TOAL", FRAME(text), PRESERVE, "Original album/movie/show title"},
#line 342 "frametype.gperf"
{"TSOP", FRAME(text), PRESERVE, "Performer sort order"},
#line 363 "frametype.gperf"
{"ZOBS", FRAME(ZOBS), OBSOLETE, "Obsolete frame"}, {"ZOBS", FRAME(ZOBS), OBSOLETE, "Obsolete frame"},
#line 283 "frametype.gperf"
{"EQU2", FRAME(EQU2), DISCARD, "Equalisation (2)"}, {"EQU2", FRAME(EQU2), DISCARD, "Equalisation (2)"},
#line 306 "frametype.gperf" {"TPE2", FRAME(text), PRESERVE, "Band/orchestra/accompaniment"},
{"TCOP", FRAME(text), PRESERVE, "Copyright message"}, {"SEEK", FRAME(SEEK), DISCARD, "Seek frame"},
#line 287 "frametype.gperf" {"TPE1", FRAME(text), PRESERVE, "Lead performer(s)/soloist(s)"},
{"LINK", FRAME(LINK), PRESERVE, "Linked information"}, {"UFID", FRAME(UFID), PRESERVE, "Unique file identifier"},
#line 286 "frametype.gperf"
{"GRID", FRAME(GRID), PRESERVE, "Group identification registration"}, {"GRID", FRAME(GRID), PRESERVE, "Group identification registration"},
#line 294 "frametype.gperf" {"TKEY", FRAME(text), PRESERVE, "Initial key"},
{"PRIV", FRAME(PRIV), PRESERVE, "Private frame"}, {"PRIV", FRAME(PRIV), PRESERVE, "Private frame"},
#line 315 "frametype.gperf" {"TPE4", FRAME(text), PRESERVE, "Interpreted, remixed, or otherwise modified by"},
{"TFLT", FRAME(text), PRESERVE, "File type"}, {"GEOB", FRAME(GEOB), PRESERVE, "General encapsulated object"},
#line 289 "frametype.gperf"
{"MLLT", FRAME(MLLT), DISCARD, "MPEG location lookup table"},
#line 314 "frametype.gperf"
{"TEXT", FRAME(text), PRESERVE, "Lyricist/text writer"},
#line 348 "frametype.gperf"
{"UFID", FRAME(UFID), PRESERVE, "Unique file identifier"},
#line 278 "frametype.gperf"
{"APIC", FRAME(APIC), PRESERVE, "Attached picture"},
#line 279 "frametype.gperf"
{"ASPI", FRAME(ASPI), DISCARD, "Audio seek point index"},
#line 318 "frametype.gperf"
{"TIT2", FRAME(text), PRESERVE, "Title/songname/content description"},
#line 359 "frametype.gperf"
{"WXXX", FRAME(WXXX), PRESERVE, "User defined URL link frame"},
#line 288 "frametype.gperf"
{"MCDI", FRAME(MCDI), PRESERVE, "Music CD identifier"},
#line 316 "frametype.gperf"
{"TIPL", FRAME(text), PRESERVE, "Involved people list"},
#line 347 "frametype.gperf"
{"TXXX", FRAME(TXXX), PRESERVE, "User defined text information frame"},
#line 295 "frametype.gperf"
{"RBUF", FRAME(RBUF), PRESERVE, "Recommended buffer size"}, {"RBUF", FRAME(RBUF), PRESERVE, "Recommended buffer size"},
#line 317 "frametype.gperf" {"RVRB", FRAME(RVRB), PRESERVE, "Reverb"},
{"TIT1", FRAME(text), PRESERVE, "Content group description"}, {"RVA2", FRAME(RVA2), DISCARD, "Relative volume adjustment (2)"},
#line 319 "frametype.gperf" {"TPUB", FRAME(text), PRESERVE, "Publisher"},
{"TIT3", FRAME(text), PRESERVE, "Subtitle/description refinement"} {"TXXX", FRAME(TXXX), PRESERVE, "User defined text information frame"},
{"WPAY", FRAME(url), PRESERVE, "Payment"},
{"WPUB", FRAME(url), PRESERVE, "Publishers official webpage"},
{"WXXX", FRAME(WXXX), PRESERVE, "User defined URL link frame"}
}; };
static const short lookup[] = static const short lookup[] =
{ {
-1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, 0, -92, 3, -1, 4, 5, 6, -83,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, -2, 7, 8, 9, 10, 11, 12, -1,
2, 3, -1, 4, -1, -1, -1, -1, 5, 6, 7, 8, -1, 9, 13, -1, 14, 15, 16, -1, 17, 18,
10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 19, -183, 22, 23, 24, 25, 26, 27,
24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, -179, 30, -177, -175, 35, -173, -168, 41,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 42, 43, 44, 45, 46, -166, 49, 50,
52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, -164, 53, 54, 55, 56, 57, 58, -162,
66, 67, 68, 69, -1, 70, 71, -1, 72, 73, 74, -1, 75, -1, 61, 62, -1, 63, 64, 65, 66, 67,
76, -1, -1, -1, 77, 78, -1, -1, 79, -1, -1, -1, -1, 80, 68, 69, 70, 71, 72, 73, 74, -1,
81, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -159, 77, -9, -2, 78, -25, -2, -33,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, -2, -37, -2, -45, -2, 79, -1, 80,
-1, 83 -48, -3, -51, -2, -53, -2, -56, -2,
-1, 81, -64, -2, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 82, -1, 83
}; };
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
...@@ -562,6 +465,21 @@ id3_frametype_lookup (str, len) ...@@ -562,6 +465,21 @@ id3_frametype_lookup (str, len)
if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0') if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
return &wordlist[index]; return &wordlist[index];
} }
else if (index < -TOTAL_KEYWORDS)
{
register int offset = - 1 - TOTAL_KEYWORDS - index;
register const struct id3_frametype *wordptr = &wordlist[TOTAL_KEYWORDS + lookup[offset]];
register const struct id3_frametype *wordendptr = wordptr + -lookup[offset + 1];
while (wordptr < wordendptr)
{
register const char *s = wordptr->id;
if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
return wordptr;
wordptr++;
}
}
} }
} }
return 0; return 0;
......
libid3tag/frametype.gperf
View file @ d94eaf58
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: frametype.gperf,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: frametype.gperf,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libid3tag/frametype.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: frametype.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: frametype.h,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifndef LIBID3TAG_FRAMETYPE_H # ifndef LIBID3TAG_FRAMETYPE_H
......
libid3tag/genre.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: genre.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: genre.c,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libid3tag/genre.dat
View file @ d94eaf58
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* Id: genre.dat.in,v 1.1.1.1 2003/07/15 15:51:33 shank Exp * Id: genre.dat.in,v 1.2 2003/07/05 05:18:51 shank Exp
*/ */
/* /*
......
libid3tag/genre.dat.in
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: genre.dat.in,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: genre.dat.in,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
/* /*
......
libid3tag/genre.dat.sed
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# $Id: genre.dat.sed,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ # $Id: genre.dat.sed,v 1.2 2003/07/05 05:18:51 shank Exp $
# #
1i\ 1i\
......
libid3tag/genre.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: genre.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: genre.h,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifndef LIBID3TAG_GENRE_H # ifndef LIBID3TAG_GENRE_H
......
libid3tag/global.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: global.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: global.h,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifndef LIBID3TAG_GLOBAL_H # ifndef LIBID3TAG_GLOBAL_H
......
libid3tag/id3tag.h
View file @ d94eaf58
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
* If you would like to negotiate alternate licensing terms, you may do * If you would like to negotiate alternate licensing terms, you may do
* so by contacting: Underbit Technologies, Inc. <info@underbit.com> * so by contacting: Underbit Technologies, Inc. <info@underbit.com>
* *
* $Id: id3tag.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: id3tag.h,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifndef LIBID3TAG_ID3TAG_H # ifndef LIBID3TAG_ID3TAG_H
......
libid3tag/latin1.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: latin1.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: latin1.c,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libid3tag/latin1.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: latin1.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: latin1.h,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifndef LIBID3TAG_LATIN1_H # ifndef LIBID3TAG_LATIN1_H
......
libid3tag/parse.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: parse.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: parse.c,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libid3tag/parse.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: parse.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: parse.h,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifndef LIBID3TAG_PARSE_H # ifndef LIBID3TAG_PARSE_H
......
libid3tag/render.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: render.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: render.c,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libid3tag/render.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: render.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: render.h,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifndef LIBID3TAG_RENDER_H # ifndef LIBID3TAG_RENDER_H
......
libid3tag/tag.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: tag.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: tag.c,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libid3tag/tag.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: tag.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: tag.h,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifndef LIBID3TAG_TAG_H # ifndef LIBID3TAG_TAG_H
......
libid3tag/ucs4.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: ucs4.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: ucs4.c,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libid3tag/ucs4.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: ucs4.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: ucs4.h,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifndef LIBID3TAG_UCS4_H # ifndef LIBID3TAG_UCS4_H
......
libid3tag/utf16.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: utf16.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: utf16.c,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libid3tag/utf16.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: utf16.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: utf16.h,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifndef LIBID3TAG_UTF16_H # ifndef LIBID3TAG_UTF16_H
......
libid3tag/utf8.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: utf8.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: utf8.c,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libid3tag/utf8.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: utf8.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: utf8.h,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifndef LIBID3TAG_UTF8_H # ifndef LIBID3TAG_UTF8_H
......
libid3tag/util.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: util.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: util.c,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libid3tag/util.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: util.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: util.h,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifndef LIBID3TAG_UTIL_H # ifndef LIBID3TAG_UTIL_H
......
libid3tag/version.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: version.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: version.c,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libid3tag/version.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: version.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: version.h,v 1.2 2003/07/05 05:18:51 shank Exp $
*/ */
# ifndef LIBID3TAG_VERSION_H # ifndef LIBID3TAG_VERSION_H
......
libmad/CHANGES
View file @ d94eaf58
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
libmad - MPEG audio decoder library libmad - MPEG audio decoder library
Copyright (C) 2000-2003 Underbit Technologies, Inc. Copyright (C) 2000-2003 Underbit Technologies, Inc.
$Id: CHANGES,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ $Id: CHANGES,v 1.1 2003/07/05 06:20:49 shank Exp $
=============================================================================== ===============================================================================
......
libmad/CREDITS
View file @ d94eaf58
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
libmad - MPEG audio decoder library libmad - MPEG audio decoder library
Copyright (C) 2000-2003 Underbit Technologies, Inc. Copyright (C) 2000-2003 Underbit Technologies, Inc.
$Id: CREDITS,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ $Id: CREDITS,v 1.1 2003/07/05 06:20:50 shank Exp $
=============================================================================== ===============================================================================
......
libmad/D.dat
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: D.dat,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: D.dat,v 1.2 2003/07/05 06:20:50 shank Exp $
*/ */
/* /*
......
libmad/Makefile.am
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
## along with this program; if not, write to the Free Software ## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
## ##
## $Id: Makefile.am,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ ## $Id: Makefile.am,v 1.3 2003/07/05 06:20:50 shank Exp $
## ##
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
......
libmad/Makefile.in
View file @ d94eaf58
# Makefile.in generated by automake 1.6.3 from Makefile.am. # Makefile.in generated by automake 1.7.2 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
...@@ -13,82 +13,115 @@ ...@@ -13,82 +13,115 @@
# PARTICULAR PURPOSE. # PARTICULAR PURPOSE.
@SET_MAKE@ @SET_MAKE@
SHELL = @SHELL@
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = . top_builddir = .
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644 install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA) INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@ transform = $(program_transform_name)
NORMAL_INSTALL = : NORMAL_INSTALL = :
PRE_INSTALL = : PRE_INSTALL = :
POST_INSTALL = : POST_INSTALL = :
NORMAL_UNINSTALL = : NORMAL_UNINSTALL = :
PRE_UNINSTALL = : PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@ host_triplet = @host@
ACLOCAL = @ACLOCAL@
EXEEXT = @EXEEXT@ AMDEP_FALSE = @AMDEP_FALSE@
OBJEXT = @OBJEXT@ AMDEP_TRUE = @AMDEP_TRUE@
PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AS = @AS@
ASO = @ASO@ ASO = @ASO@
ASO_OBJS = @ASO_OBJS@ ASO_OBJS = @ASO_OBJS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
CC = @CC@ CC = @CC@
CCAS = @CCAS@ CCAS = @CCAS@
CCASFLAGS = @CCASFLAGS@ CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@ ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FPM = @FPM@ FPM = @FPM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
LN_S = @LN_S@ LN_S = @LN_S@
OBJDUMP = @OBJDUMP@ LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@ am__include = @am__include@
am__quote = @am__quote@ am__quote = @am__quote@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@ install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
SUBDIRS = SUBDIRS =
...@@ -159,11 +192,7 @@ minimad_OBJECTS = $(am_minimad_OBJECTS) ...@@ -159,11 +192,7 @@ minimad_OBJECTS = $(am_minimad_OBJECTS)
minimad_DEPENDENCIES = libmad.la minimad_DEPENDENCIES = libmad.la
minimad_LDFLAGS = minimad_LDFLAGS =
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I. DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/../depcomp depcomp = $(SHELL) $(top_srcdir)/../depcomp
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles
@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bit.Plo ./$(DEPDIR)/decoder.Plo \ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bit.Plo ./$(DEPDIR)/decoder.Plo \
...@@ -182,16 +211,16 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ...@@ -182,16 +211,16 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
CCLD = $(CC) CCLD = $(CC)
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@ $(AM_LDFLAGS) $(LDFLAGS) -o $@
CFLAGS = @CFLAGS@
DIST_SOURCES = $(libmad_la_SOURCES) $(EXTRA_libmad_la_SOURCES) \ DIST_SOURCES = $(libmad_la_SOURCES) $(EXTRA_libmad_la_SOURCES) \
$(minimad_SOURCES) $(minimad_SOURCES)
HEADERS = $(noinst_HEADERS) HEADERS = $(noinst_HEADERS)
RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
uninstall-info-recursive all-recursive install-data-recursive \ ps-recursive install-info-recursive uninstall-info-recursive \
install-exec-recursive installdirs-recursive install-recursive \ all-recursive install-data-recursive install-exec-recursive \
uninstall-recursive check-recursive installcheck-recursive installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive
DIST_COMMON = README $(noinst_HEADERS) ../config.guess ../config.sub \ DIST_COMMON = README $(noinst_HEADERS) ../config.guess ../config.sub \
../depcomp ../install-sh ../ltmain.sh ../missing \ ../depcomp ../install-sh ../ltmain.sh ../missing \
../mkinstalldirs COPYING INSTALL Makefile.am Makefile.in TODO \ ../mkinstalldirs COPYING INSTALL Makefile.am Makefile.in TODO \
...@@ -244,7 +273,7 @@ clean-noinstLTLIBRARIES: ...@@ -244,7 +273,7 @@ clean-noinstLTLIBRARIES:
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test -z "$dir" && dir=.; \ test "$$dir" = "$$p" && dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \ echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \ rm -f "$${dir}/so_locations"; \
done done
...@@ -280,29 +309,43 @@ distclean-depend: ...@@ -280,29 +309,43 @@ distclean-depend:
$(CCASCOMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< $(CCASCOMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
.S.obj: .S.obj:
$(CCASCOMPILE) -c `cygpath -w $<` $(CCASCOMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
.S.lo: .S.lo:
$(LTCCASCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< $(LTCCASCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
.c.o: .c.o:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
.c.obj: .c.obj:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
$(COMPILE) -c `cygpath -w $<` @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
.c.lo: .c.lo:
@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
CCDEPMODE = @CCDEPMODE@ @am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
mostlyclean-libtool: mostlyclean-libtool:
-rm -f *.lo -rm -f *.lo
...@@ -368,10 +411,17 @@ tags-recursive: ...@@ -368,10 +411,17 @@ tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \ list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ETAGS = etags ETAGS = etags
ETAGSFLAGS = ETAGSFLAGS =
CTAGS = ctags
CTAGSFLAGS =
tags: TAGS tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
...@@ -402,13 +452,28 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ ...@@ -402,13 +452,28 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique $$tags $$unique
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
GTAGS: GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \ here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \ && cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here && gtags -i $(GTAGS_ARGS) $$here
distclean-tags: distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = . top_distdir = .
...@@ -420,13 +485,20 @@ am__remove_distdir = \ ...@@ -420,13 +485,20 @@ am__remove_distdir = \
&& rm -fr $(distdir); }; } && rm -fr $(distdir); }; }
GZIP_ENV = --best GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print
distdir: $(DISTFILES) distdir: $(DISTFILES)
$(am__remove_distdir) $(am__remove_distdir)
mkdir $(distdir) mkdir $(distdir)
$(mkinstalldirs) $(distdir)/. $(distdir)/.. $(mkinstalldirs) $(distdir)/. $(distdir)/..
@list='$(DISTFILES)'; for file in $$list; do \ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
...@@ -483,8 +555,9 @@ distcheck: dist ...@@ -483,8 +555,9 @@ distcheck: dist
mkdir $(distdir)/=inst mkdir $(distdir)/=inst
chmod a-w $(distdir) chmod a-w $(distdir)
dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& cd $(distdir)/=build \ && cd $(distdir)/=build \
&& ../configure --srcdir=.. --prefix=$$dc_install_base \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) dvi \
...@@ -492,27 +565,44 @@ distcheck: dist ...@@ -492,27 +565,44 @@ distcheck: dist
&& $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
&& $(MAKE) $(AM_MAKEFLAGS) uninstall \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \
&& (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
|| { echo "ERROR: files left after uninstall:" ; \ distuninstallcheck \
find $$dc_install_base -type f -print ; \ && chmod -R a-w "$$dc_install_base" \
exit 1; } >&2 ) \ && ({ \
(cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
} || { rm -rf "$$dc_destdir"; exit 1; }) \
&& rm -rf "$$dc_destdir" \
&& $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
&& rm -f $(distdir).tar.gz \ && rm -f $(distdir).tar.gz \
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
$(am__remove_distdir) $(am__remove_distdir)
@echo "$(distdir).tar.gz is ready for distribution" | \ @echo "$(distdir).tar.gz is ready for distribution" | \
sed 'h;s/./=/g;p;x;p;x' sed 'h;s/./=/g;p;x;p;x'
distuninstallcheck:
cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
echo " (check DESTDIR support)"; \
fi ; \
$(distuninstallcheck_listfiles) ; \
exit 1; } >&2
distcleancheck: distclean distcleancheck: distclean
if test '$(srcdir)' = . ; then \ if test '$(srcdir)' = . ; then \
echo "ERROR: distcleancheck can only run from a VPATH build" ; \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
exit 1 ; \ exit 1 ; \
fi fi
test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left after distclean:" ; \ || { echo "ERROR: files left in build directory after distclean:" ; \
$(distcleancheck_listfiles) ; \ $(distcleancheck_listfiles) ; \
exit 1; } >&2 exit 1; } >&2
check-am: all-am check-am: all-am
check: check-recursive check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-recursive
all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
installdirs: installdirs-recursive installdirs: installdirs-recursive
installdirs-am: installdirs-am:
...@@ -582,27 +672,36 @@ mostlyclean: mostlyclean-recursive ...@@ -582,27 +672,36 @@ mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool mostlyclean-libtool
pdf: pdf-recursive
pdf-am:
ps: ps-recursive
ps-am:
uninstall-am: uninstall-info-am uninstall-am: uninstall-info-am
uninstall-info: uninstall-info-recursive uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
clean-generic clean-libtool clean-noinstLTLIBRARIES \ clean-generic clean-libtool clean-noinstLTLIBRARIES \
clean-recursive dist dist-all dist-gzip distcheck distclean \ clean-recursive ctags ctags-recursive dist dist-all dist-gzip \
distclean-compile distclean-depend distclean-generic \ distcheck distclean distclean-compile distclean-depend \
distclean-hdr distclean-libtool distclean-recursive \ distclean-generic distclean-hdr distclean-libtool \
distclean-tags distcleancheck distdir dvi dvi-am dvi-recursive \ distclean-recursive distclean-tags distcleancheck distdir \
info info-am info-recursive install install-am install-data \ distuninstallcheck dvi dvi-am dvi-recursive info info-am \
install-data-am install-data-recursive install-exec \ info-recursive install install-am install-data install-data-am \
install-exec-am install-exec-recursive install-info \ install-data-recursive install-exec install-exec-am \
install-info-am install-info-recursive install-man \ install-exec-recursive install-info install-info-am \
install-recursive install-strip installcheck installcheck-am \ install-info-recursive install-man install-recursive \
installdirs installdirs-am installdirs-recursive \ install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic \ installdirs-am installdirs-recursive maintainer-clean \
maintainer-clean-recursive mostlyclean mostlyclean-compile \ maintainer-clean-generic maintainer-clean-recursive mostlyclean \
mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
tags tags-recursive uninstall uninstall-am uninstall-info-am \ mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
uninstall-info-recursive uninstall-recursive ps-recursive tags tags-recursive uninstall uninstall-am \
uninstall-info-am uninstall-info-recursive uninstall-recursive
mad.h: config.status config.h Makefile.am \ mad.h: config.status config.h Makefile.am \
......
libmad/README
View file @ d94eaf58
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
libmad - MPEG audio decoder library libmad - MPEG audio decoder library
Copyright (C) 2000-2003 Underbit Technologies, Inc. Copyright (C) 2000-2003 Underbit Technologies, Inc.
$Id: README,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ $Id: README,v 1.1 2003/07/05 06:20:50 shank Exp $
=============================================================================== ===============================================================================
......
libmad/TODO
View file @ d94eaf58
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
libmad - MPEG audio decoder library libmad - MPEG audio decoder library
Copyright (C) 2000-2003 Underbit Technologies, Inc. Copyright (C) 2000-2003 Underbit Technologies, Inc.
$Id: TODO,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ $Id: TODO,v 1.1 2003/07/05 06:20:50 shank Exp $
=============================================================================== ===============================================================================
......
libmad/aclocal.m4
View file @ d94eaf58
# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- # generated automatically by aclocal 1.7.2 -*- Autoconf -*-
# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
# CC etc. in the Makefile, will ask for an AC_PROG_CC use... # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
AC_PREREQ([2.52]) AC_PREREQ([2.54])
# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
# the ones we care about. # the ones we care about.
...@@ -69,6 +69,16 @@ if test "`cd $srcdir && pwd`" != "`pwd`" && ...@@ -69,6 +69,16 @@ if test "`cd $srcdir && pwd`" != "`pwd`" &&
AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi fi
# test whether we have cygpath
if test -z "$CYGPATH_W"; then
if (cygpath --version) >/dev/null 2>/dev/null; then
CYGPATH_W='cygpath -w'
else
CYGPATH_W=echo
fi
fi
AC_SUBST([CYGPATH_W])
# Define the identity of the package. # Define the identity of the package.
dnl Distinguish between old-style and new-style calls. dnl Distinguish between old-style and new-style calls.
m4_ifval([$2], m4_ifval([$2],
...@@ -100,17 +110,29 @@ AC_REQUIRE([AC_PROG_AWK])dnl ...@@ -100,17 +110,29 @@ AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl
_AM_IF_OPTION([no-dependencies],, _AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_][CC], [AC_PROVIDE_IFELSE([AC_PROG_CC],
[_AM_DEPENDENCIES(CC)], [_AM_DEPENDENCIES(CC)],
[define([AC_PROG_][CC], [define([AC_PROG_CC],
defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_][CXX], AC_PROVIDE_IFELSE([AC_PROG_CXX],
[_AM_DEPENDENCIES(CXX)], [_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_][CXX], [define([AC_PROG_CXX],
defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
]) ])
]) ])
# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
# that is generated. The stamp files are numbered to have different names.
# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
# loop where config.status creates the headers, so we can generate
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
# Copyright 2002 Free Software Foundation, Inc. # Copyright 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
...@@ -131,14 +153,14 @@ AC_PROVIDE_IFELSE([AC_PROG_][CXX], ...@@ -131,14 +153,14 @@ AC_PROVIDE_IFELSE([AC_PROG_][CXX],
# ---------------------------- # ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been # Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y. # generated from the m4 files accompanying Automake X.Y.
AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"]) AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
# AM_SET_CURRENT_AUTOMAKE_VERSION # AM_SET_CURRENT_AUTOMAKE_VERSION
# ------------------------------- # -------------------------------
# Call AM_AUTOMAKE_VERSION so it can be traced. # Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.6.3])]) [AM_AUTOMAKE_VERSION([1.7.2])])
# Helper functions for option handling. -*- Autoconf -*- # Helper functions for option handling. -*- Autoconf -*-
...@@ -518,7 +540,7 @@ AC_CACHE_CHECK([dependency style of $depcc], ...@@ -518,7 +540,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
if depmode=$depmode \ if depmode=$depmode \
source=conftest.c object=conftest.o \ source=conftest.c object=conftest.o \
depfile=conftest.Po tmpdepfile=conftest.TPo \ depfile=conftest.Po tmpdepfile=conftest.TPo \
$SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&
grep conftest.h conftest.Po > /dev/null 2>&1 && grep conftest.h conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
am_cv_$1_dependencies_compiler_type=$depmode am_cv_$1_dependencies_compiler_type=$depmode
...@@ -533,6 +555,9 @@ else ...@@ -533,6 +555,9 @@ else
fi fi
]) ])
AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
AM_CONDITIONAL([am__fastdep$1], [
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_$1_dependencies_compiler_type" = gcc3])
]) ])
...@@ -652,7 +677,9 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], ...@@ -652,7 +677,9 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
]) ])
# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*- # Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
...@@ -692,7 +719,7 @@ echo "include confinc" > confmf ...@@ -692,7 +719,7 @@ echo "include confinc" > confmf
# In particular we don't look at `^make:' because GNU make might # In particular we don't look at `^make:' because GNU make might
# be invoked under some other name (usually "gmake"), in which # be invoked under some other name (usually "gmake"), in which
# case it prints its new name instead of `make'. # case it prints its new name instead of `make'.
if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
am__include=include am__include=include
am__quote= am__quote=
_am_result=GNU _am_result=GNU
...@@ -752,7 +779,7 @@ else ...@@ -752,7 +779,7 @@ else
fi fi
AC_CONFIG_COMMANDS_PRE( AC_CONFIG_COMMANDS_PRE(
[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
AC_MSG_ERROR([conditional \"$1\" was never defined. AC_MSG_ERROR([conditional "$1" was never defined.
Usually this means the macro was only invoked conditionally.]) Usually this means the macro was only invoked conditionally.])
fi])]) fi])])
...@@ -779,60 +806,8 @@ AC_PREREQ([2.52]) ...@@ -779,60 +806,8 @@ AC_PREREQ([2.52])
# serial 6 # serial 6
# When config.status generates a header, we must update the stamp-h file. # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
# This file resides in the same directory as the config header AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# that is generated. We must strip everything past the first ":",
# and everything past the last "/".
# _AM_DIRNAME(PATH)
# -----------------
# Like AS_DIRNAME, only do it during macro expansion
AC_DEFUN([_AM_DIRNAME],
[m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
m4_if(regexp([$1], [^/.*]), -1,
[.],
patsubst([$1], [^\(/\).*], [\1])),
patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
])# _AM_DIRNAME
# The stamp files are numbered to have different names.
# We could number them on a directory basis, but that's additional
# complications, let's have a unique counter.
m4_define([_AM_STAMP_Count], [0])
# _AM_STAMP(HEADER)
# -----------------
# The name of the stamp file for HEADER.
AC_DEFUN([_AM_STAMP],
[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
[:.*])))/stamp-h[]_AM_STAMP_Count])
# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
# ------------------------------------------------------------
# We used to try to get a real timestamp in stamp-h. But the fear is that
# that will cause unnecessary cvs conflicts.
AC_DEFUN([_AM_CONFIG_HEADER],
[# Add the stamp file to the list of files AC keeps track of,
# along with our hook.
AC_CONFIG_HEADERS([$1],
[# update the timestamp
echo 'timestamp for $1' >"_AM_STAMP([$1])"
$2],
[$3])
])# _AM_CONFIG_HEADER
# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
# --------------------------------------------------------------
AC_DEFUN([AM_CONFIG_HEADER],
[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
])# AM_CONFIG_HEADER
# Figure out how to run the assembler. -*- Autoconf -*- # Figure out how to run the assembler. -*- Autoconf -*-
...@@ -870,6 +845,8 @@ AC_SUBST(CCASFLAGS)]) ...@@ -870,6 +845,8 @@ AC_SUBST(CCASFLAGS)])
# serial 46 AC_PROG_LIBTOOL # serial 46 AC_PROG_LIBTOOL
builtin([undefine],[symbols])
AC_DEFUN([AC_PROG_LIBTOOL], AC_DEFUN([AC_PROG_LIBTOOL],
[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
...@@ -895,8 +872,6 @@ AC_REQUIRE([AC_PROG_CC])dnl ...@@ -895,8 +872,6 @@ AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_PROG_LD])dnl AC_REQUIRE([AC_PROG_LD])dnl
AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
AC_REQUIRE([AC_PROG_NM])dnl AC_REQUIRE([AC_PROG_NM])dnl
AC_REQUIRE([LT_AC_PROG_SED])dnl
AC_REQUIRE([AC_PROG_LN_S])dnl AC_REQUIRE([AC_PROG_LN_S])dnl
AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
AC_REQUIRE([AC_OBJEXT])dnl AC_REQUIRE([AC_OBJEXT])dnl
...@@ -997,30 +972,9 @@ _LT_AC_LTCONFIG_HACK ...@@ -997,30 +972,9 @@ _LT_AC_LTCONFIG_HACK
]) ])
# AC_LIBTOOL_HEADER_ASSERT
# ------------------------
AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT],
[AC_CACHE_CHECK([whether $CC supports assert without backlinking],
[lt_cv_func_assert_works],
[case $host in
*-*-solaris*)
if test "$GCC" = yes && test "$with_gnu_ld" != yes; then
case `$CC --version 2>/dev/null` in
[[12]].*) lt_cv_func_assert_works=no ;;
*) lt_cv_func_assert_works=yes ;;
esac
fi
;;
esac])
if test "x$lt_cv_func_assert_works" = xyes; then
AC_CHECK_HEADERS(assert.h)
fi
])# AC_LIBTOOL_HEADER_ASSERT
# _LT_AC_CHECK_DLFCN # _LT_AC_CHECK_DLFCN
# -------------------- # --------------------
AC_DEFUN([_LT_AC_CHECK_DLFCN], AC_DEFUN(_LT_AC_CHECK_DLFCN,
[AC_CHECK_HEADERS(dlfcn.h) [AC_CHECK_HEADERS(dlfcn.h)
])# _LT_AC_CHECK_DLFCN ])# _LT_AC_CHECK_DLFCN
...@@ -1038,10 +992,10 @@ AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl ...@@ -1038,10 +992,10 @@ AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl
# [They come from Ultrix. What could be older than Ultrix?!! ;)] # [They come from Ultrix. What could be older than Ultrix?!! ;)]
# Character class describing NM global symbol codes. # Character class describing NM global symbol codes.
symcode='[[BCDEGRST]]' [symcode='[BCDEGRST]']
# Regexp to match symbols that can be accessed directly from C. # Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' [sympat='\([_A-Za-z][_A-Za-z0-9]*\)']
# Transform the above into a raw symbol and a C symbol. # Transform the above into a raw symbol and a C symbol.
symxfrm='\1 \2\3 \3' symxfrm='\1 \2\3 \3'
...@@ -1055,26 +1009,23 @@ lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\ ...@@ -1055,26 +1009,23 @@ lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\
# Define system-specific variables. # Define system-specific variables.
case $host_os in case $host_os in
aix*) aix*)
symcode='[[BCDT]]' [symcode='[BCDT]']
;; ;;
cygwin* | mingw* | pw32*) cygwin* | mingw* | pw32*)
symcode='[[ABCDGISTW]]' [symcode='[ABCDGISTW]']
;; ;;
hpux*) # Its linker distinguishes data from code symbols hpux*) # Its linker distinguishes data from code symbols
lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;; ;;
irix* | nonstopux*) irix*)
symcode='[[BCDEGRST]]' [symcode='[BCDEGRST]']
;;
osf*)
symcode='[[BCDEGQRST]]'
;; ;;
solaris* | sysv5*) solaris* | sysv5*)
symcode='[[BDT]]' [symcode='[BDT]']
;; ;;
sysv4) sysv4)
symcode='[[DFNSTU]]' [symcode='[DFNSTU]']
;; ;;
esac esac
...@@ -1088,14 +1039,14 @@ esac ...@@ -1088,14 +1039,14 @@ esac
# If we're using GNU nm, then use its standard symbol codes. # If we're using GNU nm, then use its standard symbol codes.
if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
symcode='[[ABCDGISTW]]' [symcode='[ABCDGISTW]']
fi fi
# Try without a prefix undercore, then with it. # Try without a prefix undercore, then with it.
for ac_symprfx in "" "_"; do for ac_symprfx in "" "_"; do
# Write the raw and C identifiers. # Write the raw and C identifiers.
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" [lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"]
# Check to see that the pipe works correctly. # Check to see that the pipe works correctly.
pipe_works=no pipe_works=no
...@@ -1148,7 +1099,7 @@ const struct { ...@@ -1148,7 +1099,7 @@ const struct {
const char *name; const char *name;
lt_ptr address; lt_ptr address;
} }
lt_preloaded_symbols[[]] = [lt_preloaded_symbols[] =]
{ {
EOF EOF
sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
...@@ -1166,7 +1117,7 @@ EOF ...@@ -1166,7 +1117,7 @@ EOF
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext" LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$no_builtin_flag" CFLAGS="$CFLAGS$no_builtin_flag"
if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then if AC_TRY_EVAL(ac_link) && test -s conftest; then
pipe_works=yes pipe_works=yes
fi fi
LIBS="$save_LIBS" LIBS="$save_LIBS"
...@@ -1221,14 +1172,13 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then ...@@ -1221,14 +1172,13 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then
*-DOS) lt_cv_sys_path_separator=';' ;; *-DOS) lt_cv_sys_path_separator=';' ;;
*) lt_cv_sys_path_separator=':' ;; *) lt_cv_sys_path_separator=':' ;;
esac esac
PATH_SEPARATOR=$lt_cv_sys_path_separator
fi fi
])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR ])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
# _LT_AC_PROG_ECHO_BACKSLASH # _LT_AC_PROG_ECHO_BACKSLASH
# -------------------------- # --------------------------
# Add some code to the start of the generated configure script which # Add some code to the start of the generated configure script which
# will find an echo command which doesn't interpret backslashes. # will find an echo command which doesn;t interpret backslashes.
AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], [ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
[AC_DIVERT_PUSH(NOTICE)]) [AC_DIVERT_PUSH(NOTICE)])
...@@ -1297,7 +1247,7 @@ else ...@@ -1297,7 +1247,7 @@ else
# #
# So, first we look for a working echo in the user's PATH. # So, first we look for a working echo in the user's PATH.
IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
for dir in $PATH /usr/ucb; do for dir in $PATH /usr/ucb; do
if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
...@@ -1386,7 +1336,7 @@ AC_DIVERT_POP ...@@ -1386,7 +1336,7 @@ AC_DIVERT_POP
# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
# ------------------------------------------------------------------ # ------------------------------------------------------------------
AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], AC_DEFUN(_LT_AC_TRY_DLOPEN_SELF,
[if test "$cross_compiling" = yes; then : [if test "$cross_compiling" = yes; then :
[$4] [$4]
else else
...@@ -1473,7 +1423,7 @@ rm -fr conftest* ...@@ -1473,7 +1423,7 @@ rm -fr conftest*
# AC_LIBTOOL_DLOPEN_SELF # AC_LIBTOOL_DLOPEN_SELF
# ------------------- # -------------------
AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF,
[if test "x$enable_dlopen" != xyes; then [if test "x$enable_dlopen" != xyes; then
enable_dlopen=unknown enable_dlopen=unknown
enable_dlopen_self=unknown enable_dlopen_self=unknown
...@@ -1573,10 +1523,10 @@ AC_DEFUN([_LT_AC_LTCONFIG_HACK], ...@@ -1573,10 +1523,10 @@ AC_DEFUN([_LT_AC_LTCONFIG_HACK],
# Sed substitution that helps us do robust quoting. It backslashifies # Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings. # metacharacters that are still active within double-quoted strings.
Xsed='sed -e s/^X//' Xsed='sed -e s/^X//'
sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g' [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references. # Same as above, but do not quote variable references.
double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g' [double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
# Sed substitution to delay expansion of an escaped shell variable in a # Sed substitution to delay expansion of an escaped shell variable in a
# double_quote_subst'ed string. # double_quote_subst'ed string.
...@@ -1710,7 +1660,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, ...@@ -1710,7 +1660,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
# like `-m68040'. # like `-m68040'.
lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
;; ;;
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes. # PIC is the default for these OSes.
;; ;;
darwin* | rhapsody*) darwin* | rhapsody*)
...@@ -1753,7 +1703,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, ...@@ -1753,7 +1703,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
lt_cv_prog_cc_pic='+Z' lt_cv_prog_cc_pic='+Z'
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_wl='-Wl,'
lt_cv_prog_cc_static='-non_shared' lt_cv_prog_cc_static='-non_shared'
# PIC (with -KPIC) is the default. # PIC (with -KPIC) is the default.
...@@ -1797,7 +1747,11 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, ...@@ -1797,7 +1747,11 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_pic='-KPIC'
lt_cv_prog_cc_static='-Bstatic' lt_cv_prog_cc_static='-Bstatic'
lt_cv_prog_cc_wl='-Wl,' if test "x$host_vendor" = xsni; then
lt_cv_prog_cc_wl='-LD'
else
lt_cv_prog_cc_wl='-Wl,'
fi
;; ;;
uts4*) uts4*)
...@@ -1863,7 +1817,7 @@ fi ...@@ -1863,7 +1817,7 @@ fi
# Check for any special shared library compilation flags. # Check for any special shared library compilation flags.
if test -n "$lt_cv_prog_cc_shlib"; then if test -n "$lt_cv_prog_cc_shlib"; then
AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries]) AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries])
if echo "$old_CC $old_CFLAGS " | egrep -e "[[ ]]$lt_cv_prog_cc_shlib[[ ]]" >/dev/null; then : if echo "$old_CC $old_CFLAGS " | [egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]"] >/dev/null; then :
else else
AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure]) AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure])
lt_cv_prog_cc_can_build_shared=no lt_cv_prog_cc_can_build_shared=no
...@@ -2144,7 +2098,7 @@ EOF ...@@ -2144,7 +2098,7 @@ EOF
# can override, but on older systems we have to supply one (in ltdll.c) # can override, but on older systems we have to supply one (in ltdll.c)
if test "x$lt_cv_need_dllmain" = "xyes"; then if test "x$lt_cv_need_dllmain" = "xyes"; then
ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~ ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~
test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
else else
ltdll_obj= ltdll_obj=
...@@ -2157,12 +2111,12 @@ EOF ...@@ -2157,12 +2111,12 @@ EOF
# Be careful not to strip the DATA tag left be newer dlltools. # Be careful not to strip the DATA tag left be newer dlltools.
export_symbols_cmds="$ltdll_cmds"' export_symbols_cmds="$ltdll_cmds"'
$DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols' [sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//"] < $output_objdir/$soname-def > $export_symbols'
# If the export-symbols file already is a .def file (1st line # If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is. # is EXPORTS), use it as is.
# If DATA tags from a recent dlltool are present, honour them! # If DATA tags from a recent dlltool are present, honour them!
archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
cp $export_symbols $output_objdir/$soname-def; cp $export_symbols $output_objdir/$soname-def;
else else
echo EXPORTS > $output_objdir/$soname-def; echo EXPORTS > $output_objdir/$soname-def;
...@@ -2171,7 +2125,6 @@ EOF ...@@ -2171,7 +2125,6 @@ EOF
set dummy \$symbol; set dummy \$symbol;
case \[$]# in case \[$]# in
2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
4) echo " \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
*) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
esac; esac;
_lt_hint=`expr 1 + \$_lt_hint`; _lt_hint=`expr 1 + \$_lt_hint`;
...@@ -2284,12 +2237,10 @@ else ...@@ -2284,12 +2237,10 @@ else
# need to do runtime linking. # need to do runtime linking.
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
for ld_flag in $LDFLAGS; do for ld_flag in $LDFLAGS; do
case $ld_flag in if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
*-brtl*)
aix_use_runtimelinking=yes aix_use_runtimelinking=yes
break break
;; fi
esac
done done
esac esac
...@@ -2361,7 +2312,7 @@ else ...@@ -2361,7 +2312,7 @@ else
allow_undefined_flag='${wl}-berok' allow_undefined_flag='${wl}-berok'
# This is a bit strange, but is similar to how AIX traditionally builds # This is a bit strange, but is similar to how AIX traditionally builds
# it's shared libraries. # it's shared libraries.
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname' archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
fi fi
fi fi
;; ;;
...@@ -2403,9 +2354,8 @@ else ...@@ -2403,9 +2354,8 @@ else
esac esac
# FIXME: Relying on posixy $() will cause problems for # FIXME: Relying on posixy $() will cause problems for
# cross-compilation, but unfortunately the echo tests do not # cross-compilation, but unfortunately the echo tests do not
# yet detect zsh echo's removal of \ escapes. Also zsh mangles # yet detect zsh echo's removal of \ escapes.
# `"' quotes if we put them in here... so don't! archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
# We need to add '_' to the symbols in $export_symbols first # We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes hardcode_direct=yes
...@@ -2457,14 +2407,13 @@ else ...@@ -2457,14 +2407,13 @@ else
export_dynamic_flag_spec='${wl}-E' export_dynamic_flag_spec='${wl}-E'
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
if test "$GCC" = yes; then if test "$GCC" = yes; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='-rpath $libdir'
fi fi
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=: hardcode_libdir_separator=:
link_all_deplibs=yes link_all_deplibs=yes
;; ;;
...@@ -2492,7 +2441,7 @@ else ...@@ -2492,7 +2441,7 @@ else
hardcode_direct=yes hardcode_direct=yes
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir' hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E' export_dynamic_flag_spec='${wl}-E'
else else
...@@ -2502,7 +2451,7 @@ else ...@@ -2502,7 +2451,7 @@ else
hardcode_libdir_flag_spec='-R$libdir' hardcode_libdir_flag_spec='-R$libdir'
;; ;;
*) *)
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir' hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;; ;;
esac esac
...@@ -2555,35 +2504,7 @@ else ...@@ -2555,35 +2504,7 @@ else
;; ;;
solaris*) solaris*)
# gcc --version < 3.0 without binutils cannot create self contained
# shared libraries reliably, requiring libgcc.a to resolve some of
# the object symbols generated in some cases. Libraries that use
# assert need libgcc.a to resolve __eprintf, for example. Linking
# a copy of libgcc.a into every shared library to guarantee resolving
# such symbols causes other problems: According to Tim Van Holder
# <tim.van.holder@pandora.be>, C++ libraries end up with a separate
# (to the application) exception stack for one thing.
no_undefined_flag=' -z defs' no_undefined_flag=' -z defs'
if test "$GCC" = yes; then
case `$CC --version 2>/dev/null` in
[[12]].*)
cat <<EOF 1>&2
*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
*** create self contained shared libraries on Solaris systems, without
*** introducing a dependency on libgcc.a. Therefore, libtool is disabling
*** -no-undefined support, which will at least allow you to build shared
*** libraries. However, you may find that when you link such libraries
*** into an application without using GCC, you have to manually add
*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to
*** upgrade to a newer version of GCC. Another option is to rebuild your
*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
EOF
no_undefined_flag=
;;
esac
fi
# $CC -shared without GNU ld will not create a library from C++ # $CC -shared without GNU ld will not create a library from C++
# object files and a static libstdc++, better avoid it by now # object files and a static libstdc++, better avoid it by now
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
...@@ -2592,7 +2513,7 @@ EOF ...@@ -2592,7 +2513,7 @@ EOF
hardcode_libdir_flag_spec='-R$libdir' hardcode_libdir_flag_spec='-R$libdir'
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
case $host_os in case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; [solaris2.[0-5] | solaris2.[0-5].*]) ;;
*) # Supported since Solaris 2.6 (maybe 2.5.1?) *) # Supported since Solaris 2.6 (maybe 2.5.1?)
whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
esac esac
...@@ -2614,23 +2535,13 @@ EOF ...@@ -2614,23 +2535,13 @@ EOF
;; ;;
sysv4) sysv4)
case $host_vendor in if test "x$host_vendor" = xsno; then
sni) archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes # is this really true???
hardcode_direct=yes # is this really true??? else
;; archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
siemens) hardcode_direct=no #Motorola manual says yes, but my tests say they lie
## LD is ld it makes a PLAMLIB fi
## CC just makes a GrossModule.
archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
reload_cmds='$CC -r -o $output$reload_objs'
hardcode_direct=no
;;
motorola)
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=no #Motorola manual says yes, but my tests say they lie
;;
esac
runpath_var='LD_RUN_PATH' runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
;; ;;
...@@ -2771,9 +2682,6 @@ aix3*) ...@@ -2771,9 +2682,6 @@ aix3*)
aix4* | aix5*) aix4* | aix5*)
version_type=linux version_type=linux
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
if test "$host_cpu" = ia64; then if test "$host_cpu" = ia64; then
# AIX 5 supports IA64 # AIX 5 supports IA64
library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
...@@ -2785,15 +2693,15 @@ aix4* | aix5*) ...@@ -2785,15 +2693,15 @@ aix4* | aix5*)
# depend on `.', always an invalid library. This was fixed in # depend on `.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0. # development snapshots of GCC prior to 3.0.
case $host_os in case $host_os in
aix4 | aix4.[[01]] | aix4.[[01]].*) [ aix4 | aix4.[01] | aix4.[01].*)]
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes ' echo ' yes '
echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
: :
else else
can_build_shared=no can_build_shared=no
fi fi
;; ;;
esac esac
# AIX (on Power*) has no versioning support, so currently we can # AIX (on Power*) has no versioning support, so currently we can
# not hardcode correct soname into executable. Probably we can # not hardcode correct soname into executable. Probably we can
...@@ -2812,13 +2720,12 @@ aix4* | aix5*) ...@@ -2812,13 +2720,12 @@ aix4* | aix5*)
fi fi
shlibpath_var=LIBPATH shlibpath_var=LIBPATH
fi fi
hardcode_into_libs=yes
;; ;;
amigaos*) amigaos*)
library_names_spec='$libname.ixlibrary $libname.a' library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs. # Create ${libname}_ixlibrary.a entries in /sys/libs.
finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | [$Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\'']`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
;; ;;
beos*) beos*)
...@@ -2849,7 +2756,7 @@ cygwin* | mingw* | pw32*) ...@@ -2849,7 +2756,7 @@ cygwin* | mingw* | pw32*)
case $GCC,$host_os in case $GCC,$host_os in
yes,cygwin*) yes,cygwin*)
library_names_spec='$libname.dll.a' library_names_spec='$libname.dll.a'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~ dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~ test -d \$dldir || mkdir -p \$dldir~
...@@ -2859,14 +2766,14 @@ cygwin* | mingw* | pw32*) ...@@ -2859,14 +2766,14 @@ cygwin* | mingw* | pw32*)
$rm \$dlpath' $rm \$dlpath'
;; ;;
yes,mingw*) yes,mingw*)
library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"` sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
;; ;;
yes,pw32*) yes,pw32*)
library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
;; ;;
*) *)
library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib' library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll $libname.lib'
;; ;;
esac esac
dynamic_linker='Win32 ld.exe' dynamic_linker='Win32 ld.exe'
...@@ -2892,18 +2799,6 @@ freebsd1*) ...@@ -2892,18 +2799,6 @@ freebsd1*)
dynamic_linker=no dynamic_linker=no
;; ;;
freebsd*-gnu*)
version_type=linux
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
soname_spec='${libname}${release}.so$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='GNU/FreeBSD ld.so'
;;
freebsd*) freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat version_type=freebsd-$objformat
...@@ -2955,17 +2850,14 @@ hpux9* | hpux10* | hpux11*) ...@@ -2955,17 +2850,14 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib' postinstall_cmds='chmod 555 $lib'
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
case $host_os in version_type=irix
nonstopux*) version_type=nonstopux ;;
*) version_type=irix ;;
esac
need_lib_prefix=no need_lib_prefix=no
need_version=no need_version=no
soname_spec='${libname}${release}.so$major' soname_spec='${libname}${release}.so$major'
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
case $host_os in case $host_os in
irix5* | nonstopux*) irix5*)
libsuff= shlibsuff= libsuff= shlibsuff=
;; ;;
*) *)
...@@ -3069,13 +2961,11 @@ os2*) ...@@ -3069,13 +2961,11 @@ os2*)
osf3* | osf4* | osf5*) osf3* | osf4* | osf5*)
version_type=osf version_type=osf
need_version=no need_version=no
need_lib_prefix=no soname_spec='${libname}${release}.so'
soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
hardcode_into_libs=yes
;; ;;
sco3.2v5*) sco3.2v5*)
...@@ -3118,12 +3008,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ...@@ -3118,12 +3008,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
case $host_vendor in case $host_vendor in
sni) sni)
shlibpath_overrides_runpath=no shlibpath_overrides_runpath=no
need_lib_prefix=no
export_dynamic_flag_spec='${wl}-Blargedynsym'
runpath_var=LD_RUN_PATH
;;
siemens)
need_lib_prefix=no
;; ;;
motorola) motorola)
need_lib_prefix=no need_lib_prefix=no
...@@ -3278,7 +3162,7 @@ if test -f "$ltmain"; then ...@@ -3278,7 +3162,7 @@ if test -f "$ltmain"; then
# Now quote all the things that may contain metacharacters while being # Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the # careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script. # variables and quote the copies for generation of the libtool script.
for var in echo old_CC old_CFLAGS SED \ for var in echo old_CC old_CFLAGS \
AR AR_FLAGS CC LD LN_S NM SHELL \ AR AR_FLAGS CC LD LN_S NM SHELL \
reload_flag reload_cmds wl \ reload_flag reload_cmds wl \
pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
...@@ -3340,11 +3224,8 @@ if test -f "$ltmain"; then ...@@ -3340,11 +3224,8 @@ if test -f "$ltmain"; then
# configuration script generated by Autoconf, you may include it under # configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program. # the same distribution terms that you use for the rest of that program.
# A sed that does not truncate output.
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n. # Sed that helps us avoid accidentally triggering echo(1) options like -n.
Xsed="${SED} -e s/^X//" Xsed="sed -e s/^X//"
# The HP-UX ksh and POSIX shell print the target directory to stdout # The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set. # if CDPATH is set.
...@@ -4013,7 +3894,6 @@ test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) ...@@ -4013,7 +3894,6 @@ test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl
AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
ac_prog=ld ac_prog=ld
if test "$GCC" = yes; then if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path. # Check if gcc -print-prog-name=ld gives a path.
...@@ -4027,8 +3907,8 @@ if test "$GCC" = yes; then ...@@ -4027,8 +3907,8 @@ if test "$GCC" = yes; then
esac esac
case $ac_prog in case $ac_prog in
# Accept absolute paths. # Accept absolute paths.
[[\\/]]* | [[A-Za-z]]:[[\\/]]*) [[\\/]* | [A-Za-z]:[\\/]*)]
re_direlt='/[[^/]][[^/]]*/\.\./' [re_direlt='/[^/][^/]*/\.\./']
# Canonicalize the path of ld # Canonicalize the path of ld
ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
...@@ -4052,7 +3932,7 @@ else ...@@ -4052,7 +3932,7 @@ else
fi fi
AC_CACHE_VAL(lt_cv_path_LD, AC_CACHE_VAL(lt_cv_path_LD,
[if test -z "$LD"; then [if test -z "$LD"; then
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
...@@ -4105,7 +3985,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag" ...@@ -4105,7 +3985,7 @@ test -n "$reload_flag" && reload_flag=" $reload_flag"
# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
# -- PORTME fill in with the dynamic library characteristics # -- PORTME fill in with the dynamic library characteristics
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
[AC_CACHE_CHECK([how to recognise dependent libraries], [AC_CACHE_CHECK([how to recognise dependant libraries],
lt_cv_deplibs_check_method, lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD' [lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file= lt_cv_file_magic_test_file=
...@@ -4116,7 +3996,7 @@ lt_cv_deplibs_check_method='unknown' ...@@ -4116,7 +3996,7 @@ lt_cv_deplibs_check_method='unknown'
# `unknown' -- same as none, but documents that we really don't know. # `unknown' -- same as none, but documents that we really don't know.
# 'pass_all' -- all dependencies passed with no checks. # 'pass_all' -- all dependencies passed with no checks.
# 'test_compile' -- check by making test program. # 'test_compile' -- check by making test program.
# 'file_magic [[regex]]' -- check by looking for files in library path # ['file_magic [regex]'] -- check by looking for files in library path
# which responds to the $file_magic_cmd with a given egrep regex. # which responds to the $file_magic_cmd with a given egrep regex.
# If you have `file' or equivalent on your system and you're not sure # If you have `file' or equivalent on your system and you're not sure
# whether `pass_all' will *always* work, you probably want this one. # whether `pass_all' will *always* work, you probably want this one.
...@@ -4131,7 +4011,7 @@ beos*) ...@@ -4131,7 +4011,7 @@ beos*)
;; ;;
bsdi4*) bsdi4*)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_cmd='/usr/bin/file -L'
lt_cv_file_magic_test_file=/shlib/libc.so lt_cv_file_magic_test_file=/shlib/libc.so
;; ;;
...@@ -4160,7 +4040,7 @@ freebsd*) ...@@ -4160,7 +4040,7 @@ freebsd*)
i*86 ) i*86 )
# Not sure whether the presence of OpenBSD here was a mistake. # Not sure whether the presence of OpenBSD here was a mistake.
# Let's accept both of them until this is cleared up. # Let's accept both of them until this is cleared up.
lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' [lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;; ;;
...@@ -4175,14 +4055,14 @@ gnu*) ...@@ -4175,14 +4055,14 @@ gnu*)
;; ;;
hpux10.20*|hpux11*) hpux10.20*|hpux11*)
lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=/usr/lib/libc.sl lt_cv_file_magic_test_file=/usr/lib/libc.sl
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
case $host_os in case $host_os in
irix5* | nonstopux*) irix5*)
# this will be overridden with pass_all, but let us keep it just in case # this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
;; ;;
...@@ -4194,7 +4074,7 @@ irix5* | irix6* | nonstopux*) ...@@ -4194,7 +4074,7 @@ irix5* | irix6* | nonstopux*)
*) libmagic=never-match;; *) libmagic=never-match;;
esac esac
# this will be overridden with pass_all, but let us keep it just in case # this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" [lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
;; ;;
esac esac
lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
...@@ -4204,25 +4084,25 @@ irix5* | irix6* | nonstopux*) ...@@ -4204,25 +4084,25 @@ irix5* | irix6* | nonstopux*)
# This must be Linux ELF. # This must be Linux ELF.
linux-gnu*) linux-gnu*)
case $host_cpu in case $host_cpu in
alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | arm* | m68k) alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
lt_cv_deplibs_check_method=pass_all ;; lt_cv_deplibs_check_method=pass_all ;;
*) *)
# glibc up to 2.1.1 does not perform some relocations on ARM # glibc up to 2.1.1 does not perform some relocations on ARM
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;]
esac esac
lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
;; ;;
netbsd*) netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$' [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
else else
lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$' [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
fi fi
;; ;;
newos6*) newos6*)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=/usr/lib/libnls.so lt_cv_file_magic_test_file=/usr/lib/libnls.so
;; ;;
...@@ -4253,14 +4133,14 @@ solaris*) ...@@ -4253,14 +4133,14 @@ solaris*)
lt_cv_file_magic_test_file=/lib/libc.so lt_cv_file_magic_test_file=/lib/libc.so
;; ;;
sysv5uw[[78]]* | sysv4*uw2*) [sysv5uw[78]* | sysv4*uw2*)]
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
case $host_vendor in case $host_vendor in
motorola) motorola)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
;; ;;
ncr) ncr)
...@@ -4268,16 +4148,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ...@@ -4268,16 +4148,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
;; ;;
sequent) sequent)
lt_cv_file_magic_cmd='/bin/file' lt_cv_file_magic_cmd='/bin/file'
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )']
;; ;;
sni) sni)
lt_cv_file_magic_cmd='/bin/file' lt_cv_file_magic_cmd='/bin/file'
lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" [lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"]
lt_cv_file_magic_test_file=/lib/libc.so lt_cv_file_magic_test_file=/lib/libc.so
;; ;;
siemens)
lt_cv_deplibs_check_method=pass_all
;;
esac esac
;; ;;
esac esac
...@@ -4289,14 +4166,13 @@ deplibs_check_method=$lt_cv_deplibs_check_method ...@@ -4289,14 +4166,13 @@ deplibs_check_method=$lt_cv_deplibs_check_method
# AC_PROG_NM - find the path to a BSD-compatible name lister # AC_PROG_NM - find the path to a BSD-compatible name lister
AC_DEFUN([AC_PROG_NM], AC_DEFUN([AC_PROG_NM],
[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl [AC_MSG_CHECKING([for BSD-compatible nm])
AC_MSG_CHECKING([for BSD-compatible nm])
AC_CACHE_VAL(lt_cv_path_NM, AC_CACHE_VAL(lt_cv_path_NM,
[if test -n "$NM"; then [if test -n "$NM"; then
# Let the user override the test. # Let the user override the test.
lt_cv_path_NM="$NM" lt_cv_path_NM="$NM"
else else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
tmp_nm=$ac_dir/${ac_tool_prefix}nm tmp_nm=$ac_dir/${ac_tool_prefix}nm
...@@ -4343,12 +4219,12 @@ esac ...@@ -4343,12 +4219,12 @@ esac
]) ])
# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
# the libltdl convenience library and LTDLINCL to the include flags for # the libltdl convenience library and INCLTDL to the include flags for
# the libltdl header and adds --enable-ltdl-convenience to the # the libltdl header and adds --enable-ltdl-convenience to the
# configure arguments. Note that LIBLTDL and LTDLINCL are not # configure arguments. Note that LIBLTDL and INCLTDL are not
# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not # AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not
# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed # provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed
# with '${top_builddir}/' and LTDLINCL will be prefixed with # with '${top_builddir}/' and INCLTDL will be prefixed with
# '${top_srcdir}/' (note the single quotes!). If your package is not # '${top_srcdir}/' (note the single quotes!). If your package is not
# flat and you're not using automake, define top_builddir and # flat and you're not using automake, define top_builddir and
# top_srcdir appropriately in the Makefiles. # top_srcdir appropriately in the Makefiles.
...@@ -4360,18 +4236,16 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE], ...@@ -4360,18 +4236,16 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
esac esac
LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
# For backwards non-gettext consistent compatibility...
INCLTDL="$LTDLINCL"
]) ])
# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
# the libltdl installable library and LTDLINCL to the include flags for # the libltdl installable library and INCLTDL to the include flags for
# the libltdl header and adds --enable-ltdl-install to the configure # the libltdl header and adds --enable-ltdl-install to the configure
# arguments. Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is # arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed # AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed
# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will # libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will
# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed # be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
# with '${top_srcdir}/' (note the single quotes!). If your package is # with '${top_srcdir}/' (note the single quotes!). If your package is
# not flat and you're not using automake, define top_builddir and # not flat and you're not using automake, define top_builddir and
# top_srcdir appropriately in the Makefiles. # top_srcdir appropriately in the Makefiles.
...@@ -4389,14 +4263,12 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE], ...@@ -4389,14 +4263,12 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
if test x"$enable_ltdl_install" = x"yes"; then if test x"$enable_ltdl_install" = x"yes"; then
ac_configure_args="$ac_configure_args --enable-ltdl-install" ac_configure_args="$ac_configure_args --enable-ltdl-install"
LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
else else
ac_configure_args="$ac_configure_args --enable-ltdl-install=no" ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
LIBLTDL="-lltdl" LIBLTDL="-lltdl"
LTDLINCL= INCLTDL=
fi fi
# For backwards non-gettext consistent compatibility...
INCLTDL="$LTDLINCL"
]) ])
# old names # old names
...@@ -4411,92 +4283,3 @@ AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) ...@@ -4411,92 +4283,3 @@ AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
# This is just to silence aclocal about the macro not being used # This is just to silence aclocal about the macro not being used
ifelse([AC_DISABLE_FAST_INSTALL]) ifelse([AC_DISABLE_FAST_INSTALL])
# NOTE: This macro has been submitted for inclusion into #
# GNU Autoconf as AC_PROG_SED. When it is available in #
# a released version of Autoconf we should remove this #
# macro and use it instead. #
# LT_AC_PROG_SED
# --------------
# Check for a fully-functional sed program, that truncates
# as few characters as possible. Prefer GNU sed if found.
AC_DEFUN([LT_AC_PROG_SED],
[AC_MSG_CHECKING([for a sed that does not truncate output])
AC_CACHE_VAL(lt_cv_path_SED,
[# Loop through the user's path and test for sed and gsed.
# Then use that list of sed's as ones to test for truncation.
as_executable_p="test -f"
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
_sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
fi
done
done
done
# Create a temporary directory, and hook for its removal unless debugging.
$debug ||
{
trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
trap '{ (exit 1); exit 1; }' 1 2 13 15
}
# Create a (secure) tmp directory for tmp files.
: ${TMPDIR=/tmp}
{
tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
test -n "$tmp" && test -d "$tmp"
} ||
{
tmp=$TMPDIR/sed$$-$RANDOM
(umask 077 && mkdir $tmp)
} ||
{
echo "$me: cannot create a temporary directory in $TMPDIR" >&2
{ (exit 1); exit 1; }
}
_max=0
_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for _sed in $_sed_list /usr/xpg4/bin/sed; do
test ! -f ${_sed} && break
cat /dev/null > "$tmp/sed.in"
_count=0
echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
# Check for GNU sed and select it if it is found.
if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
lt_cv_path_SED=${_sed}
break
fi
while true; do
cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
mv "$tmp/sed.tmp" "$tmp/sed.in"
cp "$tmp/sed.in" "$tmp/sed.nl"
echo >>"$tmp/sed.nl"
${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
# 40000 chars as input seems more than enough
test $_count -gt 10 && break
_count=`expr $_count + 1`
if test $_count -gt $_max; then
_max=$_count
lt_cv_path_SED=$_sed
fi
done
done
rm -rf "$tmp"
])
if test "X$SED" != "X"; then
lt_cv_path_SED=$SED
else
SED=$lt_cv_path_SED
fi
AC_MSG_RESULT([$SED])
])
libmad/bit.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: bit.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: bit.c,v 1.2 2003/07/05 06:20:50 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libmad/bit.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: bit.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: bit.h,v 1.2 2003/07/05 06:20:50 shank Exp $
*/ */
# ifndef LIBMAD_BIT_H # ifndef LIBMAD_BIT_H
......
libmad/configure
View file @ d94eaf58
#! /bin/sh #! /bin/sh
# From configure.ac Id: configure.ac,v 1.1.1.1 2003/07/15 15:51:33 shank Exp . # From configure.ac Id: configure.ac,v 1.1 2003/07/05 06:20:51 shank Exp .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for MPEG Audio Decoder 0.15.0b. # Generated by GNU Autoconf 2.57 for MPEG Audio Decoder 0.15.0b.
# #
...@@ -251,7 +251,6 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then ...@@ -251,7 +251,6 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then
*-DOS) lt_cv_sys_path_separator=';' ;; *-DOS) lt_cv_sys_path_separator=';' ;;
*) lt_cv_sys_path_separator=':' ;; *) lt_cv_sys_path_separator=':' ;;
esac esac
PATH_SEPARATOR=$lt_cv_sys_path_separator
fi fi
...@@ -318,7 +317,7 @@ else ...@@ -318,7 +317,7 @@ else
# #
# So, first we look for a working echo in the user's PATH. # So, first we look for a working echo in the user's PATH.
IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
for dir in $PATH /usr/ucb; do for dir in $PATH /usr/ucb; do
if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
...@@ -470,7 +469,7 @@ ac_includes_default="\ ...@@ -470,7 +469,7 @@ ac_includes_default="\
# include <unistd.h> # include <unistd.h>
#endif" #endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CCAS CCASFLAGS LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL LIBTOOL_DEPS FPM ASO ASO_OBJS LIBOBJS LTLIBOBJS' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS CCASFLAGS LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL LIBTOOL_DEPS FPM ASO ASO_OBJS LIBOBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
...@@ -1466,7 +1465,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ...@@ -1466,7 +1465,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
am__api_version="1.6" am__api_version="1.7"
ac_aux_dir= ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
if test -f $ac_dir/install-sh; then if test -f $ac_dir/install-sh; then
...@@ -1718,6 +1717,16 @@ echo "$as_me: error: source directory already configured; run \"make distclean\" ...@@ -1718,6 +1717,16 @@ echo "$as_me: error: source directory already configured; run \"make distclean\"
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
# test whether we have cygpath
if test -z "$CYGPATH_W"; then
if (cygpath --version) >/dev/null 2>/dev/null; then
CYGPATH_W='cygpath -w'
else
CYGPATH_W=echo
fi
fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE=libmad PACKAGE=libmad
VERSION=0.15.0b VERSION=0.15.0b
...@@ -1847,14 +1856,10 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ...@@ -1847,14 +1856,10 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
# Add the stamp file to the list of files AC keeps track of,
# along with our hook.
ac_config_headers="$ac_config_headers config.h" ac_config_headers="$ac_config_headers config.h"
# Make sure we can run config.sub. # Make sure we can run config.sub.
$ac_config_sub sun4 >/dev/null 2>&1 || $ac_config_sub sun4 >/dev/null 2>&1 ||
{ { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
...@@ -2679,7 +2684,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ...@@ -2679,7 +2684,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
for ac_declaration in \ for ac_declaration in \
'' \ ''\
'#include <stdlib.h>' \
'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \ 'extern "C" void exit (int) throw ();' \
...@@ -2693,8 +2699,8 @@ _ACEOF ...@@ -2693,8 +2699,8 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
$ac_declaration
#include <stdlib.h> #include <stdlib.h>
$ac_declaration
int int
main () main ()
{ {
...@@ -2809,7 +2815,7 @@ echo "include confinc" > confmf ...@@ -2809,7 +2815,7 @@ echo "include confinc" > confmf
# In particular we don't look at `^make:' because GNU make might # In particular we don't look at `^make:' because GNU make might
# be invoked under some other name (usually "gmake"), in which # be invoked under some other name (usually "gmake"), in which
# case it prints its new name instead of `make'. # case it prints its new name instead of `make'.
if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
am__include=include am__include=include
am__quote= am__quote=
_am_result=GNU _am_result=GNU
...@@ -2900,7 +2906,7 @@ else ...@@ -2900,7 +2906,7 @@ else
if depmode=$depmode \ if depmode=$depmode \
source=conftest.c object=conftest.o \ source=conftest.c object=conftest.o \
depfile=conftest.Po tmpdepfile=conftest.TPo \ depfile=conftest.Po tmpdepfile=conftest.TPo \
$SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&
grep conftest.h conftest.Po > /dev/null 2>&1 && grep conftest.h conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
am_cv_CC_dependencies_compiler_type=$depmode am_cv_CC_dependencies_compiler_type=$depmode
...@@ -2920,6 +2926,18 @@ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 ...@@ -2920,6 +2926,18 @@ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
am__fastdepCC_FALSE='#'
else
am__fastdepCC_TRUE='#'
am__fastdepCC_FALSE=
fi
# By default we simply use the C compiler to build assembly code. # By default we simply use the C compiler to build assembly code.
: ${CCAS='$(CC)'} : ${CCAS='$(CC)'}
...@@ -3009,17 +3027,6 @@ esac ...@@ -3009,17 +3027,6 @@ esac
else else
enable_fast_install=yes enable_fast_install=yes
fi; fi;
# Find the correct PATH separator. Usually this is `:', but
# DJGPP uses `;' like DOS.
if test "X${PATH_SEPARATOR+set}" != Xset; then
UNAME=${UNAME-`uname 2>/dev/null`}
case X$UNAME in
*-DOS) lt_cv_sys_path_separator=';' ;;
*) lt_cv_sys_path_separator=':' ;;
esac
PATH_SEPARATOR=$lt_cv_sys_path_separator
fi
# Check whether --with-gnu-ld or --without-gnu-ld was given. # Check whether --with-gnu-ld or --without-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then if test "${with_gnu_ld+set}" = set; then
...@@ -3071,7 +3078,7 @@ if test "${lt_cv_path_LD+set}" = set; then ...@@ -3071,7 +3078,7 @@ if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
if test -z "$LD"; then if test -z "$LD"; then
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
...@@ -3141,7 +3148,7 @@ else ...@@ -3141,7 +3148,7 @@ else
# Let the user override the test. # Let the user override the test.
lt_cv_path_NM="$NM" lt_cv_path_NM="$NM"
else else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
tmp_nm=$ac_dir/${ac_tool_prefix}nm tmp_nm=$ac_dir/${ac_tool_prefix}nm
...@@ -3171,91 +3178,6 @@ NM="$lt_cv_path_NM" ...@@ -3171,91 +3178,6 @@ NM="$lt_cv_path_NM"
echo "$as_me:$LINENO: result: $NM" >&5 echo "$as_me:$LINENO: result: $NM" >&5
echo "${ECHO_T}$NM" >&6 echo "${ECHO_T}$NM" >&6
echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
# Loop through the user's path and test for sed and gsed.
# Then use that list of sed's as ones to test for truncation.
as_executable_p="test -f"
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
_sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
fi
done
done
done
# Create a temporary directory, and hook for its removal unless debugging.
$debug ||
{
trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
trap '{ (exit 1); exit 1; }' 1 2 13 15
}
# Create a (secure) tmp directory for tmp files.
: ${TMPDIR=/tmp}
{
tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
test -n "$tmp" && test -d "$tmp"
} ||
{
tmp=$TMPDIR/sed$$-$RANDOM
(umask 077 && mkdir $tmp)
} ||
{
echo "$me: cannot create a temporary directory in $TMPDIR" >&2
{ (exit 1); exit 1; }
}
_max=0
_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for _sed in $_sed_list /usr/xpg4/bin/sed; do
test ! -f ${_sed} && break
cat /dev/null > "$tmp/sed.in"
_count=0
echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
# Check for GNU sed and select it if it is found.
if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
lt_cv_path_SED=${_sed}
break
fi
while true; do
cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
mv "$tmp/sed.tmp" "$tmp/sed.in"
cp "$tmp/sed.in" "$tmp/sed.nl"
echo >>"$tmp/sed.nl"
${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
# 40000 chars as input seems more than enough
test $_count -gt 10 && break
_count=`expr $_count + 1`
if test $_count -gt $_max; then
_max=$_count
lt_cv_path_SED=$_sed
fi
done
done
rm -rf "$tmp"
fi
if test "X$SED" != "X"; then
lt_cv_path_SED=$SED
else
SED=$lt_cv_path_SED
fi
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
echo "$as_me:$LINENO: checking whether ln -s works" >&5 echo "$as_me:$LINENO: checking whether ln -s works" >&5
echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
LN_S=$as_ln_s LN_S=$as_ln_s
...@@ -3267,8 +3189,8 @@ else ...@@ -3267,8 +3189,8 @@ else
echo "${ECHO_T}no, using $LN_S" >&6 echo "${ECHO_T}no, using $LN_S" >&6
fi fi
echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 echo "$as_me:$LINENO: checking how to recognise dependant libraries" >&5
echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6
if test "${lt_cv_deplibs_check_method+set}" = set; then if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
...@@ -3281,7 +3203,7 @@ lt_cv_deplibs_check_method='unknown' ...@@ -3281,7 +3203,7 @@ lt_cv_deplibs_check_method='unknown'
# `unknown' -- same as none, but documents that we really don't know. # `unknown' -- same as none, but documents that we really don't know.
# 'pass_all' -- all dependencies passed with no checks. # 'pass_all' -- all dependencies passed with no checks.
# 'test_compile' -- check by making test program. # 'test_compile' -- check by making test program.
# 'file_magic [[regex]]' -- check by looking for files in library path # ['file_magic [regex]'] -- check by looking for files in library path
# which responds to the $file_magic_cmd with a given egrep regex. # which responds to the $file_magic_cmd with a given egrep regex.
# If you have `file' or equivalent on your system and you're not sure # If you have `file' or equivalent on your system and you're not sure
# whether `pass_all' will *always* work, you probably want this one. # whether `pass_all' will *always* work, you probably want this one.
...@@ -3345,9 +3267,9 @@ hpux10.20*|hpux11*) ...@@ -3345,9 +3267,9 @@ hpux10.20*|hpux11*)
lt_cv_file_magic_test_file=/usr/lib/libc.sl lt_cv_file_magic_test_file=/usr/lib/libc.sl
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
case $host_os in case $host_os in
irix5* | nonstopux*) irix5*)
# this will be overridden with pass_all, but let us keep it just in case # this will be overridden with pass_all, but let us keep it just in case
lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
;; ;;
...@@ -3369,7 +3291,7 @@ irix5* | irix6* | nonstopux*) ...@@ -3369,7 +3291,7 @@ irix5* | irix6* | nonstopux*)
# This must be Linux ELF. # This must be Linux ELF.
linux-gnu*) linux-gnu*)
case $host_cpu in case $host_cpu in
alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | arm* | m68k) alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
lt_cv_deplibs_check_method=pass_all ;; lt_cv_deplibs_check_method=pass_all ;;
*) *)
# glibc up to 2.1.1 does not perform some relocations on ARM # glibc up to 2.1.1 does not perform some relocations on ARM
...@@ -3440,9 +3362,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ...@@ -3440,9 +3362,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
lt_cv_file_magic_test_file=/lib/libc.so lt_cv_file_magic_test_file=/lib/libc.so
;; ;;
siemens)
lt_cv_deplibs_check_method=pass_all
;;
esac esac
;; ;;
esac esac
...@@ -3497,12 +3416,9 @@ hpux*) # Its linker distinguishes data from code symbols ...@@ -3497,12 +3416,9 @@ hpux*) # Its linker distinguishes data from code symbols
lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;; ;;
irix* | nonstopux*) irix*)
symcode='[BCDEGRST]' symcode='[BCDEGRST]'
;; ;;
osf*)
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*) solaris* | sysv5*)
symcode='[BDT]' symcode='[BDT]'
;; ;;
...@@ -3611,7 +3527,7 @@ EOF ...@@ -3611,7 +3527,7 @@ EOF
(eval $ac_link) 2>&5 (eval $ac_link) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest$ac_exeext; then (exit $ac_status); } && test -s conftest; then
pipe_works=yes pipe_works=yes
fi fi
LIBS="$save_LIBS" LIBS="$save_LIBS"
...@@ -4277,7 +4193,6 @@ done ...@@ -4277,7 +4193,6 @@ done
# Only perform the check for file, if the check method requires it # Only perform the check for file, if the check method requires it
case $deplibs_check_method in case $deplibs_check_method in
file_magic*) file_magic*)
...@@ -4593,7 +4508,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ...@@ -4593,7 +4508,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
case $host in case $host in
*-*-irix6*) *-*-irix6*)
# Find out which ABI we are using. # Find out which ABI we are using.
echo '#line 4596 "configure"' > conftest.$ac_ext echo '#line 4511 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
...@@ -4835,7 +4750,7 @@ else ...@@ -4835,7 +4750,7 @@ else
# like `-m68040'. # like `-m68040'.
lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
;; ;;
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes. # PIC is the default for these OSes.
;; ;;
darwin* | rhapsody*) darwin* | rhapsody*)
...@@ -4878,7 +4793,7 @@ else ...@@ -4878,7 +4793,7 @@ else
lt_cv_prog_cc_pic='+Z' lt_cv_prog_cc_pic='+Z'
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_wl='-Wl,'
lt_cv_prog_cc_static='-non_shared' lt_cv_prog_cc_static='-non_shared'
# PIC (with -KPIC) is the default. # PIC (with -KPIC) is the default.
...@@ -4922,7 +4837,11 @@ else ...@@ -4922,7 +4837,11 @@ else
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_pic='-KPIC'
lt_cv_prog_cc_static='-Bstatic' lt_cv_prog_cc_static='-Bstatic'
lt_cv_prog_cc_wl='-Wl,' if test "x$host_vendor" = xsni; then
lt_cv_prog_cc_wl='-LD'
else
lt_cv_prog_cc_wl='-Wl,'
fi
;; ;;
uts4*) uts4*)
...@@ -5122,7 +5041,7 @@ chmod -w . ...@@ -5122,7 +5041,7 @@ chmod -w .
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no compiler_c_o=no
if { (eval echo configure:5125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then if { (eval echo configure:5044: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized # The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings # So say no if there are warnings
if test -s out/conftest.err; then if test -s out/conftest.err; then
...@@ -5440,7 +5359,7 @@ EOF ...@@ -5440,7 +5359,7 @@ EOF
# can override, but on older systems we have to supply one (in ltdll.c) # can override, but on older systems we have to supply one (in ltdll.c)
if test "x$lt_cv_need_dllmain" = "xyes"; then if test "x$lt_cv_need_dllmain" = "xyes"; then
ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~ ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~
test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
else else
ltdll_obj= ltdll_obj=
...@@ -5458,7 +5377,7 @@ EOF ...@@ -5458,7 +5377,7 @@ EOF
# If the export-symbols file already is a .def file (1st line # If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is. # is EXPORTS), use it as is.
# If DATA tags from a recent dlltool are present, honour them! # If DATA tags from a recent dlltool are present, honour them!
archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
cp $export_symbols $output_objdir/$soname-def; cp $export_symbols $output_objdir/$soname-def;
else else
echo EXPORTS > $output_objdir/$soname-def; echo EXPORTS > $output_objdir/$soname-def;
...@@ -5467,7 +5386,6 @@ EOF ...@@ -5467,7 +5386,6 @@ EOF
set dummy \$symbol; set dummy \$symbol;
case \$# in case \$# in
2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
4) echo " \$2 \$3 \$4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
*) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;; *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
esac; esac;
_lt_hint=`expr 1 + \$_lt_hint`; _lt_hint=`expr 1 + \$_lt_hint`;
...@@ -5580,12 +5498,10 @@ else ...@@ -5580,12 +5498,10 @@ else
# need to do runtime linking. # need to do runtime linking.
case $host_os in aix4.[23]|aix4.[23].*|aix5*) case $host_os in aix4.[23]|aix4.[23].*|aix5*)
for ld_flag in $LDFLAGS; do for ld_flag in $LDFLAGS; do
case $ld_flag in if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
*-brtl*)
aix_use_runtimelinking=yes aix_use_runtimelinking=yes
break break
;; fi
esac
done done
esac esac
...@@ -5657,7 +5573,7 @@ else ...@@ -5657,7 +5573,7 @@ else
allow_undefined_flag='${wl}-berok' allow_undefined_flag='${wl}-berok'
# This is a bit strange, but is similar to how AIX traditionally builds # This is a bit strange, but is similar to how AIX traditionally builds
# it's shared libraries. # it's shared libraries.
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname' archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
fi fi
fi fi
;; ;;
...@@ -5699,9 +5615,8 @@ else ...@@ -5699,9 +5615,8 @@ else
esac esac
# FIXME: Relying on posixy $() will cause problems for # FIXME: Relying on posixy $() will cause problems for
# cross-compilation, but unfortunately the echo tests do not # cross-compilation, but unfortunately the echo tests do not
# yet detect zsh echo's removal of \ escapes. Also zsh mangles # yet detect zsh echo's removal of \ escapes.
# `"' quotes if we put them in here... so don't! archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
# We need to add '_' to the symbols in $export_symbols first # We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes hardcode_direct=yes
...@@ -5753,14 +5668,13 @@ else ...@@ -5753,14 +5668,13 @@ else
export_dynamic_flag_spec='${wl}-E' export_dynamic_flag_spec='${wl}-E'
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
if test "$GCC" = yes; then if test "$GCC" = yes; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='-rpath $libdir'
fi fi
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=: hardcode_libdir_separator=:
link_all_deplibs=yes link_all_deplibs=yes
;; ;;
...@@ -5788,7 +5702,7 @@ else ...@@ -5788,7 +5702,7 @@ else
hardcode_direct=yes hardcode_direct=yes
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir' hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E' export_dynamic_flag_spec='${wl}-E'
else else
...@@ -5798,7 +5712,7 @@ else ...@@ -5798,7 +5712,7 @@ else
hardcode_libdir_flag_spec='-R$libdir' hardcode_libdir_flag_spec='-R$libdir'
;; ;;
*) *)
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir' hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;; ;;
esac esac
...@@ -5851,35 +5765,7 @@ else ...@@ -5851,35 +5765,7 @@ else
;; ;;
solaris*) solaris*)
# gcc --version < 3.0 without binutils cannot create self contained
# shared libraries reliably, requiring libgcc.a to resolve some of
# the object symbols generated in some cases. Libraries that use
# assert need libgcc.a to resolve __eprintf, for example. Linking
# a copy of libgcc.a into every shared library to guarantee resolving
# such symbols causes other problems: According to Tim Van Holder
# <tim.van.holder@pandora.be>, C++ libraries end up with a separate
# (to the application) exception stack for one thing.
no_undefined_flag=' -z defs' no_undefined_flag=' -z defs'
if test "$GCC" = yes; then
case `$CC --version 2>/dev/null` in
[12].*)
cat <<EOF 1>&2
*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
*** create self contained shared libraries on Solaris systems, without
*** introducing a dependency on libgcc.a. Therefore, libtool is disabling
*** -no-undefined support, which will at least allow you to build shared
*** libraries. However, you may find that when you link such libraries
*** into an application without using GCC, you have to manually add
*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to
*** upgrade to a newer version of GCC. Another option is to rebuild your
*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
EOF
no_undefined_flag=
;;
esac
fi
# $CC -shared without GNU ld will not create a library from C++ # $CC -shared without GNU ld will not create a library from C++
# object files and a static libstdc++, better avoid it by now # object files and a static libstdc++, better avoid it by now
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
...@@ -5910,23 +5796,13 @@ EOF ...@@ -5910,23 +5796,13 @@ EOF
;; ;;
sysv4) sysv4)
case $host_vendor in if test "x$host_vendor" = xsno; then
sni) archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes # is this really true???
hardcode_direct=yes # is this really true??? else
;; archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
siemens) hardcode_direct=no #Motorola manual says yes, but my tests say they lie
## LD is ld it makes a PLAMLIB fi
## CC just makes a GrossModule.
archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
reload_cmds='$CC -r -o $output$reload_objs'
hardcode_direct=no
;;
motorola)
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=no #Motorola manual says yes, but my tests say they lie
;;
esac
runpath_var='LD_RUN_PATH' runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
;; ;;
...@@ -6074,9 +5950,6 @@ aix3*) ...@@ -6074,9 +5950,6 @@ aix3*)
aix4* | aix5*) aix4* | aix5*)
version_type=linux version_type=linux
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
if test "$host_cpu" = ia64; then if test "$host_cpu" = ia64; then
# AIX 5 supports IA64 # AIX 5 supports IA64
library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
...@@ -6088,15 +5961,15 @@ aix4* | aix5*) ...@@ -6088,15 +5961,15 @@ aix4* | aix5*)
# depend on `.', always an invalid library. This was fixed in # depend on `.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0. # development snapshots of GCC prior to 3.0.
case $host_os in case $host_os in
aix4 | aix4.[01] | aix4.[01].*) aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes ' echo ' yes '
echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
: :
else else
can_build_shared=no can_build_shared=no
fi fi
;; ;;
esac esac
# AIX (on Power*) has no versioning support, so currently we can # AIX (on Power*) has no versioning support, so currently we can
# not hardcode correct soname into executable. Probably we can # not hardcode correct soname into executable. Probably we can
...@@ -6115,7 +5988,6 @@ aix4* | aix5*) ...@@ -6115,7 +5988,6 @@ aix4* | aix5*)
fi fi
shlibpath_var=LIBPATH shlibpath_var=LIBPATH
fi fi
hardcode_into_libs=yes
;; ;;
amigaos*) amigaos*)
...@@ -6163,7 +6035,7 @@ cygwin* | mingw* | pw32*) ...@@ -6163,7 +6035,7 @@ cygwin* | mingw* | pw32*)
;; ;;
yes,mingw*) yes,mingw*)
library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"` sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
;; ;;
yes,pw32*) yes,pw32*)
library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll' library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll'
...@@ -6195,18 +6067,6 @@ freebsd1*) ...@@ -6195,18 +6067,6 @@ freebsd1*)
dynamic_linker=no dynamic_linker=no
;; ;;
freebsd*-gnu*)
version_type=linux
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
soname_spec='${libname}${release}.so$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='GNU/FreeBSD ld.so'
;;
freebsd*) freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat version_type=freebsd-$objformat
...@@ -6258,17 +6118,14 @@ hpux9* | hpux10* | hpux11*) ...@@ -6258,17 +6118,14 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib' postinstall_cmds='chmod 555 $lib'
;; ;;
irix5* | irix6* | nonstopux*) irix5* | irix6*)
case $host_os in version_type=irix
nonstopux*) version_type=nonstopux ;;
*) version_type=irix ;;
esac
need_lib_prefix=no need_lib_prefix=no
need_version=no need_version=no
soname_spec='${libname}${release}.so$major' soname_spec='${libname}${release}.so$major'
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
case $host_os in case $host_os in
irix5* | nonstopux*) irix5*)
libsuff= shlibsuff= libsuff= shlibsuff=
;; ;;
*) *)
...@@ -6372,13 +6229,11 @@ os2*) ...@@ -6372,13 +6229,11 @@ os2*)
osf3* | osf4* | osf5*) osf3* | osf4* | osf5*)
version_type=osf version_type=osf
need_version=no need_version=no
need_lib_prefix=no soname_spec='${libname}${release}.so'
soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
hardcode_into_libs=yes
;; ;;
sco3.2v5*) sco3.2v5*)
...@@ -6421,12 +6276,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ...@@ -6421,12 +6276,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
case $host_vendor in case $host_vendor in
sni) sni)
shlibpath_overrides_runpath=no shlibpath_overrides_runpath=no
need_lib_prefix=no
export_dynamic_flag_spec='${wl}-Blargedynsym'
runpath_var=LD_RUN_PATH
;;
siemens)
need_lib_prefix=no
;; ;;
motorola) motorola)
need_lib_prefix=no need_lib_prefix=no
...@@ -6967,7 +6816,7 @@ else ...@@ -6967,7 +6816,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6970 "configure" #line 6819 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
...@@ -7065,7 +6914,7 @@ else ...@@ -7065,7 +6914,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7068 "configure" #line 6917 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
...@@ -7248,7 +7097,7 @@ if test -f "$ltmain"; then ...@@ -7248,7 +7097,7 @@ if test -f "$ltmain"; then
# Now quote all the things that may contain metacharacters while being # Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the # careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script. # variables and quote the copies for generation of the libtool script.
for var in echo old_CC old_CFLAGS SED \ for var in echo old_CC old_CFLAGS \
AR AR_FLAGS CC LD LN_S NM SHELL \ AR AR_FLAGS CC LD LN_S NM SHELL \
reload_flag reload_cmds wl \ reload_flag reload_cmds wl \
pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
...@@ -7310,11 +7159,8 @@ if test -f "$ltmain"; then ...@@ -7310,11 +7159,8 @@ if test -f "$ltmain"; then
# configuration script generated by Autoconf, you may include it under # configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program. # the same distribution terms that you use for the rest of that program.
# A sed that does not truncate output.
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n. # Sed that helps us avoid accidentally triggering echo(1) options like -n.
Xsed="${SED} -e s/^X//" Xsed="sed -e s/^X//"
# The HP-UX ksh and POSIX shell print the target directory to stdout # The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set. # if CDPATH is set.
...@@ -10105,6 +9951,13 @@ echo "$as_me: error: conditional \"AMDEP\" was never defined. ...@@ -10105,6 +9951,13 @@ echo "$as_me: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;} Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
: ${CONFIG_STATUS=./config.status} : ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files ac_clean_files_save=$ac_clean_files
...@@ -10640,6 +10493,7 @@ s,@LIBS@,$LIBS,;t t ...@@ -10640,6 +10493,7 @@ s,@LIBS@,$LIBS,;t t
s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t
s,@CYGPATH_W@,$CYGPATH_W,;t t
s,@PACKAGE@,$PACKAGE,;t t s,@PACKAGE@,$PACKAGE,;t t
s,@VERSION@,$VERSION,;t t s,@VERSION@,$VERSION,;t t
s,@ACLOCAL@,$ACLOCAL,;t t s,@ACLOCAL@,$ACLOCAL,;t t
...@@ -10676,6 +10530,8 @@ s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t ...@@ -10676,6 +10530,8 @@ s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
s,@CCDEPMODE@,$CCDEPMODE,;t t s,@CCDEPMODE@,$CCDEPMODE,;t t
s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
s,@CCAS@,$CCAS,;t t s,@CCAS@,$CCAS,;t t
s,@CCASFLAGS@,$CCASFLAGS,;t t s,@CCASFLAGS@,$CCASFLAGS,;t t
s,@LN_S@,$LN_S,;t t s,@LN_S@,$LN_S,;t t
...@@ -11116,12 +10972,19 @@ echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} ...@@ -11116,12 +10972,19 @@ echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
cat $tmp/config.h cat $tmp/config.h
rm -f $tmp/config.h rm -f $tmp/config.h
fi fi
# Run the commands associated with the file. _am_stamp_count=`expr ${_am_stamp_count-0} + 1`
case $ac_file in echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
config.h ) # update the timestamp $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
echo 'timestamp for config.h' >"./stamp-h1" X$ac_file : 'X\(//\)[^/]' \| \
;; X$ac_file : 'X\(//\)$' \| \
esac X$ac_file : 'X\(/\)' \| \
. : '\(.\)' 2>/dev/null ||
echo X$ac_file |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
/^X\(\/\/\)$/{ s//\1/; q; }
/^X\(\/\).*/{ s//\1/; q; }
s/.*/./; q'`/stamp-h$_am_stamp_count
done done
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF
......
libmad/configure.ac
View file @ d94eaf58
...@@ -17,7 +17,7 @@ dnl You should have received a copy of the GNU General Public License ...@@ -17,7 +17,7 @@ dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
dnl dnl
AC_REVISION([$Id: configure.ac,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $])dnl AC_REVISION([$Id: configure.ac,v 1.1 2003/07/05 06:20:51 shank Exp $])dnl
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
......
libmad/decoder.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: decoder.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: decoder.c,v 1.2 2003/07/05 06:20:51 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libmad/decoder.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: decoder.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: decoder.h,v 1.2 2003/07/05 06:20:51 shank Exp $
*/ */
# ifndef LIBMAD_DECODER_H # ifndef LIBMAD_DECODER_H
......
libmad/fixed.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: fixed.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: fixed.c,v 1.2 2003/07/05 06:20:51 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libmad/fixed.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: fixed.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: fixed.h,v 1.2 2003/07/05 06:20:52 shank Exp $
*/ */
# ifndef LIBMAD_FIXED_H # ifndef LIBMAD_FIXED_H
......
libmad/frame.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: frame.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: frame.c,v 1.2 2003/07/05 06:20:52 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libmad/frame.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: frame.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: frame.h,v 1.2 2003/07/05 06:20:52 shank Exp $
*/ */
# ifndef LIBMAD_FRAME_H # ifndef LIBMAD_FRAME_H
......
libmad/global.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: global.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: global.h,v 1.2 2003/07/05 06:20:52 shank Exp $
*/ */
# ifndef LIBMAD_GLOBAL_H # ifndef LIBMAD_GLOBAL_H
......
libmad/huffman.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: huffman.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: huffman.c,v 1.2 2003/07/05 06:20:52 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libmad/huffman.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: huffman.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: huffman.h,v 1.2 2003/07/05 06:20:52 shank Exp $
*/ */
# ifndef LIBMAD_HUFFMAN_H # ifndef LIBMAD_HUFFMAN_H
......
libmad/imdct_l_arm.S
View file @ d94eaf58
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* *
***************************************************************************** *****************************************************************************
* *
* $Id: imdct_l_arm.S,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: imdct_l_arm.S,v 1.2 2003/07/05 06:20:52 shank Exp $
* *
* 2001/03/24: Andre McCurdy <armccurdy@yahoo.co.uk> * 2001/03/24: Andre McCurdy <armccurdy@yahoo.co.uk>
* - Corrected PIC unsafe loading of address of 'imdct36_long_karray' * - Corrected PIC unsafe loading of address of 'imdct36_long_karray'
......
libmad/imdct_s.dat
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: imdct_s.dat,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: imdct_s.dat,v 1.2 2003/07/05 06:20:52 shank Exp $
*/ */
/* 0 */ { MAD_F(0x09bd7ca0) /* 0.608761429 */, /* 0 */ { MAD_F(0x09bd7ca0) /* 0.608761429 */,
......
libmad/layer12.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: layer12.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: layer12.c,v 1.2 2003/07/05 06:20:52 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libmad/layer12.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: layer12.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: layer12.h,v 1.2 2003/07/05 06:20:52 shank Exp $
*/ */
# ifndef LIBMAD_LAYER12_H # ifndef LIBMAD_LAYER12_H
......
libmad/layer3.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: layer3.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: layer3.c,v 1.2 2003/07/05 06:20:52 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libmad/layer3.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: layer3.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: layer3.h,v 1.2 2003/07/05 06:20:53 shank Exp $
*/ */
# ifndef LIBMAD_LAYER3_H # ifndef LIBMAD_LAYER3_H
......
libmad/mad.h
View file @ d94eaf58
...@@ -33,7 +33,7 @@ extern "C" { ...@@ -33,7 +33,7 @@ extern "C" {
# define SIZEOF_LONG_LONG 8 # define SIZEOF_LONG_LONG 8
/* Id: version.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp */ /* Id: version.h,v 1.2 2003/07/05 06:20:55 shank Exp */
# ifndef LIBMAD_VERSION_H # ifndef LIBMAD_VERSION_H
# define LIBMAD_VERSION_H # define LIBMAD_VERSION_H
...@@ -62,7 +62,7 @@ extern char const mad_build[]; ...@@ -62,7 +62,7 @@ extern char const mad_build[];
# endif # endif
/* Id: fixed.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp */ /* Id: fixed.h,v 1.2 2003/07/05 06:20:52 shank Exp */
# ifndef LIBMAD_FIXED_H # ifndef LIBMAD_FIXED_H
# define LIBMAD_FIXED_H # define LIBMAD_FIXED_H
...@@ -528,7 +528,7 @@ mad_fixed_t mad_f_div(mad_fixed_t, mad_fixed_t); ...@@ -528,7 +528,7 @@ mad_fixed_t mad_f_div(mad_fixed_t, mad_fixed_t);
# endif # endif
/* Id: bit.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp */ /* Id: bit.h,v 1.2 2003/07/05 06:20:50 shank Exp */
# ifndef LIBMAD_BIT_H # ifndef LIBMAD_BIT_H
# define LIBMAD_BIT_H # define LIBMAD_BIT_H
...@@ -557,7 +557,7 @@ unsigned short mad_bit_crc(struct mad_bitptr, unsigned int, unsigned short); ...@@ -557,7 +557,7 @@ unsigned short mad_bit_crc(struct mad_bitptr, unsigned int, unsigned short);
# endif # endif
/* Id: timer.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp */ /* Id: timer.h,v 1.2 2003/07/05 06:20:55 shank Exp */
# ifndef LIBMAD_TIMER_H # ifndef LIBMAD_TIMER_H
# define LIBMAD_TIMER_H # define LIBMAD_TIMER_H
...@@ -639,7 +639,7 @@ void mad_timer_string(mad_timer_t, char *, char const *, ...@@ -639,7 +639,7 @@ void mad_timer_string(mad_timer_t, char *, char const *,
# endif # endif
/* Id: stream.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp */ /* Id: stream.h,v 1.2 2003/07/05 06:20:55 shank Exp */
# ifndef LIBMAD_STREAM_H # ifndef LIBMAD_STREAM_H
# define LIBMAD_STREAM_H # define LIBMAD_STREAM_H
...@@ -727,7 +727,7 @@ char const *mad_stream_errorstr(struct mad_stream const *); ...@@ -727,7 +727,7 @@ char const *mad_stream_errorstr(struct mad_stream const *);
# endif # endif
/* Id: frame.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp */ /* Id: frame.h,v 1.2 2003/07/05 06:20:52 shank Exp */
# ifndef LIBMAD_FRAME_H # ifndef LIBMAD_FRAME_H
# define LIBMAD_FRAME_H # define LIBMAD_FRAME_H
...@@ -824,7 +824,7 @@ void mad_frame_mute(struct mad_frame *); ...@@ -824,7 +824,7 @@ void mad_frame_mute(struct mad_frame *);
# endif # endif
/* Id: synth.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp */ /* Id: synth.h,v 1.2 2003/07/05 06:20:55 shank Exp */
# ifndef LIBMAD_SYNTH_H # ifndef LIBMAD_SYNTH_H
# define LIBMAD_SYNTH_H # define LIBMAD_SYNTH_H
...@@ -873,7 +873,7 @@ void mad_synth_frame(struct mad_synth *, struct mad_frame const *); ...@@ -873,7 +873,7 @@ void mad_synth_frame(struct mad_synth *, struct mad_frame const *);
# endif # endif
/* Id: decoder.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp */ /* Id: decoder.h,v 1.2 2003/07/05 06:20:51 shank Exp */
# ifndef LIBMAD_DECODER_H # ifndef LIBMAD_DECODER_H
# define LIBMAD_DECODER_H # define LIBMAD_DECODER_H
......
libmad/mad.h.sed
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# $Id: mad.h.sed,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ # $Id: mad.h.sed,v 1.2 2003/07/05 06:20:53 shank Exp $
# #
/^\/\*$/{ /^\/\*$/{
......
libmad/minimad.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: minimad.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: minimad.c,v 1.1 2003/07/05 06:20:53 shank Exp $
*/ */
# include <stdio.h> # include <stdio.h>
......
libmad/qc_table.dat
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: qc_table.dat,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: qc_table.dat,v 1.2 2003/07/05 06:20:53 shank Exp $
*/ */
/* /*
......
libmad/rq_table.dat
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: rq_table.dat,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: rq_table.dat,v 1.2 2003/07/05 06:20:53 shank Exp $
*/ */
/* /*
......
libmad/sf_table.dat
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: sf_table.dat,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: sf_table.dat,v 1.2 2003/07/05 06:20:55 shank Exp $
*/ */
/* /*
......
libmad/stream.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: stream.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: stream.c,v 1.2 2003/07/05 06:20:55 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libmad/stream.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: stream.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: stream.h,v 1.2 2003/07/05 06:20:55 shank Exp $
*/ */
# ifndef LIBMAD_STREAM_H # ifndef LIBMAD_STREAM_H
......
libmad/synth.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: synth.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: synth.c,v 1.2 2003/07/05 06:20:55 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libmad/synth.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: synth.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: synth.h,v 1.2 2003/07/05 06:20:55 shank Exp $
*/ */
# ifndef LIBMAD_SYNTH_H # ifndef LIBMAD_SYNTH_H
......
libmad/timer.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: timer.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: timer.c,v 1.2 2003/07/05 06:20:55 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libmad/timer.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: timer.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: timer.h,v 1.2 2003/07/05 06:20:55 shank Exp $
*/ */
# ifndef LIBMAD_TIMER_H # ifndef LIBMAD_TIMER_H
......
libmad/version.c
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: version.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: version.c,v 1.2 2003/07/05 06:20:55 shank Exp $
*/ */
# ifdef HAVE_CONFIG_H # ifdef HAVE_CONFIG_H
......
libmad/version.h
View file @ d94eaf58
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: version.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $ * $Id: version.h,v 1.2 2003/07/05 06:20:55 shank Exp $
*/ */
# ifndef LIBMAD_VERSION_H # ifndef LIBMAD_VERSION_H
......
listen.c
View file @ d94eaf58
...@@ -32,18 +32,17 @@ ...@@ -32,18 +32,17 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <resolv.h> #include <resolv.h>
#include <fcntl.h>
#define MAXHOSTNAME 1024 #define MAXHOSTNAME 1024
#define BIND_ATTEMPT_INTERVAL 30 #define ALLOW_REUSE 1
#define BIND_ATTEMPTS 6
int listenSocket; int listenSocket;
int establish(unsigned short port) { int establish(unsigned short port) {
int allowReuse = ALLOW_REUSE;
int sock; int sock;
int success = 0;
int attempts = 0;
struct sockaddr_in sockAddr; struct sockaddr_in sockAddr;
memset(&sockAddr, 0, sizeof(struct sockaddr_in)); memset(&sockAddr, 0, sizeof(struct sockaddr_in));
...@@ -57,24 +56,22 @@ int establish(unsigned short port) { ...@@ -57,24 +56,22 @@ int establish(unsigned short port) {
return -1; return -1;
} }
do { if(setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,(char *)&allowReuse,sizeof(allowReuse))<0) {
if(bind(sock,(struct sockaddr *)&sockAddr,sizeof(struct sockaddr_in))>=0) {
success = 1;
break;
}
else fprintf(stderr,"attempt %i to bind port %i failed, trying again in %i seconds\n",attempts+1,port,BIND_ATTEMPT_INTERVAL);
sleep(BIND_ATTEMPT_INTERVAL);
attempts++;
} while(attempts<BIND_ATTEMPTS);
if(!success) {
close(sock); close(sock);
fprintf(stderr,"unable to bind port in %i attempts, giving up\n",BIND_ATTEMPTS); fprintf(stderr,"problems setsockopt'ing\n");
return -1; return -1;
} }
if(bind(sock,(struct sockaddr *)&sockAddr,sizeof(struct sockaddr_in))<0) {
fprintf(stderr,"unable to bind port %i, maybe mpd is still running?\n",port);
close(sock);
return -1;
}
listen(sock,0); listen(sock,5);
fcntl(sock,F_SETOWN,(int)getpid());
fcntl(sock,F_SETFL,fcntl(sock,F_GETFL) | O_ASYNC);
return sock; return sock;
} }
......
ltmain.sh
View file @ d94eaf58
...@@ -49,14 +49,14 @@ EOF ...@@ -49,14 +49,14 @@ EOF
fi fi
# The name of this program. # The name of this program.
progname=`$echo "$0" | ${SED} 's%^.*/%%'` progname=`$echo "$0" | sed 's%^.*/%%'`
modename="$progname" modename="$progname"
# Constants. # Constants.
PROGRAM=ltmain.sh PROGRAM=ltmain.sh
PACKAGE=libtool PACKAGE=libtool
VERSION=1.4.3 VERSION=1.4.1
TIMESTAMP=" (1.922.2.111 2002/10/23 02:54:36)" TIMESTAMP=" (1.922.2.34 2001/09/03 01:22:13)"
default_mode= default_mode=
help="Try \`$progname --help' for more information." help="Try \`$progname --help' for more information."
...@@ -67,19 +67,10 @@ rm="rm -f" ...@@ -67,19 +67,10 @@ rm="rm -f"
# Sed substitution that helps us do robust quoting. It backslashifies # Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings. # metacharacters that are still active within double-quoted strings.
Xsed="${SED}"' -e 1s/^X//' Xsed='sed -e 1s/^X//'
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
# test EBCDIC or ASCII SP2NL='tr \040 \012'
case `echo A|od -x` in NL2SP='tr \015\012 \040\040'
*[Cc]1*) # EBCDIC based system
SP2NL="tr '\100' '\n'"
NL2SP="tr '\r\n' '\100\100'"
;;
*) # Assume ASCII based system
SP2NL="tr '\040' '\012'"
NL2SP="tr '\015\012' '\040\040'"
;;
esac
# NLS nuisances. # NLS nuisances.
# Only set LANG and LC_ALL to C if already set. # Only set LANG and LC_ALL to C if already set.
...@@ -93,9 +84,6 @@ if test "${LANG+set}" = set; then ...@@ -93,9 +84,6 @@ if test "${LANG+set}" = set; then
save_LANG="$LANG"; LANG=C; export LANG save_LANG="$LANG"; LANG=C; export LANG
fi fi
# Make sure IFS has a sensible default
: ${IFS=" "}
if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
echo "$modename: not configured to build any kind of library" 1>&2 echo "$modename: not configured to build any kind of library" 1>&2
echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
...@@ -153,7 +141,7 @@ do ...@@ -153,7 +141,7 @@ do
;; ;;
--config) --config)
${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
exit 0 exit 0
;; ;;
...@@ -226,7 +214,7 @@ if test -z "$show_help"; then ...@@ -226,7 +214,7 @@ if test -z "$show_help"; then
# Infer the operation mode. # Infer the operation mode.
if test -z "$mode"; then if test -z "$mode"; then
case $nonopt in case $nonopt in
*cc | *++ | gcc* | *-gcc* | g++* | xlc*) *cc | *++ | gcc* | *-gcc*)
mode=link mode=link
for arg for arg
do do
...@@ -348,7 +336,7 @@ if test -z "$show_help"; then ...@@ -348,7 +336,7 @@ if test -z "$show_help"; then
-Wc,*) -Wc,*)
args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
lastarg= lastarg=
save_ifs="$IFS"; IFS=',' IFS="${IFS= }"; save_ifs="$IFS"; IFS=','
for arg in $args; do for arg in $args; do
IFS="$save_ifs" IFS="$save_ifs"
...@@ -899,7 +887,7 @@ compiler." ...@@ -899,7 +887,7 @@ compiler."
prev= prev=
continue continue
;; ;;
inst_prefix) inst_prefix)
inst_prefix_dir="$arg" inst_prefix_dir="$arg"
prev= prev=
continue continue
...@@ -1006,15 +994,15 @@ compiler." ...@@ -1006,15 +994,15 @@ compiler."
;; ;;
-inst-prefix-dir) -inst-prefix-dir)
prev=inst_prefix prev=inst_prefix
continue continue
;; ;;
# The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
# so, if we see these flags be careful not to treat them like -L # so, if we see these flags be careful not to treat them like -L
-L[A-Z][A-Z]*:*) -L[A-Z][A-Z]*:*)
case $with_gcc/$host in case $with_gcc/$host in
no/*-*-irix* | no/*-*-nonstopux*) no/*-*-irix*)
compile_command="$compile_command $arg" compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg" finalize_command="$finalize_command $arg"
;; ;;
...@@ -1065,14 +1053,15 @@ compiler." ...@@ -1065,14 +1053,15 @@ compiler."
# These systems don't actually have a C library (as such) # These systems don't actually have a C library (as such)
test "X$arg" = "X-lc" && continue test "X$arg" = "X-lc" && continue
;; ;;
*-*-openbsd* | *-*-freebsd*) *-*-openbsd*)
# Do not include libc due to us having libc/libc_r. # Do not include libc due to us having libc/libc_r.
test "X$arg" = "X-lc" && continue test "X$arg" = "X-lc" && continue
;; ;;
esac esac
elif test "X$arg" = "X-lc_r"; then fi
if test "X$arg" = "X-lc_r"; then
case $host in case $host in
*-*-openbsd* | *-*-freebsd*) *-*-openbsd*)
# Do not include libc_r directly, use -pthread flag. # Do not include libc_r directly, use -pthread flag.
continue continue
;; ;;
...@@ -1167,7 +1156,7 @@ compiler." ...@@ -1167,7 +1156,7 @@ compiler."
-Wc,*) -Wc,*)
args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
arg= arg=
save_ifs="$IFS"; IFS=',' IFS="${IFS= }"; save_ifs="$IFS"; IFS=','
for flag in $args; do for flag in $args; do
IFS="$save_ifs" IFS="$save_ifs"
case $flag in case $flag in
...@@ -1185,7 +1174,7 @@ compiler." ...@@ -1185,7 +1174,7 @@ compiler."
-Wl,*) -Wl,*)
args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
arg= arg=
save_ifs="$IFS"; IFS=',' IFS="${IFS= }"; save_ifs="$IFS"; IFS=','
for flag in $args; do for flag in $args; do
IFS="$save_ifs" IFS="$save_ifs"
case $flag in case $flag in
...@@ -1211,11 +1200,6 @@ compiler." ...@@ -1211,11 +1200,6 @@ compiler."
continue continue
;; ;;
-Kthread | -mthreads | -mt | -pthread | -pthreads | -threads | -qthreaded | -kthread )
compiler_flags="$compiler_flags $arg"
continue
;;
# Some other compiler flag. # Some other compiler flag.
-* | +*) -* | +*)
# Unknown arguments in both finalize_command and compile_command need # Unknown arguments in both finalize_command and compile_command need
...@@ -1364,6 +1348,25 @@ compiler." ...@@ -1364,6 +1348,25 @@ compiler."
fi fi
libs="$libs $deplib" libs="$libs $deplib"
done done
if test "$linkmode" = lib; then
libs="$predeps $libs $compiler_lib_search_path $postdeps"
# Compute libraries that are listed more than once in $predeps
# $postdeps and mark them as special (i.e., whose duplicates are
# not to be eliminated).
pre_post_deps=
if test "X$duplicate_deps" = "Xyes" ; then
for pre_post_dep in $predeps $postdeps; do
case "$pre_post_deps " in
*" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
esac
pre_post_deps="$pre_post_deps $pre_post_dep"
done
fi
pre_post_deps=
fi
deplibs= deplibs=
newdependency_libs= newdependency_libs=
newlib_search_path= newlib_search_path=
...@@ -1395,7 +1398,7 @@ compiler." ...@@ -1395,7 +1398,7 @@ compiler."
;; ;;
esac esac
for pass in $passes; do for pass in $passes; do
if test $linkmode = prog; then if test "$linkmode" = prog; then
# Determine which files to process # Determine which files to process
case $pass in case $pass in
dlopen) dlopen)
...@@ -1412,11 +1415,11 @@ compiler." ...@@ -1412,11 +1415,11 @@ compiler."
found=no found=no
case $deplib in case $deplib in
-l*) -l*)
if test $linkmode = oldlib && test $linkmode = obj; then if test "$linkmode" = oldlib && test "$linkmode" = obj; then
$echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2 $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
continue continue
fi fi
if test $pass = conv; then if test "$pass" = conv; then
deplibs="$deplib $deplibs" deplibs="$deplib $deplibs"
continue continue
fi fi
...@@ -1436,7 +1439,7 @@ compiler." ...@@ -1436,7 +1439,7 @@ compiler."
finalize_deplibs="$deplib $finalize_deplibs" finalize_deplibs="$deplib $finalize_deplibs"
else else
deplibs="$deplib $deplibs" deplibs="$deplib $deplibs"
test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs" test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
fi fi
continue continue
fi fi
...@@ -1445,16 +1448,16 @@ compiler." ...@@ -1445,16 +1448,16 @@ compiler."
case $linkmode in case $linkmode in
lib) lib)
deplibs="$deplib $deplibs" deplibs="$deplib $deplibs"
test $pass = conv && continue test "$pass" = conv && continue
newdependency_libs="$deplib $newdependency_libs" newdependency_libs="$deplib $newdependency_libs"
newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
;; ;;
prog) prog)
if test $pass = conv; then if test "$pass" = conv; then
deplibs="$deplib $deplibs" deplibs="$deplib $deplibs"
continue continue
fi fi
if test $pass = scan; then if test "$pass" = scan; then
deplibs="$deplib $deplibs" deplibs="$deplib $deplibs"
newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
else else
...@@ -1469,7 +1472,7 @@ compiler." ...@@ -1469,7 +1472,7 @@ compiler."
continue continue
;; # -L ;; # -L
-R*) -R*)
if test $pass = link; then if test "$pass" = link; then
dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
# Make sure the xrpath contains only unique directories. # Make sure the xrpath contains only unique directories.
case "$xrpath " in case "$xrpath " in
...@@ -1482,7 +1485,7 @@ compiler." ...@@ -1482,7 +1485,7 @@ compiler."
;; ;;
*.la) lib="$deplib" ;; *.la) lib="$deplib" ;;
*.$libext) *.$libext)
if test $pass = conv; then if test "$pass" = conv; then
deplibs="$deplib $deplibs" deplibs="$deplib $deplibs"
continue continue
fi fi
...@@ -1490,12 +1493,10 @@ compiler." ...@@ -1490,12 +1493,10 @@ compiler."
lib) lib)
if test "$deplibs_check_method" != pass_all; then if test "$deplibs_check_method" != pass_all; then
echo echo
echo "*** Warning: Trying to link with static lib archive $deplib." echo "*** Warning: This library needs some functionality provided by $deplib."
echo "*** I have the capability to make that library automatically link in when" echo "*** I have the capability to make that library automatically link in when"
echo "*** you link to this library. But I can only do this if you have a" echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which you do not appear to have" echo "*** shared version of the library, which you do not appear to have."
echo "*** because the file extensions .$libext of this argument makes me believe"
echo "*** that it is just a static archive that I should not used here."
else else
echo echo
echo "*** Warning: Linking the shared library $output against the" echo "*** Warning: Linking the shared library $output against the"
...@@ -1505,7 +1506,7 @@ compiler." ...@@ -1505,7 +1506,7 @@ compiler."
continue continue
;; ;;
prog) prog)
if test $pass != link; then if test "$pass" != link; then
deplibs="$deplib $deplibs" deplibs="$deplib $deplibs"
else else
compile_deplibs="$deplib $compile_deplibs" compile_deplibs="$deplib $compile_deplibs"
...@@ -1516,7 +1517,7 @@ compiler." ...@@ -1516,7 +1517,7 @@ compiler."
esac # linkmode esac # linkmode
;; # *.$libext ;; # *.$libext
*.lo | *.$objext) *.lo | *.$objext)
if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
# If there is no dlopen support or we're linking statically, # If there is no dlopen support or we're linking statically,
# we need to preload. # we need to preload.
newdlprefiles="$newdlprefiles $deplib" newdlprefiles="$newdlprefiles $deplib"
...@@ -1539,7 +1540,7 @@ compiler." ...@@ -1539,7 +1540,7 @@ compiler."
fi fi
# Check to see that this really is a libtool archive. # Check to see that this really is a libtool archive.
if (${SED} -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
else else
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
exit 1 exit 1
...@@ -1566,13 +1567,13 @@ compiler." ...@@ -1566,13 +1567,13 @@ compiler."
if test "$linkmode,$pass" = "lib,link" || if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" || test "$linkmode,$pass" = "prog,scan" ||
{ test $linkmode = oldlib && test $linkmode = obj; }; then { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
# Add dl[pre]opened files of deplib # Add dl[pre]opened files of deplib
test -n "$dlopen" && dlfiles="$dlfiles $dlopen" test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
fi fi
if test $pass = conv; then if test "$pass" = conv; then
# Only check for convenience libraries # Only check for convenience libraries
deplibs="$lib $deplibs" deplibs="$lib $deplibs"
if test -z "$libdir"; then if test -z "$libdir"; then
...@@ -1593,7 +1594,7 @@ compiler." ...@@ -1593,7 +1594,7 @@ compiler."
fi fi
tmp_libs="$tmp_libs $deplib" tmp_libs="$tmp_libs $deplib"
done done
elif test $linkmode != prog && test $linkmode != lib; then elif test "$linkmode" != prog && test "$linkmode" != lib; then
$echo "$modename: \`$lib' is not a convenience library" 1>&2 $echo "$modename: \`$lib' is not a convenience library" 1>&2
exit 1 exit 1
fi fi
...@@ -1611,7 +1612,7 @@ compiler." ...@@ -1611,7 +1612,7 @@ compiler."
fi fi
# This library was specified with -dlopen. # This library was specified with -dlopen.
if test $pass = dlopen; then if test "$pass" = dlopen; then
if test -z "$libdir"; then if test -z "$libdir"; then
$echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
exit 1 exit 1
...@@ -1660,7 +1661,7 @@ compiler." ...@@ -1660,7 +1661,7 @@ compiler."
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
# This library was specified with -dlpreopen. # This library was specified with -dlpreopen.
if test $pass = dlpreopen; then if test "$pass" = dlpreopen; then
if test -z "$libdir"; then if test -z "$libdir"; then
$echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
exit 1 exit 1
...@@ -1679,7 +1680,7 @@ compiler." ...@@ -1679,7 +1680,7 @@ compiler."
if test -z "$libdir"; then if test -z "$libdir"; then
# Link the convenience library # Link the convenience library
if test $linkmode = lib; then if test "$linkmode" = lib; then
deplibs="$dir/$old_library $deplibs" deplibs="$dir/$old_library $deplibs"
elif test "$linkmode,$pass" = "prog,link"; then elif test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$dir/$old_library $compile_deplibs" compile_deplibs="$dir/$old_library $compile_deplibs"
...@@ -1690,7 +1691,7 @@ compiler." ...@@ -1690,7 +1691,7 @@ compiler."
continue continue
fi fi
if test $linkmode = prog && test $pass != link; then if test "$linkmode" = prog && test "$pass" != link; then
newlib_search_path="$newlib_search_path $ladir" newlib_search_path="$newlib_search_path $ladir"
deplibs="$lib $deplibs" deplibs="$lib $deplibs"
...@@ -1729,7 +1730,7 @@ compiler." ...@@ -1729,7 +1730,7 @@ compiler."
# Link against this shared library # Link against this shared library
if test "$linkmode,$pass" = "prog,link" || if test "$linkmode,$pass" = "prog,link" ||
{ test $linkmode = lib && test $hardcode_into_libs = yes; }; then { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
# Hardcode the library path. # Hardcode the library path.
# Skip directories that are in the system default run-time # Skip directories that are in the system default run-time
# search path. # search path.
...@@ -1751,7 +1752,7 @@ compiler." ...@@ -1751,7 +1752,7 @@ compiler."
esac esac
;; ;;
esac esac
if test $linkmode = prog; then if test "$linkmode" = prog; then
# We need to hardcode the library path # We need to hardcode the library path
if test -n "$shlibpath_var"; then if test -n "$shlibpath_var"; then
# Make sure the rpath contains only unique directories. # Make sure the rpath contains only unique directories.
...@@ -1801,14 +1802,14 @@ compiler." ...@@ -1801,14 +1802,14 @@ compiler."
# Make a new name for the extract_expsyms_cmds to use # Make a new name for the extract_expsyms_cmds to use
soroot="$soname" soroot="$soname"
soname=`echo $soroot | ${SED} -e 's/^.*\///'` soname=`echo $soroot | sed -e 's/^.*\///'`
newlib="libimp-`echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a"
# If the library has no export list, then create one now # If the library has no export list, then create one now
if test -f "$output_objdir/$soname-def"; then : if test -f "$output_objdir/$soname-def"; then :
else else
$show "extracting exported symbol list from \`$soname'" $show "extracting exported symbol list from \`$soname'"
save_ifs="$IFS"; IFS='~' IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
eval cmds=\"$extract_expsyms_cmds\" eval cmds=\"$extract_expsyms_cmds\"
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
...@@ -1821,7 +1822,7 @@ compiler." ...@@ -1821,7 +1822,7 @@ compiler."
# Create $newlib # Create $newlib
if test -f "$output_objdir/$newlib"; then :; else if test -f "$output_objdir/$newlib"; then :; else
$show "generating import library for \`$soname'" $show "generating import library for \`$soname'"
save_ifs="$IFS"; IFS='~' IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
eval cmds=\"$old_archive_from_expsyms_cmds\" eval cmds=\"$old_archive_from_expsyms_cmds\"
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
...@@ -1835,7 +1836,7 @@ compiler." ...@@ -1835,7 +1836,7 @@ compiler."
linklib=$newlib linklib=$newlib
fi # test -n $old_archive_from_expsyms_cmds fi # test -n $old_archive_from_expsyms_cmds
if test $linkmode = prog || test "$mode" != relink; then if test "$linkmode" = prog || test "$mode" != relink; then
add_shlibpath= add_shlibpath=
add_dir= add_dir=
add= add=
...@@ -1862,14 +1863,6 @@ compiler." ...@@ -1862,14 +1863,6 @@ compiler."
add="$dir/$linklib" add="$dir/$linklib"
elif test "$hardcode_minus_L" = yes; then elif test "$hardcode_minus_L" = yes; then
add_dir="-L$dir" add_dir="-L$dir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case "$libdir" in
[\/]*)
add_dir="-L$inst_prefix_dir$libdir $add_dir"
;;
esac
fi
add="-l$name" add="-l$name"
elif test "$hardcode_shlibpath_var" = yes; then elif test "$hardcode_shlibpath_var" = yes; then
add_shlibpath="$dir" add_shlibpath="$dir"
...@@ -1892,7 +1885,7 @@ compiler." ...@@ -1892,7 +1885,7 @@ compiler."
*) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
esac esac
fi fi
if test $linkmode = prog; then if test "$linkmode" = prog; then
test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
test -n "$add" && compile_deplibs="$add $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs"
else else
...@@ -1909,7 +1902,7 @@ compiler." ...@@ -1909,7 +1902,7 @@ compiler."
fi fi
fi fi
if test $linkmode = prog || test "$mode" = relink; then if test "$linkmode" = prog || test "$mode" = relink; then
add_shlibpath= add_shlibpath=
add_dir= add_dir=
add= add=
...@@ -1917,7 +1910,16 @@ compiler." ...@@ -1917,7 +1910,16 @@ compiler."
if test "$hardcode_direct" = yes; then if test "$hardcode_direct" = yes; then
add="$libdir/$linklib" add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then elif test "$hardcode_minus_L" = yes; then
add_dir="-L$libdir" # Try looking first in the location we're being installed to.
add_dir=
if test -n "$inst_prefix_dir"; then
case "$libdir" in
[\\/]*)
add_dir="-L$inst_prefix_dir$libdir"
;;
esac
fi
add_dir="$add_dir -L$libdir"
add="-l$name" add="-l$name"
elif test "$hardcode_shlibpath_var" = yes; then elif test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in case :$finalize_shlibpath: in
...@@ -1927,19 +1929,20 @@ compiler." ...@@ -1927,19 +1929,20 @@ compiler."
add="-l$name" add="-l$name"
else else
# We cannot seem to hardcode it, guess we'll fake it. # We cannot seem to hardcode it, guess we'll fake it.
add_dir="-L$libdir"
# Try looking first in the location we're being installed to. # Try looking first in the location we're being installed to.
add_dir=
if test -n "$inst_prefix_dir"; then if test -n "$inst_prefix_dir"; then
case "$libdir" in case "$libdir" in
[\/]*) [\\/]*)
add_dir="-L$inst_prefix_dir$libdir $add_dir" add_dir="-L$inst_prefix_dir$libdir"
;; ;;
esac esac
fi fi
add_dir="$add_dir -L$libdir"
add="-l$name" add="-l$name"
fi fi
if test $linkmode = prog; then if test "$linkmode" = prog; then
test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
test -n "$add" && finalize_deplibs="$add $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
else else
...@@ -1947,7 +1950,7 @@ compiler." ...@@ -1947,7 +1950,7 @@ compiler."
test -n "$add" && deplibs="$add $deplibs" test -n "$add" && deplibs="$add $deplibs"
fi fi
fi fi
elif test $linkmode = prog; then elif test "$linkmode" = prog; then
if test "$alldeplibs" = yes && if test "$alldeplibs" = yes &&
{ test "$deplibs_check_method" = pass_all || { test "$deplibs_check_method" = pass_all ||
{ test "$build_libtool_libs" = yes && { test "$build_libtool_libs" = yes &&
...@@ -1977,14 +1980,13 @@ compiler." ...@@ -1977,14 +1980,13 @@ compiler."
# Just print a warning and add the library to dependency_libs so # Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library. # that the program can be linked against the static library.
echo echo
echo "*** Warning: This system can not link to static lib archive $lib." echo "*** Warning: This library needs some functionality provided by $lib."
echo "*** I have the capability to make that library automatically link in when" echo "*** I have the capability to make that library automatically link in when"
echo "*** you link to this library. But I can only do this if you have a" echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which you do not appear to have." echo "*** shared version of the library, which you do not appear to have."
if test "$module" = yes; then if test "$module" = yes; then
echo "*** But as you try to build a module library, libtool will still create " echo "*** Therefore, libtool will create a static module, that should work "
echo "*** a static module, that should work as long as the dlopening application" echo "*** as long as the dlopening application is linked with the -dlopen flag."
echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
if test -z "$global_symbol_pipe"; then if test -z "$global_symbol_pipe"; then
echo echo
echo "*** However, this would only work if libtool was able to extract symbol" echo "*** However, this would only work if libtool was able to extract symbol"
...@@ -2007,9 +2009,9 @@ compiler." ...@@ -2007,9 +2009,9 @@ compiler."
fi fi
fi # link shared/static library? fi # link shared/static library?
if test $linkmode = lib; then if test "$linkmode" = lib; then
if test -n "$dependency_libs" && if test -n "$dependency_libs" &&
{ test $hardcode_into_libs != yes || test $build_old_libs = yes || { test "$hardcode_into_libs" != yes || test $build_old_libs = yes ||
test $link_static = yes; }; then test $link_static = yes; }; then
# Extract -R from dependency_libs # Extract -R from dependency_libs
temp_deplibs= temp_deplibs=
...@@ -2041,7 +2043,7 @@ compiler." ...@@ -2041,7 +2043,7 @@ compiler."
tmp_libs="$tmp_libs $deplib" tmp_libs="$tmp_libs $deplib"
done done
if test $link_all_deplibs != no; then if test "$link_all_deplibs" != no; then
# Add the search paths of all dependency libraries # Add the search paths of all dependency libraries
for deplib in $dependency_libs; do for deplib in $dependency_libs; do
case $deplib in case $deplib in
...@@ -2063,7 +2065,7 @@ compiler." ...@@ -2063,7 +2065,7 @@ compiler."
if grep "^installed=no" $deplib > /dev/null; then if grep "^installed=no" $deplib > /dev/null; then
path="-L$absdir/$objdir" path="-L$absdir/$objdir"
else else
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -z "$libdir"; then if test -z "$libdir"; then
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
exit 1 exit 1
...@@ -2084,15 +2086,15 @@ compiler." ...@@ -2084,15 +2086,15 @@ compiler."
fi # link_all_deplibs != no fi # link_all_deplibs != no
fi # linkmode = lib fi # linkmode = lib
done # for deplib in $libs done # for deplib in $libs
if test $pass = dlpreopen; then if test "$pass" = dlpreopen; then
# Link the dlpreopened libraries before other libraries # Link the dlpreopened libraries before other libraries
for deplib in $save_deplibs; do for deplib in $save_deplibs; do
deplibs="$deplib $deplibs" deplibs="$deplib $deplibs"
done done
fi fi
if test $pass != dlopen; then if test "$pass" != dlopen; then
test $pass != scan && dependency_libs="$newdependency_libs" test "$pass" != scan && dependency_libs="$newdependency_libs"
if test $pass != conv; then if test "$pass" != conv; then
# Make sure lib_search_path contains only unique directories. # Make sure lib_search_path contains only unique directories.
lib_search_path= lib_search_path=
for dir in $newlib_search_path; do for dir in $newlib_search_path; do
...@@ -2150,7 +2152,7 @@ compiler." ...@@ -2150,7 +2152,7 @@ compiler."
deplibs= deplibs=
fi fi
done # for pass done # for pass
if test $linkmode = prog; then if test "$linkmode" = prog; then
dlfiles="$newdlfiles" dlfiles="$newdlfiles"
dlprefiles="$newdlprefiles" dlprefiles="$newdlprefiles"
fi fi
...@@ -2252,7 +2254,7 @@ compiler." ...@@ -2252,7 +2254,7 @@ compiler."
else else
# Parse the version information argument. # Parse the version information argument.
save_ifs="$IFS"; IFS=':' IFS="${IFS= }"; save_ifs="$IFS"; IFS=':'
set dummy $vinfo 0 0 0 set dummy $vinfo 0 0 0
IFS="$save_ifs" IFS="$save_ifs"
...@@ -2268,7 +2270,7 @@ compiler." ...@@ -2268,7 +2270,7 @@ compiler."
# Check that each of the things are valid numbers. # Check that each of the things are valid numbers.
case $current in case $current in
0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; [0-9]*) ;;
*) *)
$echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2
...@@ -2277,7 +2279,7 @@ compiler." ...@@ -2277,7 +2279,7 @@ compiler."
esac esac
case $revision in case $revision in
0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; [0-9]*) ;;
*) *)
$echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2
...@@ -2286,7 +2288,7 @@ compiler." ...@@ -2286,7 +2288,7 @@ compiler."
esac esac
case $age in case $age in
0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; [0-9]*) ;;
*) *)
$echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2
...@@ -2327,21 +2329,16 @@ compiler." ...@@ -2327,21 +2329,16 @@ compiler."
versuffix=".$current"; versuffix=".$current";
;; ;;
irix | nonstopux) irix)
major=`expr $current - $age + 1` major=`expr $current - $age + 1`
verstring="sgi$major.$revision"
case $version_type in
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
esac
verstring="$verstring_prefix$major.$revision"
# Add in all the interfaces that we are compatible with. # Add in all the interfaces that we are compatible with.
loop=$revision loop=$revision
while test $loop != 0; do while test $loop != 0; do
iface=`expr $revision - $loop` iface=`expr $revision - $loop`
loop=`expr $loop - 1` loop=`expr $loop - 1`
verstring="$verstring_prefix$major.$iface:$verstring" verstring="sgi$major.$iface:$verstring"
done done
# Before this point, $major must not contain `.'. # Before this point, $major must not contain `.'.
...@@ -2355,7 +2352,7 @@ compiler." ...@@ -2355,7 +2352,7 @@ compiler."
;; ;;
osf) osf)
major=.`expr $current - $age` major=`expr $current - $age`
versuffix=".$current.$age.$revision" versuffix=".$current.$age.$revision"
verstring="$current.$age.$revision" verstring="$current.$age.$revision"
...@@ -2447,9 +2444,9 @@ compiler." ...@@ -2447,9 +2444,9 @@ compiler."
# Eliminate all temporary directories. # Eliminate all temporary directories.
for path in $notinst_path; do for path in $notinst_path; do
lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'` lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'`
deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'` deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'`
dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'`
done done
if test -n "$xrpath"; then if test -n "$xrpath"; then
...@@ -2500,12 +2497,12 @@ compiler." ...@@ -2500,12 +2497,12 @@ compiler."
*-*-netbsd*) *-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed. # Don't link with libc until the a.out ld.so is fixed.
;; ;;
*-*-openbsd* | *-*-freebsd*) *-*-openbsd*)
# Do not include libc due to us having libc/libc_r. # Do not include libc due to us having libc/libc_r.
;; ;;
*) *)
# Add libc to deplibs on all other systems if necessary. # Add libc to deplibs on all other systems if necessary.
if test $build_libtool_need_lc = "yes"; then if test "$build_libtool_need_lc" = "yes"; then
deplibs="$deplibs -lc" deplibs="$deplibs -lc"
fi fi
;; ;;
...@@ -2561,20 +2558,18 @@ EOF ...@@ -2561,20 +2558,18 @@ EOF
else else
droppeddeps=yes droppeddeps=yes
echo echo
echo "*** Warning: dynamic linker does not accept needed library $i." echo "*** Warning: This library needs some functionality provided by $i."
echo "*** I have the capability to make that library automatically link in when" echo "*** I have the capability to make that library automatically link in when"
echo "*** you link to this library. But I can only do this if you have a" echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which I believe you do not have" echo "*** shared version of the library, which you do not appear to have."
echo "*** because a test_compile did reveal that the linker did not use it for"
echo "*** its dynamic dependency list that programs get resolved with at runtime."
fi fi
else else
newdeplibs="$newdeplibs $i" newdeplibs="$newdeplibs $i"
fi fi
done done
else else
# Error occured in the first compile. Let's try to salvage # Error occured in the first compile. Let's try to salvage the situation:
# the situation: Compile a separate program for each library. # Compile a seperate program for each library.
for i in $deplibs; do for i in $deplibs; do
name="`expr $i : '-l\(.*\)'`" name="`expr $i : '-l\(.*\)'`"
# If $name is empty we are operating on a -L argument. # If $name is empty we are operating on a -L argument.
...@@ -2593,12 +2588,10 @@ EOF ...@@ -2593,12 +2588,10 @@ EOF
else else
droppeddeps=yes droppeddeps=yes
echo echo
echo "*** Warning: dynamic linker does not accept needed library $i." echo "*** Warning: This library needs some functionality provided by $i."
echo "*** I have the capability to make that library automatically link in when" echo "*** I have the capability to make that library automatically link in when"
echo "*** you link to this library. But I can only do this if you have a" echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which you do not appear to have" echo "*** shared version of the library, which you do not appear to have."
echo "*** because a test_compile did reveal that the linker did not use this one"
echo "*** as a dynamic dependency that programs can get resolved with at runtime."
fi fi
else else
droppeddeps=yes droppeddeps=yes
...@@ -2637,14 +2630,14 @@ EOF ...@@ -2637,14 +2630,14 @@ EOF
# but so what? # but so what?
potlib="$potent_lib" potlib="$potent_lib"
while test -h "$potlib" 2>/dev/null; do while test -h "$potlib" 2>/dev/null; do
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` potliblink=`ls -ld $potlib | sed 's/.* -> //'`
case $potliblink in case $potliblink in
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
esac esac
done done
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
| ${SED} 10q \ | sed 10q \
| egrep "$file_magic_regex" > /dev/null; then | egrep "$file_magic_regex" > /dev/null; then
newdeplibs="$newdeplibs $a_deplib" newdeplibs="$newdeplibs $a_deplib"
a_deplib="" a_deplib=""
...@@ -2655,17 +2648,10 @@ EOF ...@@ -2655,17 +2648,10 @@ EOF
if test -n "$a_deplib" ; then if test -n "$a_deplib" ; then
droppeddeps=yes droppeddeps=yes
echo echo
echo "*** Warning: linker path does not have real file for library $a_deplib." echo "*** Warning: This library needs some functionality provided by $a_deplib."
echo "*** I have the capability to make that library automatically link in when" echo "*** I have the capability to make that library automatically link in when"
echo "*** you link to this library. But I can only do this if you have a" echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which you do not appear to have" echo "*** shared version of the library, which you do not appear to have."
echo "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
echo "*** with $libname but no candidates were found. (...for file magic test)"
else
echo "*** with $libname and none of the candidates passed a file format test"
echo "*** using a file magic. Last file checked: $potlib"
fi
fi fi
else else
# Add a -L argument. # Add a -L argument.
...@@ -2684,9 +2670,8 @@ EOF ...@@ -2684,9 +2670,8 @@ EOF
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
potential_libs=`ls $i/$libname[.-]* 2>/dev/null` potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do for potent_lib in $potential_libs; do
potlib="$potent_lib" # see symlink-check below in file_magic test
if eval echo \"$potent_lib\" 2>/dev/null \ if eval echo \"$potent_lib\" 2>/dev/null \
| ${SED} 10q \ | sed 10q \
| egrep "$match_pattern_regex" > /dev/null; then | egrep "$match_pattern_regex" > /dev/null; then
newdeplibs="$newdeplibs $a_deplib" newdeplibs="$newdeplibs $a_deplib"
a_deplib="" a_deplib=""
...@@ -2697,17 +2682,10 @@ EOF ...@@ -2697,17 +2682,10 @@ EOF
if test -n "$a_deplib" ; then if test -n "$a_deplib" ; then
droppeddeps=yes droppeddeps=yes
echo echo
echo "*** Warning: linker path does not have real file for library $a_deplib." echo "*** Warning: This library needs some functionality provided by $a_deplib."
echo "*** I have the capability to make that library automatically link in when" echo "*** I have the capability to make that library automatically link in when"
echo "*** you link to this library. But I can only do this if you have a" echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which you do not appear to have" echo "*** shared version of the library, which you do not appear to have."
echo "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
echo "*** with $libname but no candidates were found. (...for regex pattern test)"
else
echo "*** with $libname and none of the candidates passed a file format test"
echo "*** using a regex pattern. Last file checked: $potlib"
fi
fi fi
else else
# Add a -L argument. # Add a -L argument.
...@@ -2797,7 +2775,7 @@ EOF ...@@ -2797,7 +2775,7 @@ EOF
# Test again, we may have decided not to build it any more # Test again, we may have decided not to build it any more
if test "$build_libtool_libs" = yes; then if test "$build_libtool_libs" = yes; then
if test $hardcode_into_libs = yes; then if test "$hardcode_into_libs" = yes; then
# Hardcode the library paths # Hardcode the library paths
hardcode_libdirs= hardcode_libdirs=
dep_rpath= dep_rpath=
...@@ -2898,7 +2876,7 @@ EOF ...@@ -2898,7 +2876,7 @@ EOF
export_symbols="$output_objdir/$libname.exp" export_symbols="$output_objdir/$libname.exp"
$run $rm $export_symbols $run $rm $export_symbols
eval cmds=\"$export_symbols_cmds\" eval cmds=\"$export_symbols_cmds\"
save_ifs="$IFS"; IFS='~' IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
$show "$cmd" $show "$cmd"
...@@ -2972,20 +2950,9 @@ EOF ...@@ -2972,20 +2950,9 @@ EOF
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
eval cmds=\"$archive_expsym_cmds\" eval cmds=\"$archive_expsym_cmds\"
else else
save_deplibs="$deplibs"
for conv in $convenience; do
tmp_deplibs=
for test_deplib in $deplibs; do
if test "$test_deplib" != "$conv"; then
tmp_deplibs="$tmp_deplibs $test_deplib"
fi
done
deplibs="$tmp_deplibs"
done
eval cmds=\"$archive_cmds\" eval cmds=\"$archive_cmds\"
deplibs="$save_deplibs"
fi fi
save_ifs="$IFS"; IFS='~' IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
$show "$cmd" $show "$cmd"
...@@ -3113,7 +3080,7 @@ EOF ...@@ -3113,7 +3080,7 @@ EOF
output="$obj" output="$obj"
eval cmds=\"$reload_cmds\" eval cmds=\"$reload_cmds\"
save_ifs="$IFS"; IFS='~' IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
$show "$cmd" $show "$cmd"
...@@ -3149,7 +3116,7 @@ EOF ...@@ -3149,7 +3116,7 @@ EOF
reload_objs="$libobjs $reload_conv_objs" reload_objs="$libobjs $reload_conv_objs"
output="$libobj" output="$libobj"
eval cmds=\"$reload_cmds\" eval cmds=\"$reload_cmds\"
save_ifs="$IFS"; IFS='~' IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
$show "$cmd" $show "$cmd"
...@@ -3182,7 +3149,7 @@ EOF ...@@ -3182,7 +3149,7 @@ EOF
prog) prog)
case $host in case $host in
*cygwin*) output=`echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; *cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;;
esac esac
if test -n "$vinfo"; then if test -n "$vinfo"; then
$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
...@@ -3204,13 +3171,6 @@ EOF ...@@ -3204,13 +3171,6 @@ EOF
# On Rhapsody replace the C library is the System framework # On Rhapsody replace the C library is the System framework
compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
case $host in
*darwin*)
# Don't allow lazy linking, it breaks C++ global constructors
compile_command="$compile_command ${wl}-bind_at_load"
finalize_command="$finalize_command ${wl}-bind_at_load"
;;
esac
;; ;;
esac esac
...@@ -3377,9 +3337,9 @@ extern \"C\" { ...@@ -3377,9 +3337,9 @@ extern \"C\" {
if test -z "$export_symbols"; then if test -z "$export_symbols"; then
export_symbols="$output_objdir/$output.exp" export_symbols="$output_objdir/$output.exp"
$run $rm $export_symbols $run $rm $export_symbols
$run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
else else
$run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
$run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
$run eval 'mv "$nlist"T "$nlist"' $run eval 'mv "$nlist"T "$nlist"'
fi fi
...@@ -3387,7 +3347,7 @@ extern \"C\" { ...@@ -3387,7 +3347,7 @@ extern \"C\" {
for arg in $dlprefiles; do for arg in $dlprefiles; do
$show "extracting global C symbols from \`$arg'" $show "extracting global C symbols from \`$arg'"
name=`echo "$arg" | ${SED} -e 's%^.*/%%'` name=`echo "$arg" | sed -e 's%^.*/%%'`
$run eval 'echo ": $name " >> "$nlist"' $run eval 'echo ": $name " >> "$nlist"'
$run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
done done
...@@ -3402,13 +3362,7 @@ extern \"C\" { ...@@ -3402,13 +3362,7 @@ extern \"C\" {
fi fi
# Try sorting and uniquifying the output. # Try sorting and uniquifying the output.
if grep -v "^: " < "$nlist" | if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then
if sort -k 3 </dev/null >/dev/null 2>&1; then
sort -k 3
else
sort +2
fi |
uniq > "$nlist"S; then
: :
else else
grep -v "^: " < "$nlist" > "$nlist"S grep -v "^: " < "$nlist" > "$nlist"S
...@@ -3630,7 +3584,7 @@ static const void *lt_preloaded_setup() { ...@@ -3630,7 +3584,7 @@ static const void *lt_preloaded_setup() {
relink_command="$var=\"$var_value\"; export $var; $relink_command" relink_command="$var=\"$var_value\"; export $var; $relink_command"
fi fi
done done
relink_command="(cd `pwd`; $relink_command)" relink_command="cd `pwd`; $relink_command"
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
fi fi
...@@ -3650,7 +3604,7 @@ static const void *lt_preloaded_setup() { ...@@ -3650,7 +3604,7 @@ static const void *lt_preloaded_setup() {
# win32 will think the script is a binary if it has # win32 will think the script is a binary if it has
# a .exe suffix, so we strip it off here. # a .exe suffix, so we strip it off here.
case $output in case $output in
*.exe) output=`echo $output|${SED} 's,.exe$,,'` ;; *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
esac esac
# test for cygwin because mv fails w/o .exe extensions # test for cygwin because mv fails w/o .exe extensions
case $host in case $host in
...@@ -3674,7 +3628,7 @@ static const void *lt_preloaded_setup() { ...@@ -3674,7 +3628,7 @@ static const void *lt_preloaded_setup() {
# Sed substitution that helps us do robust quoting. It backslashifies # Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings. # metacharacters that are still active within double-quoted strings.
Xsed="${SED}"' -e 1s/^X//' Xsed='sed -e 1s/^X//'
sed_quote_subst='$sed_quote_subst' sed_quote_subst='$sed_quote_subst'
# The HP-UX ksh and POSIX shell print the target directory to stdout # The HP-UX ksh and POSIX shell print the target directory to stdout
...@@ -3712,7 +3666,7 @@ else ...@@ -3712,7 +3666,7 @@ else
test \"x\$thisdir\" = \"x\$file\" && thisdir=. test \"x\$thisdir\" = \"x\$file\" && thisdir=.
# Follow symbolic links until we get to the real thisdir. # Follow symbolic links until we get to the real thisdir.
file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
while test -n \"\$file\"; do while test -n \"\$file\"; do
destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
...@@ -3725,7 +3679,7 @@ else ...@@ -3725,7 +3679,7 @@ else
fi fi
file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
done done
# Try to get the absolute directory name. # Try to get the absolute directory name.
...@@ -3739,7 +3693,7 @@ else ...@@ -3739,7 +3693,7 @@ else
progdir=\"\$thisdir/$objdir\" progdir=\"\$thisdir/$objdir\"
if test ! -f \"\$progdir/\$program\" || \\ if test ! -f \"\$progdir/\$program\" || \\
{ file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
test \"X\$file\" != \"X\$progdir/\$program\"; }; then test \"X\$file\" != \"X\$progdir/\$program\"; }; then
file=\"\$\$-\$program\" file=\"\$\$-\$program\"
...@@ -3785,7 +3739,7 @@ else ...@@ -3785,7 +3739,7 @@ else
$shlibpath_var=\"$temp_rpath\$$shlibpath_var\" $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
# Some systems cannot cope with colon-terminated $shlibpath_var # Some systems cannot cope with colon-terminated $shlibpath_var
# The second colon is a workaround for a bug in BeOS R4 ${SED} # The second colon is a workaround for a bug in BeOS R4 sed
$shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
export $shlibpath_var export $shlibpath_var
...@@ -3927,7 +3881,7 @@ fi\ ...@@ -3927,7 +3881,7 @@ fi\
eval cmds=\"$old_archive_cmds\" eval cmds=\"$old_archive_cmds\"
fi fi
save_ifs="$IFS"; IFS='~' IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
$show "$cmd" $show "$cmd"
...@@ -3960,7 +3914,7 @@ fi\ ...@@ -3960,7 +3914,7 @@ fi\
fi fi
done done
# Quote the link command for shipping. # Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@"
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
# Only create the output if not a dry run. # Only create the output if not a dry run.
...@@ -3977,21 +3931,58 @@ fi\ ...@@ -3977,21 +3931,58 @@ fi\
case $deplib in case $deplib in
*.la) *.la)
name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -z "$libdir"; then if test -z "$libdir"; then
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
exit 1 exit 1
fi fi
newdependency_libs="$newdependency_libs $libdir/$name" # We do not want portage's install root ($D) present. Check only for
# this if the .la is being installed.
if test "$installed" = yes && test "$D"; then
eval mynewdependency_lib="`echo "$libdir/$name" |sed -e "s:$D::g" -e 's://:/:g'`"
else
mynewdependency_lib="$libdir/$name"
fi
# Do not add duplicates
if test "$mynewdependency_lib"; then
if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
newdependency_libs="$newdependency_libs $mynewdependency_lib"
fi
fi
;;
*)
if test "$installed" = yes; then
# Rather use S=WORKDIR if our version of portage supports it.
# This is because some ebuild (gcc) do not use $S as buildroot.
if test "$PWORKDIR"; then
S="$PWORKDIR"
fi
# We do not want portage's build root ($S) present.
if test -n "`echo $deplib |grep -e "$S"`" && test "$S"; then
mynewdependency_lib=""
# We do not want portage's install root ($D) present.
elif test -n "`echo $deplib |grep -e "$D"`" && test "$D"; then
eval mynewdependency_lib="`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`"
else
mynewdependency_lib="$deplib"
fi
else
mynewdependency_lib="$deplib"
fi
# Do not add duplicates
if test "$mynewdependency_lib"; then
if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
newdependency_libs="$newdependency_libs $mynewdependency_lib"
fi
fi
;; ;;
*) newdependency_libs="$newdependency_libs $deplib" ;;
esac esac
done done
dependency_libs="$newdependency_libs" dependency_libs="$newdependency_libs"
newdlfiles= newdlfiles=
for lib in $dlfiles; do for lib in $dlfiles; do
name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
if test -z "$libdir"; then if test -z "$libdir"; then
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
exit 1 exit 1
...@@ -4002,7 +3993,7 @@ fi\ ...@@ -4002,7 +3993,7 @@ fi\
newdlprefiles= newdlprefiles=
for lib in $dlprefiles; do for lib in $dlprefiles; do
name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
if test -z "$libdir"; then if test -z "$libdir"; then
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
exit 1 exit 1
...@@ -4017,6 +4008,10 @@ fi\ ...@@ -4017,6 +4008,10 @@ fi\
case $host,$output,$installed,$module,$dlname in case $host,$output,$installed,$module,$dlname in
*cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
esac esac
# Do not add duplicates
if test "$installed" = yes && test "$D"; then
install_libdir="`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'`"
fi
$echo > $output "\ $echo > $output "\
# $outputname - a libtool library file # $outputname - a libtool library file
# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
...@@ -4226,7 +4221,7 @@ relink_command=\"$relink_command\"" ...@@ -4226,7 +4221,7 @@ relink_command=\"$relink_command\""
*.la) *.la)
# Check to see that this really is a libtool archive. # Check to see that this really is a libtool archive.
if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
else else
$echo "$modename: \`$file' is not a valid libtool archive" 1>&2 $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2 $echo "$help" 1>&2
...@@ -4261,23 +4256,23 @@ relink_command=\"$relink_command\"" ...@@ -4261,23 +4256,23 @@ relink_command=\"$relink_command\""
dir="$dir$objdir" dir="$dir$objdir"
if test -n "$relink_command"; then if test -n "$relink_command"; then
# Determine the prefix the user has applied to our future dir. # Determine the prefix the user has applied to our future dir.
inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
# Don't allow the user to place us outside of our expected # Don't allow the user to place us outside of our expected
# location b/c this prevents finding dependent libraries that # location b/c this prevents finding dependent libraries that
# are installed to the same prefix. # are installed to the same prefix.
if test "$inst_prefix_dir" = "$destdir"; then if test "$inst_prefix_dir" = "$destdir"; then
$echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
exit 1 exit 1
fi fi
if test -n "$inst_prefix_dir"; then if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command. # Stick the inst_prefix_dir data into the link command.
relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
else else
relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
fi fi
$echo "$modename: warning: relinking \`$file'" 1>&2 $echo "$modename: warning: relinking \`$file'" 1>&2
$show "$relink_command" $show "$relink_command"
...@@ -4320,7 +4315,7 @@ relink_command=\"$relink_command\"" ...@@ -4320,7 +4315,7 @@ relink_command=\"$relink_command\""
# Do each command in the postinstall commands. # Do each command in the postinstall commands.
lib="$destdir/$realname" lib="$destdir/$realname"
eval cmds=\"$postinstall_cmds\" eval cmds=\"$postinstall_cmds\"
save_ifs="$IFS"; IFS='~' IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
$show "$cmd" $show "$cmd"
...@@ -4393,27 +4388,19 @@ relink_command=\"$relink_command\"" ...@@ -4393,27 +4388,19 @@ relink_command=\"$relink_command\""
fi fi
# Do a test to see if this is really a libtool program. # Do a test to see if this is really a libtool program.
case $host in if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
*cygwin*|*mingw*)
wrapper=`echo $file | ${SED} -e 's,.exe$,,'`
;;
*)
wrapper=$file
;;
esac
if (${SED} -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
notinst_deplibs= notinst_deplibs=
relink_command= relink_command=
# If there is no directory component, then add one. # If there is no directory component, then add one.
case $file in case $file in
*/* | *\\*) . $wrapper ;; */* | *\\*) . $file ;;
*) . ./$wrapper ;; *) . ./$file ;;
esac esac
# Check the variables that should have been set. # Check the variables that should have been set.
if test -z "$notinst_deplibs"; then if test -z "$notinst_deplibs"; then
$echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
exit 1 exit 1
fi fi
...@@ -4438,8 +4425,8 @@ relink_command=\"$relink_command\"" ...@@ -4438,8 +4425,8 @@ relink_command=\"$relink_command\""
relink_command= relink_command=
# If there is no directory component, then add one. # If there is no directory component, then add one.
case $file in case $file in
*/* | *\\*) . $wrapper ;; */* | *\\*) . $file ;;
*) . ./$wrapper ;; *) . ./$file ;;
esac esac
outputname= outputname=
...@@ -4447,7 +4434,11 @@ relink_command=\"$relink_command\"" ...@@ -4447,7 +4434,11 @@ relink_command=\"$relink_command\""
if test "$finalize" = yes && test -z "$run"; then if test "$finalize" = yes && test -z "$run"; then
tmpdir="/tmp" tmpdir="/tmp"
test -n "$TMPDIR" && tmpdir="$TMPDIR" test -n "$TMPDIR" && tmpdir="$TMPDIR"
tmpdir="$tmpdir/libtool-$$" tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`
if test $? = 0 ; then :
else
tmpdir="$tmpdir/libtool-$$"
fi
if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
else else
$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
...@@ -4487,7 +4478,7 @@ relink_command=\"$relink_command\"" ...@@ -4487,7 +4478,7 @@ relink_command=\"$relink_command\""
destfile=$destfile.exe destfile=$destfile.exe
;; ;;
*:*.exe) *:*.exe)
destfile=`echo $destfile | ${SED} -e 's,.exe$,,'` destfile=`echo $destfile | sed -e 's,.exe$,,'`
;; ;;
esac esac
;; ;;
...@@ -4515,7 +4506,7 @@ relink_command=\"$relink_command\"" ...@@ -4515,7 +4506,7 @@ relink_command=\"$relink_command\""
# Do each command in the postinstall commands. # Do each command in the postinstall commands.
eval cmds=\"$old_postinstall_cmds\" eval cmds=\"$old_postinstall_cmds\"
save_ifs="$IFS"; IFS='~' IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
$show "$cmd" $show "$cmd"
...@@ -4553,7 +4544,7 @@ relink_command=\"$relink_command\"" ...@@ -4553,7 +4544,7 @@ relink_command=\"$relink_command\""
if test -n "$finish_cmds"; then if test -n "$finish_cmds"; then
# Do each command in the finish commands. # Do each command in the finish commands.
eval cmds=\"$finish_cmds\" eval cmds=\"$finish_cmds\"
save_ifs="$IFS"; IFS='~' IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
$show "$cmd" $show "$cmd"
...@@ -4635,7 +4626,7 @@ relink_command=\"$relink_command\"" ...@@ -4635,7 +4626,7 @@ relink_command=\"$relink_command\""
case $file in case $file in
*.la) *.la)
# Check to see that this really is a libtool archive. # Check to see that this really is a libtool archive.
if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
else else
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2 $echo "$help" 1>&2
...@@ -4706,7 +4697,7 @@ relink_command=\"$relink_command\"" ...@@ -4706,7 +4697,7 @@ relink_command=\"$relink_command\""
-*) ;; -*) ;;
*) *)
# Do a test to see if this is really a libtool program. # Do a test to see if this is really a libtool program.
if (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
# If there is no directory component, then add one. # If there is no directory component, then add one.
case $file in case $file in
*/* | *\\*) . $file ;; */* | *\\*) . $file ;;
...@@ -4738,7 +4729,7 @@ relink_command=\"$relink_command\"" ...@@ -4738,7 +4729,7 @@ relink_command=\"$relink_command\""
fi fi
# Now prepare to actually exec the command. # Now prepare to actually exec the command.
exec_cmd="\$cmd$args" exec_cmd='"$cmd"$args'
else else
# Display what would be done. # Display what would be done.
if test -n "$shlibpath_var"; then if test -n "$shlibpath_var"; then
...@@ -4815,7 +4806,7 @@ relink_command=\"$relink_command\"" ...@@ -4815,7 +4806,7 @@ relink_command=\"$relink_command\""
case $name in case $name in
*.la) *.la)
# Possibly a libtool archive, so verify it. # Possibly a libtool archive, so verify it.
if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
. $dir/$name . $dir/$name
# Delete the libtool libraries and symlinks. # Delete the libtool libraries and symlinks.
...@@ -4829,7 +4820,7 @@ relink_command=\"$relink_command\"" ...@@ -4829,7 +4820,7 @@ relink_command=\"$relink_command\""
if test -n "$library_names"; then if test -n "$library_names"; then
# Do each command in the postuninstall commands. # Do each command in the postuninstall commands.
eval cmds=\"$postuninstall_cmds\" eval cmds=\"$postuninstall_cmds\"
save_ifs="$IFS"; IFS='~' IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
$show "$cmd" $show "$cmd"
...@@ -4844,7 +4835,7 @@ relink_command=\"$relink_command\"" ...@@ -4844,7 +4835,7 @@ relink_command=\"$relink_command\""
if test -n "$old_library"; then if test -n "$old_library"; then
# Do each command in the old_postuninstall commands. # Do each command in the old_postuninstall commands.
eval cmds=\"$old_postuninstall_cmds\" eval cmds=\"$old_postuninstall_cmds\"
save_ifs="$IFS"; IFS='~' IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
$show "$cmd" $show "$cmd"
...@@ -4870,7 +4861,7 @@ relink_command=\"$relink_command\"" ...@@ -4870,7 +4861,7 @@ relink_command=\"$relink_command\""
*) *)
# Do a test to see if this is a libtool program. # Do a test to see if this is a libtool program.
if test $mode = clean && if test $mode = clean &&
(${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
relink_command= relink_command=
. $dir/$file . $dir/$file
......
main.c
View file @ d94eaf58
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "path.h" #include "path.h"
#include "buffer.h" #include "buffer.h"
#include "stats.h" #include "stats.h"
#include "sig_handlers.h"
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
...@@ -36,6 +37,7 @@ ...@@ -36,6 +37,7 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <signal.h> #include <signal.h>
#include <fcntl.h>
void usage(char * argv[]) { void usage(char * argv[]) {
fprintf(stderr,"usage: %s <port> <mp3/ogg dir> <playlist dir> <log file> <error file>\n",argv[0]); fprintf(stderr,"usage: %s <port> <mp3/ogg dir> <playlist dir> <log file> <error file>\n",argv[0]);
...@@ -139,28 +141,29 @@ int main(int argc, char * argv[]) { ...@@ -139,28 +141,29 @@ int main(int argc, char * argv[]) {
exit(-1); exit(-1);
} }
} }
initSigHandlers();
initInterfaces();
if((listenSocket = establish(port))<0) { if((listenSocket = establish(port))<0) {
fprintf(stderr,"error bindping port\n"); fprintf(stderr,"error binding port\n");
return -1; return -1;
} }
initInterfaces();
initPlaylist(); initPlaylist();
initStats(); initStats();
initPlayer();
initBuffer(); initBuffer();
daemon(0,0); daemon(0,0);
dup2(fileno(out),STDOUT_FILENO); dup2(fileno(out),STDOUT_FILENO);
dup2(fileno(err),STDERR_FILENO); dup2(fileno(err),STDERR_FILENO);
fclose(stdin);
while(COMMAND_RETURN_KILL!=readInputFromInterfaces()) { while(COMMAND_RETURN_KILL!=doIOForInterfaces()) {
flushAllInterfaceBuffers();
nextSongInPlaylistIfPlayerStopped(); nextSongInPlaylistIfPlayerStopped();
playerProcessMessages(); playerProcessMessages();
getConnections(listenSocket);
closeOldInterfaces(); closeOldInterfaces();
} }
......
mkinstalldirs
View file @ d94eaf58
...@@ -12,18 +12,29 @@ Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." ...@@ -12,18 +12,29 @@ Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
# process command line arguments # process command line arguments
while test $# -gt 0 ; do while test $# -gt 0 ; do
case "${1}" in case $1 in
-h | --help | --h* ) # -h for help -h | --help | --h*) # -h for help
echo "${usage}" 1>&2; exit 0 ;; echo "$usage" 1>&2
-m ) # -m PERM arg exit 0
shift ;;
test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } -m) # -m PERM arg
dirmode="${1}" shift
shift ;; test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-- ) shift; break ;; # stop option processing dirmode=$1
-* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option shift
* ) break ;; # first non-opt arg ;;
esac --) # stop option processing
shift
break
;;
-*) # unknown option
echo "$usage" 1>&2
exit 1
;;
*) # first non-opt arg
break
;;
esac
done done
for file for file
...@@ -36,64 +47,65 @@ do ...@@ -36,64 +47,65 @@ do
done done
case $# in case $# in
0) exit 0 ;; 0) exit 0 ;;
esac esac
case $dirmode in case $dirmode in
'') '')
if mkdir -p -- . 2>/dev/null; then if mkdir -p -- . 2>/dev/null; then
echo "mkdir -p -- $*" echo "mkdir -p -- $*"
exec mkdir -p -- "$@" exec mkdir -p -- "$@"
fi ;; fi
*) ;;
if mkdir -m "$dirmode" -p -- . 2>/dev/null; then *)
echo "mkdir -m $dirmode -p -- $*" if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
exec mkdir -m "$dirmode" -p -- "$@" echo "mkdir -m $dirmode -p -- $*"
fi ;; exec mkdir -m "$dirmode" -p -- "$@"
fi
;;
esac esac
for file for file
do do
set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
shift shift
pathcomp= pathcomp=
for d for d
do do
pathcomp="$pathcomp$d" pathcomp="$pathcomp$d"
case "$pathcomp" in case $pathcomp in
-* ) pathcomp=./$pathcomp ;; -*) pathcomp=./$pathcomp ;;
esac esac
if test ! -d "$pathcomp"; then if test ! -d "$pathcomp"; then
echo "mkdir $pathcomp" echo "mkdir $pathcomp"
mkdir "$pathcomp" || lasterr=$? mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then if test ! -d "$pathcomp"; then
errstatus=$lasterr errstatus=$lasterr
else else
if test ! -z "$dirmode"; then if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp" echo "chmod $dirmode $pathcomp"
lasterr=""
lasterr="" chmod "$dirmode" "$pathcomp" || lasterr=$?
chmod "$dirmode" "$pathcomp" || lasterr=$?
if test ! -z "$lasterr"; then
if test ! -z "$lasterr"; then errstatus=$lasterr
errstatus=$lasterr fi
fi fi
fi fi
fi fi
fi
pathcomp="$pathcomp/"
pathcomp="$pathcomp/" done
done
done done
exit $errstatus exit $errstatus
# Local Variables: # Local Variables:
# mode: shell-script # mode: shell-script
# sh-indentation: 3 # sh-indentation: 2
# End: # End:
# mkinstalldirs ends here # mkinstalldirs ends here
mpd.1 0 → 100644
View file @ d94eaf58
.TH "Music Player Daemon" 1
.SH NAME
mpd \- A daemon for playing music (mp3, ogg vorbis, and flac)
.SH SYNOPSIS
.B mpd
<port> <music dir> <playlist dir> <log file> <error file>
.br
.B mpd
<config file>
.SH DESCRIPTION
A daemon for playing music (mp3, ogg vorbis, and flac). Music is played
through the server's audio device. The daemon stores info about all available
music, and this info can be easily searched and retrieved. Player control, info
retrieval, and playlist management can all be managed remotely.
Read more about MPD on http://musicpd.sourceforge.net
.SH PARAMETERS
Below are a list of paramters that can be specified in the config file. Each line in the config file should be of the form:
.br
parameter "value"
.TP
.B port <port>
This specifies the port that MPD listens on. This parameter is required. This is typically 2100.
.TP
.B music_directory <directory>
This specifies the directory where music is located. This paramter is required. The directory path should be an absolute path.
.TP
.B playlist_directory <directory>
This specifies the directory where saved playlists are stored. This paramter is required. The directory path should be an absolute path.
.TP
.B log_file <file>
This specifies where the log file should be located. This paramter is required. The file path should be an absolute path.
.TP
.B error_file <file>
This specifies where the error file should be located. This paramter is required. The file path should be an absolute path.
.TP
.B connection_timeout <seconds>
If a client does not send any new data in this time period, the connection is closed. The default is 60 seconds.
.TP
.B max_connections <int>
This specifies the maximum number of clients that can be connected to MPD. The default is 5 connections.
.TP
.B mixer_device <mixer dev>
This specifies which mixer to use. The default is /dev/mixer.
.TP
.B max_playlist_length <int>
This specifies the maximum number of songs that can be in the playlist. The default is 4096 songs.
.TP
.B buffer_before play <0-100%>
This specifies the amount of buffer that will be filled before a song begins playing. The default is 25%.
.TP
.B stop_on_error <yes or no>
This specifies wether playback should stop or goto the next song when an error occurs. The default is no.
.TP
.B max_command_list_size <size in kB>
This specifies the maximum size a command list can be (in kilobytes). The default is 2048 kilobytes.
.TP
.B max_output_buffer_size <size in kB>
This specifies the maximum size of the output buffer to a client (in kilobytes).
The default is 2048 kilobytes.
.SH FILES
A file is created in the playlist directory called ".mpddb". This file is used to store information about songs located in the music directory.
mpdconf.example
View file @ d94eaf58
...@@ -9,3 +9,5 @@ max_connections "5" ...@@ -9,3 +9,5 @@ max_connections "5"
max_playlist_length "4096" max_playlist_length "4096"
buffer_before_play "25%" buffer_before_play "25%"
stop_on_error "yes" stop_on_error "yes"
max_command_list_size "2048"
max_output_buffer_size "2048"
player.c
View file @ d94eaf58
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include <signal.h> #include <signal.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h>
#define PLAYER_TYPE_MP3 0 #define PLAYER_TYPE_MP3 0
#define PLAYER_TYPE_OGG 1 #define PLAYER_TYPE_OGG 1
...@@ -98,16 +99,6 @@ void player_sigHandler(int signal) { ...@@ -98,16 +99,6 @@ void player_sigHandler(int signal) {
} }
} }
void initPlayer() {
struct sigaction sa;
sa.sa_flags = 0;
sigemptyset(&sa.sa_mask);
sa.sa_handler = SIG_IGN;
sigaction(SIGPIPE,&sa,NULL);
sa.sa_handler = player_sigHandler;
sigaction(SIGCHLD,&sa,NULL);
}
int playerInit(char * file, int playerType) { int playerInit(char * file, int playerType) {
int fd_send[2], fd_recv[2]; int fd_send[2], fd_recv[2];
...@@ -126,6 +117,9 @@ int playerInit(char * file, int playerType) { ...@@ -126,6 +117,9 @@ int playerInit(char * file, int playerType) {
player_pid = fork(); player_pid = fork();
fcntl(player_recv,F_SETOWN,(int)getpid());
fcntl(player_recv,F_SETFL,fcntl(player_recv,F_GETFL) | O_ASYNC);
if(player_pid==0) { if(player_pid==0) {
FILE * in; FILE * in;
FILE * out; FILE * out;
...@@ -254,7 +248,7 @@ int playerPause(FILE * fp) { ...@@ -254,7 +248,7 @@ int playerPause(FILE * fp) {
while(!player_leavePause) { while(!player_leavePause) {
playerProcessMessages(); playerProcessMessages();
usleep(10); usleep(1);
} }
} }
return 0; return 0;
......
player.h
View file @ d94eaf58
...@@ -36,6 +36,8 @@ ...@@ -36,6 +36,8 @@
#define PLAYER_EXIT_ERROR_AUDIO 2 #define PLAYER_EXIT_ERROR_AUDIO 2
#define PLAYER_EXIT_ERROR_SYSTEM 3 #define PLAYER_EXIT_ERROR_SYSTEM 3
void player_sigHandler(int signal);
int playerPlay(FILE * fp, char * file); int playerPlay(FILE * fp, char * file);
int playerPause(FILE * fp); int playerPause(FILE * fp);
...@@ -54,6 +56,4 @@ void clearPlayerError(); ...@@ -54,6 +56,4 @@ void clearPlayerError();
char * getPlayerError(); char * getPlayerError();
void initPlayer();
#endif #endif
sig_handlers.c 0 → 100644
View file @ d94eaf58
#include "sig_handlers.h"
#include "player.h"
#include <signal.h>
void initSigHandlers() {
struct sigaction sa;
sa.sa_flags = 0;
sigemptyset(&sa.sa_mask);
sa.sa_handler = SIG_IGN;
sigaction(SIGPIPE,&sa,NULL);
sigaction(SIGIO,&sa,NULL);
sa.sa_handler = player_sigHandler;
sigaction(SIGCHLD,&sa,NULL);
}
sig_handlers.h 0 → 100644
View file @ d94eaf58
#ifndef SIG_HANDLERS_H
#define SIG_HANDLERS_H
void initSigHandlers();
#endif
song.c
View file @ d94eaf58
...@@ -56,7 +56,7 @@ Song * newSong(char * file) { ...@@ -56,7 +56,7 @@ Song * newSong(char * file) {
} }
#endif #endif
#ifdef HAVE_MAD #ifdef HAVE_MAD
if(song->mtime = isMp3(file)) { if((song->mtime = isMp3(file))) {
song->tag = id3Dup(file); song->tag = id3Dup(file);
return song; return song;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment