Commit 54eaef4d authored by Jack Moffitt's avatar Jack Moffitt
Browse files

Add -D_REENTRANT to all platforms.

Fix LIBS handling in configure.in.

svn path=/trunk/ices/; revision=2230
parent 8a539d9b
......@@ -230,8 +230,8 @@ AC_ARG_ENABLE(shouttest, [ --disable-shouttest Do not try to compile and
if test "x$enable_shouttest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $SHOUT_CFLAGS"
LIBS="$LIBS $SHOUT_LIBS"
CFLAGS="$CFLAGS $SHOUT_CFLAGS $OGG_CFLAGS $VORBIS_CFLAGS"
LIBS="$LIBS $SHOUT_LIBS $OGG_LIBS $VORBIS_LIBS"
dnl
dnl Now check if the installed Shout is sufficiently new.
dnl
......
......@@ -11,20 +11,20 @@ dnl Set some options based on environment
if test -z "$GCC"; then
case $host in
*-*-irix*)
DEBUG="-g -signed"
CFLAGS="-O2 -w -signed"
PROFILE="-p -g3 -O2 -signed"
DEBUG="-g -signed -D_REENTRANT"
CFLAGS="-O2 -w -signed -D_REENTRANT"
PROFILE="-p -g3 -O2 -signed -D_REENTRANT"
;;
sparc-sun-solaris*)
DEBUG="-v -g -D_REENTRANT"
CFLAGS="-xO4 -fast -w -fsimple -native -xcg92 -D_REENTRANT"
PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc -D_REENTRANT"
SUN_LIBS="-lnsl -lsocket -lresolv"
SUN_LIBS="-lnsl -lsocket -lresolv"
;;
*)
DEBUG="-g"
CFLAGS="-O"
PROFILE="-g -p"
DEBUG="-g -D_REENTRANT"
CFLAGS="-O -D_REENTRANT"
PROFILE="-g -p -D_REENTRANT"
;;
esac
else
......@@ -38,18 +38,16 @@ else
DEBUG="-g -Wall -fsigned-char -mv8 -D_REENTRANT"
CFLAGS="-O20 -ffast-math -fsigned-char -mv8 -D_REENTRANT"
PROFILE="-pg -g -O20 -fsigned-char -mv8 -D_REENTRANT"
SUN_LIBS="-lnsl -lsocket -lresolv -D_REENTRANT"
SUN_LIBS="-lnsl -lsocket -lresolv"
;;
*)
DEBUG="-g -Wall -fsigned-char"
CFLAGS="-O20 -fsigned-char"
PROFILE="-O20 -g -pg -fsigned-char"
DEBUG="-g -Wall -fsigned-char -D_REENTRANT"
CFLAGS="-O20 -fsigned-char -D_REENTRANT"
PROFILE="-O20 -g -pg -fsigned-char -D_REENTRANT"
;;
esac
fi
AC_SUBST(SUN_LIBS)
dnl Checks for programs.
dnl Checks for libraries.
......@@ -70,8 +68,6 @@ if test "$have_oss" = yes; then
OSS_CFLAGS="-DHAVE_OSS"
fi
AC_SUBST(OSS_CFLAGS)
dnl Check for Sun audio
AC_CHECK_HEADER(sys/audioio.h, have_sun_audio=yes, have_sun_audio=no)
......@@ -81,8 +77,6 @@ if test "$have_sun_audio" = yes; then
SUN_CFLAGS="-DHAVE_SUN_AUDIO"
fi
AC_SUBST(SUN_CFLAGS)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
......@@ -106,19 +100,24 @@ then
fi
if test -n "$XMLCONFIG"
then
LIBS="$LIBS `$XMLCONFIG --libs`"
XML_LIBS="`$XMLCONFIG --libs`"
CPPFLAGS="$CPPFLAGS `$XMLCONFIG --cflags`"
AC_CHECK_FUNC(xmlParseFile,, [AC_MSG_ERROR([There was a problem linking with libxml])])
else
AC_MSG_ERROR([xml-config could not be found])
fi
AM_PATH_OGG(LIBS="$LIBS $OGG_LIBS", AC_MSG_ERROR(must have Ogg installed!))
AM_PATH_VORBIS(LIBS="$LIBS $VORBIS_LIBS $VORBISENC_LIBS", AC_MSG_ERROR(must have Vorbis installed!))
AM_PATH_SHOUT(LIBS="$LIBS $SHOUT_LIBS", AC_MSG_ERROR(must have libshout installed!))
AM_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!))
AM_PATH_VORBIS(, AC_MSG_ERROR(must have Vorbis installed!))
AM_PATH_SHOUT(, AC_MSG_ERROR(must have libshout installed!))
dnl Make substitutions
LIBS="$LIBS $XML_LIBS $OGG_LIBS $VORBIS_LIBS $VORBISENC_LIBS $SHOUT_LIBS"
AC_SUBST(OSS_CFLAGS)
AC_SUBST(SUN_CFLAGS)
AC_SUBST(SUN_LIBS)
AC_SUBST(LIBTOOL_DEPS)
AC_SUBST(OPT)
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