* ./bootstrap : Fixed an issue with old shell versions

[vlc] / Makefile.opts.in

diff --git a/Makefile.opts.in b/Makefile.opts.in
index 84ef92a0ebf8146722bdf906cc6d3351178a4334..2b8552e729acaab07455ebc27adfb5f6e027aea2 100644 (file)
--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -32,7 +32,7 @@ RELEASE = @RELEASE@
 # Build environment
 # 
 CC = @CC@
-CFLAGS = @CFLAGS@
+CFLAGS += @CFLAGS@
 SHELL = @SHELL@
 RANLIB = @RANLIB@
 STRIP = @STRIP@
@@ -67,10 +67,12 @@ dvdread_CFLAGS = @dvdread_CFLAGS@
 dvdplay_CFLAGS = @dvdplay_CFLAGS@
 esd_CFLAGS = @esd_CFLAGS@
 familiar_CFLAGS = @familiar_CFLAGS@
+faad_CFLAGS = @faad_CFLAGS@
 ffmpeg_CFLAGS = @ffmpeg_CFLAGS@
 glide_CFLAGS = @glide_CFLAGS@
 gnome_CFLAGS = @gnome_CFLAGS@
 gtk_CFLAGS = @gtk_CFLAGS@
+gtk_main_CFLAGS = @gtk_main_CFLAGS@
 idctaltivec_CFLAGS = @idctaltivec_CFLAGS@
 kde_CFLAGS = @kde_CFLAGS@
 mad_CFLAGS = @mad_CFLAGS@
@@ -78,7 +80,9 @@ memcpyaltivec_CFLAGS = @memcpyaltivec_CFLAGS@
 motionaltivec_CFLAGS = @motionaltivec_CFLAGS@
 ts_dvbpsi_CFLAGS = @ts_dvbpsi_CFLAGS@
 qt_CFLAGS = @qt_CFLAGS@
+qte_CFLAGS = @qte_CFLAGS@
 sdl_CFLAGS = @sdl_CFLAGS@
+svgalib_CFLAGS = @svgalib_CFLAGS@
 x11_CFLAGS = @x11_CFLAGS@
 xvideo_CFLAGS = @xvideo_CFLAGS@
 
@@ -97,7 +101,6 @@ arts_LDFLAGS = @arts_LDFLAGS@
 beos_LDFLAGS = @beos_LDFLAGS@
 i420_rgb_LDFLAGS = @i420_rgb_LDFLAGS@
 directx_LDFLAGS = @directx_LDFLAGS@
-dsp_LDFLAGS = @dsp_LDFLAGS@
 dv_LDFLAGS = @dv_LDFLAGS@
 dvd_LDFLAGS = @dvd_LDFLAGS@
 dvdread_LDFLAGS = @dvdread_LDFLAGS@
@@ -105,12 +108,14 @@ dvdplay_LDFLAGS = @dvdplay_LDFLAGS@
 esd_LDFLAGS = @esd_LDFLAGS@
 familiar_LDFLAGS = @familiar_LDFLAGS@
 distort_LDFLAGS = @distort_LDFLAGS@
+faad_LDFLAGS = @faad_LDFLAGS@
 ffmpeg_LDFLAGS = @ffmpeg_LDFLAGS@
 mp4_LDFLAGS = @mp4_LDFLAGS@
 ggi_LDFLAGS = @ggi_LDFLAGS@
 glide_LDFLAGS = @glide_LDFLAGS@
 gnome_LDFLAGS = @gnome_LDFLAGS@
 gtk_LDFLAGS = @gtk_LDFLAGS@
+gtk_main_LDFLAGS = @gtk_main_LDFLAGS@
 http_LDFLAGS = @http_LDFLAGS@
 idctaltivec_LDFLAGS = @idctaltivec_LDFLAGS@
 imdct_LDFLAGS = @imdct_LDFLAGS@
@@ -124,18 +129,23 @@ macosx_LDFLAGS = @macosx_LDFLAGS@
 mad_LDFLAGS = @mad_LDFLAGS@
 memcpyaltivec_LDFLAGS = @memcpyaltivec_LDFLAGS@
 motionaltivec_LDFLAGS = @motionaltivec_LDFLAGS@
-ts_dvbpsi_LDFLAGS = @ts_dvbpsi_LDFLAGS@
 ncurses_LDFLAGS = @ncurses_LDFLAGS@
+oss_LDFLAGS = @oss_LDFLAGS@
 qnx_LDFLAGS = @qnx_LDFLAGS@
 qt_LDFLAGS = @qt_LDFLAGS@
+qte_LDFLAGS = @qte_LDFLAGS@
 rc_LDFLAGS = @rc_LDFLAGS@
 sdl_LDFLAGS = @sdl_LDFLAGS@
+svgalib_LDFLAGS = @svgalib_LDFLAGS@
+audio_LDFLAGS = @audio_LDFLAGS@
+ts_dvbpsi_LDFLAGS = @ts_dvbpsi_LDFLAGS@
 vcd_LDFLAGS = @vcd_LDFLAGS@
 vorbis_LDFLAGS = @vorbis_LDFLAGS@
 waveout_LDFLAGS = @waveout_LDFLAGS@
 x11_LDFLAGS = @x11_LDFLAGS@
 xosd_LDFLAGS = @xosd_LDFLAGS@
 xvideo_LDFLAGS = @xvideo_LDFLAGS@
+id3tag_LDFLAGS = @id3tag_LDFLAGS@
 
 #
 # Other special cases
@@ -189,7 +199,7 @@ CFLAGS += -DPLUGIN_PATH=\"@prefix@/lib/vlc\"
 #
 # C headers directories
 #
-CFLAGS += -Iinclude -Iextras
+vlc_CFLAGS += -Iinclude -Iextras -I.
 
 #
 # C compiler flags: mainstream compilation