removed --enable-static configure option

This commit is contained in:
darkeye 2001-09-18 18:00:02 +00:00
parent 1bf117416d
commit 4a22f807dc
5 changed files with 6 additions and 62 deletions

View File

@ -4,6 +4,8 @@
Ogg Vorbis support thanks to aNa|0Gue <analogue@glop.org>
o added support for SUN Solaris
o removed long command line options (as these are extensions to UNIX)
o removed configure option to specify location of lame library
o removed configure option to compile static executable
09-09-2001: DarkIce 0.5 released

View File

@ -20,15 +20,7 @@ DarkIce tarball. Go to the directory you extracted it, and try:
./configure --help
This will give you all the compile configuration options. Options of
particlar interest are:
--enable-static link everything into the executable statically [no]
Use --enable-static to build a statically linked executable. This is good
if you plan to deploy DarkIce on a system where either the Lame shared
object is not installed or its location is unknown. In general it is a
better idea to link dynamically (not using this option).
This will give you all the compile configuration options.
On Solaris systems, for some reason the configure script does not
find the include file lame/lame.h if it uses the SUN Workshop C compiler

View File

@ -21,8 +21,6 @@ AC_CHECK_HEADERS(vorbis/vorbisenc.h)
AC_TYPE_PID_T()
AC_TYPE_SIZE_T()
AC_SUBST(LINK_STATIC)
AC_CHECK_LIB( socket, socket)
AC_CHECK_LIB( nsl, gethostbyname)
AC_CHECK_LIB( rt, sched_getscheduler)
@ -31,17 +29,5 @@ AC_CHECK_LIB( vorbis, vorbis_info_init)
AC_CHECK_LIB( vorbisenc, vorbis_encode_init)
AC_CHECK_LIB( mp3lame, lame_init)
AC_ARG_ENABLE( static,
[ --enable-static link everything into the executable statically [no]],
CONFIG_LINK_STATIC="${enableval}", CONFIG_LINK_STATIC="")
if test "${CONFIG_LINK_STATIC}" != "yes" ; then
LINK_STATIC=""
AC_MSG_RESULT( "creating dinamically linked executable")
else
LINK_STATIC="--static"
AC_MSG_RESULT( "creating statically linked executable")
fi
AC_OUTPUT(Makefile src/Makefile man/Makefile)

View File

@ -54,20 +54,6 @@ the Ogg Vorbis stream to one or more IceCast2 servers.
# =========================================================== static sub-package
%package static
Summary: %{summary} static version
Group: Applications/Multimedia
%description static
DarkIce is an IceCast, IceCast2 and ShoutCast live audio streamer. It
takes audio input from a sound card, encodes it into mp3 and/or Ogg Vorbis,
and sends the mp3 stream to one or more IceCast and/or ShoutCast servers,
the Ogg Vorbis stream to one or more IceCast2 servers.
This is the statically linked version.
# =================================================================== prep stage
%prep
%setup
@ -75,17 +61,6 @@ This is the statically linked version.
# ================================================================== build stage
%build
# first build the static executable
%configure --enable-static
make all
mv src/darkice src/darkice.static
# there is no need to clean, as the object files are the same for the static
# and dynamic builds
#make distclean
# secondly build the dynamic executable
%configure
make all
@ -94,9 +69,6 @@ make all
%install
%makeinstall
# copy the static executable as well
cp src/darkice.static $RPM_BUILD_ROOT/%{_bindir}
# ========================================================== pre-install scripts
%pre
@ -122,19 +94,12 @@ make clean
%{_mandir}/man5/darkice.cfg.5*
# ===================================================== static sub-package files
%files static
%defattr (-, root, root)
%doc COPYING ChangeLog README TODO
%config %{_sysconfdir}/darkice.cfg
%{_bindir}/darkice.static
%{_mandir}/man1/darkice.1*
%{_mandir}/man5/darkice.cfg.5*
# =================================================================== change log
#
# $Log$
# Revision 1.7 2001/09/18 18:00:02 darkeye
# removed --enable-static configure option
#
# Revision 1.6 2001/09/18 17:35:15 darkeye
# for version 0.6
#

View File

@ -1,6 +1,5 @@
bin_PROGRAMS = darkice
CXXFLAGS = -O2 -Wall
LDADD = @LINK_STATIC@
darkice_SOURCES = AudioEncoder.h\
AudioSource.h\