[xiph-cvs] cvs commit: ices/src/playlist Makefile.am
Brendan
brendan at xiph.org
Sat Mar 8 15:55:59 PST 2003
brendan 03/03/08 18:55:58
Modified: . Makefile.am configure.ac
src Makefile.am
src/playlist Makefile.am
Log:
Use shout-config if available.
I'll look into trying pkg-config if it's available and using shout-config as
a fallback, ok?
Revision Changes Path
1.15 +1 -1 ices/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /cvs/ice/ices/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile.am 5 Mar 2003 16:15:44 -0000 1.14
+++ Makefile.am 8 Mar 2003 23:55:58 -0000 1.15
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = @subdirs@ src conf doc
+SUBDIRS = src conf doc
EXTRA_DIST = README FEATURES BUGS AUTHORS TODO INSTALL COPYING CHANGES FAQ TESTED README.playlist FILES
<p><p>1.3 +29 -50 ices/configure.ac
Index: configure.ac
===================================================================
RCS file: /cvs/ice/ices/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure.ac 5 Mar 2003 16:26:30 -0000 1.2
+++ configure.ac 8 Mar 2003 23:55:58 -0000 1.3
@@ -1,5 +1,5 @@
# configure script for ices
-# $Id: configure.ac,v 1.2 2003/03/05 16:26:30 brendan Exp $
+# $Id: configure.ac,v 1.3 2003/03/08 23:55:58 brendan Exp $
m4_define(ICES_MAJOR, 0)
m4_define(ICES_MINOR, 2)
@@ -56,18 +56,6 @@
IRIX=no
case $host in
- *solaris*)
- if test "$CC" = cc
- then
- CFLAGS="$CFLAGS -mt"
- fi
- ;;
- *sunos*)
- if test "$CC" = cc
- then
- CFLAGS="$CFLAGS -mt"
- fi
- ;;
*hpux*)
CFLAGS="$CFLAGS -D_HPUX_SOURCE -DHPUX"
if test "$CC" = cc
@@ -118,47 +106,44 @@
dnl -- Required extra libraries --
-AC_ARG_WITH(libshout,
- [[ --with-libshout[=DIR] use installed libshout [in DIR]]])
+AC_ARG_WITH([shout-config],
+ [[ --with-shout-config[=DIR] use shout-config in PATH to find libshout]])
have_libshout="no"
-if test "$with_libshout" != "no"
+if test "$with_shout_config" != "no"
then
- if test -n "$with_libshout" -a "$with_libshout" != "yes"
+ if test -n "$with_shout_config" -a "$with_shout_config" != "yes"
then
- CPPFLAGS="$CPPFLAGS -I$with_libshout/include"
- LDFLAGS="$LDFLAGS -L$with_libshout/lib"
+ SHOUTCONFIG="$with_shout_config"
fi
+ AC_PATH_PROG(SHOUTCONFIG, [shout-config])
- AC_CHECK_HEADER(shout/shout.h, [
- AC_DEFINE(HAVE_SHOUT_SHOUT_H, 1, [Define if you have <shout/shout.h>])
- have_libshout="maybe"
- ])
- if test "$have_libshout" != "no"
+ if test -x "$SHOUTCONFIG"
then
- dnl shout_new was introduced in libshout2 so it serves as a version check.
- AC_CHECK_LIB(shout, shout_new, [
- have_libshout="yes"
- LIBS="$LIBS -lshout"
- ])
- fi
-
- if test "$have_libshout" != "yes"
+ LIBS="$LIBS `$SHOUTCONFIG --libs`"
+ CFLAGS="$CFLAGS `$SHOUTCONFIG --cflags`"
+ elif test -n "$with_shout_config"
then
- if test -n "$with_libshout"
- then
- AC_MSG_ERROR([Could not find a usable installed libshout])
- else
- AC_MSG_RESULT([Installed libshout not found, using builtin])
- fi
+ AC_MSG_ERROR([Could not run shout-config])
fi
fi
-if test "$have_libshout" != "yes"
+AC_CHECK_HEADER([shout/shout.h], [
+ AC_DEFINE(HAVE_SHOUT_SHOUT_H, 1, [Define if you have <shout/shout.h>])
+ have_libshout="maybe"
+ ])
+if test "$have_libshout" != "no"
then
- AC_CONFIG_SUBDIRS([libshout])
+ dnl shout_new was introduced in libshout2 so it serves as a version check.
+ AC_CHECK_LIB([shout], [shout_new], [
+ have_libshout="yes"
+ if test -z "$SHOUTCONFIG"
+ then
+ LIBS="$LIBS -lshout"
+ fi
+ ],
+ [AC_MSG_ERROR([Could not find a usable installed libshout])])
fi
-AM_CONDITIONAL(NEED_SHOUT, test "$have_libshout" != "yes")
dnl -- Optional features --
AC_CACHE_SAVE
@@ -174,7 +159,7 @@
XMLCONFIG="$with_xml_config"
if ! test -x "$XMLCONFIG"
then
- AC_MSG_ERROR([$with_xmlconfig cannot be run])
+ AC_MSG_ERROR([$with_xml_config cannot be run])
fi
else
AC_CHECK_PROGS(XMLCONFIG, [xml2-config xml-config])
@@ -363,15 +348,9 @@
AC_OUTPUT
-AC_MSG_RESULT([Compiling with CPPFLAGS=$CPPFLAGS])
-AC_MSG_RESULT([Linking with LDFLAGS=$LDFLAGS $LIBS])
+AC_MSG_RESULT([Compiling with: $CPPFLAGS $CFLAGS])
+AC_MSG_RESULT([Linking with: $LDFLAGS $LIBS])
AC_MSG_RESULT([Features:])
-if test "$have_libshout" != "yes"
-then
- AC_MSG_RESULT([ libshout: builtin])
-else
- AC_MSG_RESULT([ libshout: system])
-fi
AC_MSG_RESULT([ LAME : $have_LAME])
AC_MSG_RESULT([ Vorbis : $have_vorbis])
AC_MSG_RESULT([ Perl : $have_perl])
<p><p>1.24 +2 -7 ices/src/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /cvs/ice/ices/src/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile.am 5 Mar 2003 16:15:44 -0000 1.23
+++ Makefile.am 8 Mar 2003 23:55:58 -0000 1.24
@@ -4,11 +4,6 @@
SUBDIRS = playlist
-if NEED_SHOUT
-SHOUT_LIBS = ../libshout/libices.la
-SHOUT_INCLUDES = -I$(top_srcdir)/libshout
-endif
-
bin_PROGRAMS = ices
noinst_HEADERS = icestypes.h definitions.h setup.h log.h stream.h util.h \
@@ -22,6 +17,6 @@
BUILT_SOURCES = $(ICES_OBJECTS)
-ices_LDADD = $(ICES_OBJECTS) playlist/libplaylist.a $(SHOUT_LIBS)
+ices_LDADD = $(ICES_OBJECTS) playlist/libplaylist.a
-INCLUDES = -DICES_ETCDIR=\"$(sysconfdir)\" -DICES_MODULEDIR=\"$(moddir)\" $(SHOUT_INCLUDES)
+ices_CPPFLAGS = -DICES_ETCDIR=\"$(sysconfdir)\" -DICES_MODULEDIR=\"$(moddir)\"
<p><p>1.4 +1 -6 ices/src/playlist/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /cvs/ice/ices/src/playlist/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am 24 Jun 2001 21:10:59 -0000 1.3
+++ Makefile.am 8 Mar 2003 23:55:58 -0000 1.4
@@ -2,12 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-if NEED_SHOUT
-SHOUT_INCLUDES = -I$(top_srcdir)/libshout
-endif
-
-INCLUDES = -DICES_MODULEDIR=\"$(moddir)\" \
- -I$(top_srcdir)/src $(SHOUT_INCLUDES)
+INCLUDES = -DICES_MODULEDIR=\"$(moddir)\" -I$(top_srcdir)/src
noinst_LIBRARIES = libplaylist.a
noinst_HEADERS = playlist.h pm_builtin.h rand.h
<p><p>--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list