[Scummvm-cvs-logs] CVS: scummvm configure,1.38,1.39

[Jonathan Gray]

Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1:/tmp/cvs-serv7027

Modified Files:
	configure 
Log Message:
make use of env vars when doing checks

Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- configure	9 Aug 2003 23:21:17 -0000	1.38
+++ configure	9 Aug 2003 23:52:05 -0000	1.39
@@ -21,6 +21,9 @@
 TMPC=${TMPO}.cpp
 TMPLOG=config.log
 
+# use environment vars if set
+CXXFLAGS="$CXXFLAGS $CPPFLAGS"
+
 # default lib behaviour yes/no/auto
 _vorbis=auto
 _mad=auto
@@ -419,7 +422,7 @@
 #include <vorbis/codec.h>
 int main(void) { vorbis_packet_blocksize(0,0); return 0; }
 EOF
-  cc_check $OGG_CFLAGS $OGG_LIBS $VORBIS_CFLAGS $VORBIS_LIBS \
+  cc_check $LDFLAGS $CXXFLAGS $OGG_CFLAGS $OGG_LIBS $VORBIS_CFLAGS $VORBIS_LIBS \
   -lvorbis -logg -lm && _vorbis=yes
 fi
 if test "$_vorbis" = yes ; then
@@ -438,7 +441,7 @@
 #include <mad.h>
 int main(void) {return 0; }
 EOF
-  cc_check $MAD_CFLAGS $MAD_LIBS -lmad && _mad=yes
+  cc_check $LDFLAGS $CXXFLAGS $MAD_CFLAGS $MAD_LIBS -lmad && _mad=yes
 fi
 if test "$_mad" = yes ; then
   _def_mad='#define USE_MAD'
@@ -456,7 +459,7 @@
 #include <alsa/asoundlib.h>
 int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==9)); }
 EOF
-  cc_check $ALSA_CFLAGS $ALSA_LIBS -lasound && _alsa=yes
+  cc_check $LDFLAGS $CXXFLAGS $ALSA_CFLAGS $ALSA_LIBS -lasound && _alsa=yes
 fi
 if test "$_alsa" = yes ; then
   _def_alsa='#define USE_ALSA'