mirror of
https://gitlab.xiph.org/xiph/icecast-server.git
synced 2024-09-29 04:25:55 -04:00
Fix broken CFLAGS handling.
svn path=/trunk/icecast/; revision=2238
This commit is contained in:
parent
c9fa9cd040
commit
c15a877085
@ -10,7 +10,7 @@ EXTRA_DIST = README AUTHORS COPYING
|
|||||||
GET = true
|
GET = true
|
||||||
|
|
||||||
debug:
|
debug:
|
||||||
$(MAKE) all CFLAGS="@DEBUG@"
|
$(MAKE) all CFLAGS="@DEBUG@ @XML_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@"
|
||||||
|
|
||||||
profile:
|
profile:
|
||||||
$(MAKE) all CFLAGS="@PROFILE@"
|
$(MAKE) all CFLAGS="@PROFILE@ @XML_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@"
|
||||||
|
@ -91,12 +91,16 @@ fi
|
|||||||
if test -n "$XMLCONFIG"
|
if test -n "$XMLCONFIG"
|
||||||
then
|
then
|
||||||
XML_LIBS="`$XMLCONFIG --libs`"
|
XML_LIBS="`$XMLCONFIG --libs`"
|
||||||
CPPFLAGS="$CPPFLAGS `$XMLCONFIG --cflags`"
|
XML_CFLAGS="`$XMLCONFIG --cflags`"
|
||||||
save_LIBS="$LIBS"
|
save_LIBS="$LIBS"
|
||||||
|
save_CFLAGS="$CFLAGS"
|
||||||
LIBS="$LIBS $XML_LIBS"
|
LIBS="$LIBS $XML_LIBS"
|
||||||
|
CFLAGS="$CFLAGS $XML_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])])
|
||||||
LIBS="$save_LIBS"
|
LIBS="$save_LIBS"
|
||||||
|
CFLAGS="$save_CFLAGS"
|
||||||
save_LIBS=
|
save_LIBS=
|
||||||
|
save_CFLAGS=
|
||||||
else
|
else
|
||||||
AC_MSG_ERROR([xml-config could not be found])
|
AC_MSG_ERROR([xml-config could not be found])
|
||||||
fi
|
fi
|
||||||
@ -106,6 +110,9 @@ AM_PATH_VORBIS(, AC_MSG_ERROR(must have Vorbis installed!))
|
|||||||
|
|
||||||
dnl Make substitutions
|
dnl Make substitutions
|
||||||
|
|
||||||
|
AC_SUBST(XML_CFLAGS)
|
||||||
|
AC_SUBST(OGG_CFLAGS)
|
||||||
|
AC_SUBST(VORBIS_CFLAGS)
|
||||||
AC_SUBST(XML_LIBS)
|
AC_SUBST(XML_LIBS)
|
||||||
AC_SUBST(OGG_LIBS)
|
AC_SUBST(OGG_LIBS)
|
||||||
AC_SUBST(VORBIS_LIBS)
|
AC_SUBST(VORBIS_LIBS)
|
||||||
|
@ -15,7 +15,8 @@ icecast_SOURCES = config.c main.c logging.c sighandler.c connection.c global.c\
|
|||||||
icecast_LDADD = net/libicenet.la thread/libicethread.la httpp/libicehttpp.la\
|
icecast_LDADD = net/libicenet.la thread/libicethread.la httpp/libicehttpp.la\
|
||||||
log/libicelog.la avl/libiceavl.la timing/libicetiming.la
|
log/libicelog.la avl/libiceavl.la timing/libicetiming.la
|
||||||
|
|
||||||
LIBS = -lpthread @SOCKET_LIBS@ @XML_LIBS@ @OGG_LIBS@ @VORBIS_LIBS@
|
LIBS = @LIBS@ -lpthread @SOCKET_LIBS@ @XML_LIBS@ @OGG_LIBS@ @VORBIS_LIBS@
|
||||||
|
CFLAGS = @CFLAGS@ @XML_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@
|
||||||
|
|
||||||
INCLUDES = -I$(srcdir)/net -I$(srcdir)/thread -I$(srcdir)/avl -I$(srcdir)/httpp \
|
INCLUDES = -I$(srcdir)/net -I$(srcdir)/thread -I$(srcdir)/avl -I$(srcdir)/httpp \
|
||||||
-I$(srcdir)/log -I$(srcdir)/timing
|
-I$(srcdir)/log -I$(srcdir)/timing
|
||||||
@ -24,8 +25,8 @@ INCLUDES = -I$(srcdir)/net -I$(srcdir)/thread -I$(srcdir)/avl -I$(srcdir)/httpp
|
|||||||
GET = true
|
GET = true
|
||||||
|
|
||||||
debug:
|
debug:
|
||||||
$(MAKE) all CFLAGS="@DEBUG@"
|
$(MAKE) all CFLAGS="@DEBUG@ @XML_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@"
|
||||||
|
|
||||||
profile:
|
profile:
|
||||||
$(MAKE) all CFLAGS="@PROFILE@"
|
$(MAKE) all CFLAGS="@PROFILE@ @XML_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user