Commit 9cef32ca authored by Jack Moffitt's avatar Jack Moffitt

A few configure.in fixes.

* -D_REENTRANT probably needed on all platforms.  Let's not limit it to
  Linux and Solaris.

* AM_PATH_OGG|VORBIS had a slight bug.  We shouldn't update the LIBS until
  after we've detected anything.  Thanks to Michael Pruett <michael@68k.org>
  for finding this.

svn path=/trunk/icecast/; revision=2229
parent 17e1289a
...@@ -12,19 +12,20 @@ dnl Set some options based on environment ...@@ -12,19 +12,20 @@ dnl Set some options based on environment
if test -z "$GCC"; then if test -z "$GCC"; then
case $host in case $host in
*-*-irix*) *-*-irix*)
DEBUG="-g -signed" DEBUG="-g -signed -D_REENTRANT"
CFLAGS="-O2 -w -signed" CFLAGS="-O2 -w -signed -D_REENTRANT"
PROFILE="-p -g3 -O2 -signed" PROFILE="-p -g3 -O2 -signed -D_REENTRANT"
;; ;;
sparc-sun-solaris*) sparc-sun-solaris*)
DEBUG="-v -g -D_REENTRANT" DEBUG="-v -g -D_REENTRANT"
CFLAGS="-xO4 -fast -w -fsimple -native -xcg92 -D_REENTRANT" CFLAGS="-xO4 -fast -w -fsimple -native -xcg92 -D_REENTRANT"
PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc -D_REENTRANT" PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc -D_REENTRANT"
SUN_LIBS="-lnsl -lsocket -lresolv"
;; ;;
*) *)
DEBUG="-g" DEBUG="-g -D_REENTRANT"
CFLAGS="-O" CFLAGS="-O -D_REENTRANT"
PROFILE="-g -p" PROFILE="-g -p -D_REENTRANT"
;; ;;
esac esac
else else
...@@ -38,11 +39,12 @@ else ...@@ -38,11 +39,12 @@ else
DEBUG="-g -Wall -fsigned-char -mv8 -D_REENTRANT" DEBUG="-g -Wall -fsigned-char -mv8 -D_REENTRANT"
CFLAGS="-O20 -ffast-math -fsigned-char -mv8 -D_REENTRANT" CFLAGS="-O20 -ffast-math -fsigned-char -mv8 -D_REENTRANT"
PROFILE="-pg -g -O20 -fsigned-char -mv8 -D_REENTRANT" PROFILE="-pg -g -O20 -fsigned-char -mv8 -D_REENTRANT"
SUN_LIBS="-lnsl -lsocket -lresolv"
;; ;;
*) *)
DEBUG="-g -Wall -fsigned-char" DEBUG="-g -Wall -fsigned-char -D_REENTRANT"
CFLAGS="-O20 -fsigned-char" CFLAGS="-O20 -fsigned-char -D_REENTRANT"
PROFILE="-O20 -g -pg -fsigned-char" PROFILE="-O20 -g -pg -fsigned-char -D_REENTRANT"
;; ;;
esac esac
fi fi
...@@ -86,18 +88,20 @@ then ...@@ -86,18 +88,20 @@ then
fi fi
if test -n "$XMLCONFIG" if test -n "$XMLCONFIG"
then then
LIBS="$LIBS `$XMLCONFIG --libs`" XML_LIBS="`$XMLCONFIG --libs`"
CPPFLAGS="$CPPFLAGS `$XMLCONFIG --cflags`" CPPFLAGS="$CPPFLAGS `$XMLCONFIG --cflags`"
AC_CHECK_FUNC(xmlParseFile,, [AC_MSG_ERROR([There was a problem linking with libxml])]) AC_CHECK_FUNC(xmlParseFile,, [AC_MSG_ERROR([There was a problem linking with libxml])])
else else
AC_MSG_ERROR([xml-config could not be found]) AC_MSG_ERROR([xml-config could not be found])
fi fi
AM_PATH_OGG(LIBS="$LIBS $OGG_LIBS", AC_MSG_ERROR(must have Ogg installed!)) AM_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!))
AM_PATH_VORBIS(LIBS="$LIBS $VORBIS_LIBS", AC_MSG_ERROR(must have Vorbis installed!)) AM_PATH_VORBIS(, AC_MSG_ERROR(must have Vorbis installed!))
dnl Make substitutions dnl Make substitutions
LIBS="$LIBS $SUN_LIBS $XML_LIBS $OGG_LIBS $VORBIS_LIBS"
AC_SUBST(LIBTOOL_DEPS) AC_SUBST(LIBTOOL_DEPS)
AC_SUBST(OPT) AC_SUBST(OPT)
AC_SUBST(LIBS) AC_SUBST(LIBS)
......
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