oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

forgot to set CPPFLAGS for some AC_CHECK_HEADERS, where it uses CPPFLAGS 

for presence

git-svn-id: https://svn.musicpd.org/mpd/trunk@446 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-03-24 03:42:24 +00:00
parent 2ecc498e4c
commit f32cc27dde
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -131,8 +131,10 @@ if test x$enable_iconv = xyes; then
oldcflags=$CFLAGS oldcflags=$CFLAGS
oldlibs=$LIBS oldlibs=$LIBS
oldcppflags=$CPPFLAGS
CFLAGS="$CFLAGS $MPD_CFLAGS $ICONV_CFLAGS" CFLAGS="$CFLAGS $MPD_CFLAGS $ICONV_CFLAGS"
LIBS="$LIBS $MPD_LIBS $ICONV_LIBS" LIBS="$LIBS $MPD_LIBS $ICONV_LIBS"
CPPFLAGS=$CFLAGS
AC_CHECK_HEADER(iconv.h,MPD_CFLAGS="$MPD_CFLAGS $ICONV_CFLAGS",enable_iconv=no) AC_CHECK_HEADER(iconv.h,MPD_CFLAGS="$MPD_CFLAGS $ICONV_CFLAGS",enable_iconv=no)
if test x$enable_iconv = xyes; then if test x$enable_iconv = xyes; then
AC_CHECK_LIB(iconv,iconv_open,MPD_LIBS="$MPD_LIBS $ICONV_LIBS",) AC_CHECK_LIB(iconv,iconv_open,MPD_LIBS="$MPD_LIBS $ICONV_LIBS",)
@ -140,6 +142,7 @@ if test x$enable_iconv = xyes; then
fi fi
CFLAGS=$oldcflags CFLAGS=$oldcflags
LIBS=$oldlibs LIBS=$oldlibs
CPPFLAGS=$oldcppflags
fi fi
ID3_SUBDIR="" ID3_SUBDIR=""
@ -170,14 +173,17 @@ if test x$enable_id3 = xyes; then
oldcflags=$CFLAGS oldcflags=$CFLAGS
oldlibs=$LIBS oldlibs=$LIBS
oldcppflags=$CPPFLAGS
CFLAGS="$CFLAGS $MPD_CFLAGS $ID3TAG_CFLAGS" CFLAGS="$CFLAGS $MPD_CFLAGS $ID3TAG_CFLAGS"
LIBS="$LIBS $MPD_LIBS $ID3TAG_LIBS" LIBS="$LIBS $MPD_LIBS $ID3TAG_LIBS"
CPPFLAGS=$CFLAGS
AC_CHECK_LIB(id3tag,id3_file_open,[ID3_LIB="$ID3TAG_LIBS"; AC_CHECK_LIB(id3tag,id3_file_open,[ID3_LIB="$ID3TAG_LIBS";
MPD_CFLAGS="$MPD_CFLAGS $ID3TAG_CFLAGS"; MPD_CFLAGS="$MPD_CFLAGS $ID3TAG_CFLAGS";
use_libid3tag=yes], use_libid3tag=yes],
[use_libid3tag=no;use_mpd_id3tag=yes]) [use_libid3tag=no;use_mpd_id3tag=yes])
CFLAGS=$oldcflags CFLAGS=$oldcflags
LIBS=$oldlibs LIBS=$oldlibs
CPPFLAGS=$oldcppflags
fi fi
if test x$use_mpd_id3tag = xyes; then if test x$use_mpd_id3tag = xyes; then
AC_DEFINE(USE_MPD_ID3TAG,1,[Define to use mpd libid3tag]) AC_DEFINE(USE_MPD_ID3TAG,1,[Define to use mpd libid3tag])
@ -214,13 +220,16 @@ if test x$enable_mp3 = xyes; then
oldcflags=$CFLAGS oldcflags=$CFLAGS
oldlibs=$LIBS oldlibs=$LIBS
oldcppflags=$CPPFLAGS
CFLAGS="$CFLAGS $MPD_CFLAGS $MAD_CFLAGS" CFLAGS="$CFLAGS $MPD_CFLAGS $MAD_CFLAGS"
LIBS="$LIBS $MPD_LIBS $MAD_LIBS" LIBS="$LIBS $MPD_LIBS $MAD_LIBS"
CPPFLAGS=$CFLAGS
AC_CHECK_LIB(mad,mad_stream_init,[MAD_LIB="$MAD_LIBS"; AC_CHECK_LIB(mad,mad_stream_init,[MAD_LIB="$MAD_LIBS";
MPD_CFLAGS="$MPD_CFLAGS $MAD_CFLAGS";use_libmad=yes], MPD_CFLAGS="$MPD_CFLAGS $MAD_CFLAGS";use_libmad=yes],
[use_libmad=no;use_mpd_mad=yes]) [use_libmad=no;use_mpd_mad=yes])
CFLAGS=$oldcflags CFLAGS=$oldcflags
LIBS=$oldlibs LIBS=$oldlibs
CPPFLAGS=$oldcppflags
fi fi
if test x$use_mpd_mad = xyes; then if test x$use_mpd_mad = xyes; then
AC_DEFINE(USE_MPD_MAD,1,[Define to use mpd libmad]) AC_DEFINE(USE_MPD_MAD,1,[Define to use mpd libmad])
@ -254,8 +263,10 @@ if test x$enable_aac = xyes; then
oldcflags=$CFLAGS oldcflags=$CFLAGS
oldlibs=$LIBS oldlibs=$LIBS
oldcppflags=$CPPFLAGS
CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -I." CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -I."
LIBS="$LIBS $MPD_LIBS $FAAD_LIBS" LIBS="$LIBS $MPD_LIBS $FAAD_LIBS"
CPPFLAGS=$CFLAGS
AC_CHECK_HEADER(faad.h,,enable_aac=no) AC_CHECK_HEADER(faad.h,,enable_aac=no)
if test x$enable_aac = xyes; then if test x$enable_aac = xyes; then
AC_CHECK_DECL(faacDecInit2,,enable_aac=no,[#include <faad.h>]) AC_CHECK_DECL(faacDecInit2,,enable_aac=no,[#include <faad.h>])
@ -271,6 +282,7 @@ if test x$enable_aac = xyes; then
fi fi
CFLAGS=$oldcflags CFLAGS=$oldcflags
LIBS=$oldlibs LIBS=$oldlibs
CPPFLAGS=$oldcppflags
fi fi
if test x$enable_ogg = xyes; then if test x$enable_ogg = xyes; then