From: Sam Hocevar Date: Fri, 5 Apr 2002 20:44:23 +0000 (+0000) Subject: * ./plugins/win32/win32.cpp: fixed `--intf intfwin' which wasn't working. X-Git-Tag: 0.3.0~6 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=1b0868ed29bc006d5939c91c064ed3d7931a7432;p=vlc * ./plugins/win32/win32.cpp: fixed `--intf intfwin' which wasn't working. * ./Makefile: we don't include the Gtk+ and SDL DLLs in the win32 package anymore, the package is now 700k instead of 4MB. * ./configure.in, ./Makefile, ./Makefile.opts.in: replaced LIB_FOO with foo_LDFLAGS and CFLAGS_BAR with bar_CFLAGS for faster builds, and moved a lot of stuff from Makefile.opts.in back to configure.in. * ./install-win32: updated script for NSIS 1.96. I hope this doesn't break too many other architectures... --- diff --git a/.cvsignore b/.cvsignore index fedb6a9eb3..667a889e5c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,6 +1,8 @@ .* core core.* +conftest +conftest.* .dep gmon.out vlc-debug.log diff --git a/ChangeLog b/ChangeLog index f55d50a863..8d43fbeaa0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,13 @@ HEAD + * ./plugins/win32/win32.cpp: fixed `--intf intfwin' which wasn't working. + * ./Makefile: we don't include the Gtk+ and SDL DLLs in the win32 package + anymore, the package is now 700k instead of 4MB. + * ./configure.in, ./Makefile, ./Makefile.opts.in: replaced LIB_FOO with + foo_LDFLAGS and CFLAGS_BAR with bar_CFLAGS for faster builds, and moved a + lot of stuff from Makefile.opts.in back to configure.in. + * ./install-win32: updated script for NSIS 1.96. * ./configure.in: added --enable-intfwin to enable the win32 interface and --with-bcbuilder to tell make where to find Borland C++ Builder. * ./plugins/win32/intfwin.bpr: we now build intfwin.so at the right place. diff --git a/INSTALL.win32 b/INSTALL.win32 index 63bd5db584..117952b8fc 100644 --- a/INSTALL.win32 +++ b/INSTALL.win32 @@ -123,10 +123,7 @@ Building Win32 interface with bcc32 (Borland's compiler) (This stage is only necessary if you want to use the Win32 native interface. If you are happy with the GTK interface, then you can skip this section) -[Steps 2 and 3 are temporary] - 1) Compile vlc as usual. -include\defs.h should be generated. 2) From the plugin\win32 directory, use Borland C++ command-line tools as follows: diff --git a/Makefile b/Makefile index 2ba5483685..95d42e3b82 100644 --- a/Makefile +++ b/Makefile @@ -211,7 +211,7 @@ endif # # Misc variables # -VLC_QUICKVERSION := $(shell grep '^ *VERSION=' configure.in | head -1 | sed 's/"//g' | cut -f2 -d=) +VERSION := $(shell grep '^ *VERSION=' configure.in | head -1 | sed 's/"//g' | cut -f2 -d=) # All symbols must be exported export @@ -235,10 +235,11 @@ Makefile.opts: show: @echo CC: $(CC) @echo CFLAGS: $(CFLAGS) - @echo DCFLAGS: $(DCFLAGS) @echo LDFLAGS: $(LDFLAGS) - @echo PCFLAGS: $(PCFLAGS) - @echo PLDFLAGS: $(PLDFLAGS) + @echo plugins_CFLAGS: $(plugins_CFLAGS) + @echo plugins_LDFLAGS: $(plugins_LDFLAGS) + @echo builtins_CFLAGS: $(builtins_CFLAGS) + @echo builtins_LDFLAGS: $(builtins_LDFLAGS) @echo C_OBJ: $(C_OBJ) @echo CPP_OBJ: $(CPP_OBJ) @echo PLUGIN_OBJ: $(PLUGIN_OBJ) @@ -250,7 +251,7 @@ show: clean: plugins-clean po-clean vlc-clean rm -f src/*/*.o extras/*/*.o rm -f lib/*.so* lib/*.a - rm -f plugins/*.so plugins/*.a + rm -f plugins/*.so plugins/*.a plugins/*.lib plugins/*.tds rm -rf extras/MacOSX/build po-clean: @@ -372,7 +373,7 @@ dist: for file in vlc_beos.rsrc vlc.icns gvlc_win32.ico vlc_win32_rc.rc ; do \ cp share/$$file tmp/vlc/share/ ; done # Build archives - F=vlc-${VLC_QUICKVERSION}; \ + F=vlc-${VERSION}; \ mv tmp/vlc tmp/$$F; (cd tmp ; tar cf $$F.tar $$F); \ bzip2 -f -9 < tmp/$$F.tar > $$F.tar.bz2; \ gzip -f -9 tmp/$$F.tar ; mv tmp/$$F.tar.gz . @@ -390,24 +391,22 @@ package-win32: echo "OK."; mkdir tmp; \ fi # Create installation script - sed -e 's#@VERSION@#'${VLC_QUICKVERSION}'#' < install-win32 > tmp/nsi + cp install-win32 tmp/nsi # Copy relevant files - cp vlc.exe $(PLUGINS:%=plugins/%.so) tmp/ + cp vlc.exe tmp/ + $(STRIP) tmp/vlc.exe cp INSTALL.win32 tmp/INSTALL.txt ; unix2dos tmp/INSTALL.txt for file in AUTHORS COPYING ChangeLog README FAQ TODO ; \ do cp $$file tmp/$${file}.txt ; \ unix2dos tmp/$${file}.txt ; done - for file in iconv.dll libgmodule-1.3-12.dll libgtk-0.dll libgdk-0.dll \ - libgobject-1.3-12.dll libintl-1.dll libglib-1.3-12.dll \ - libgthread-1.3-12.dll SDL.dll README-SDL.txt ; \ - do cp ${DLL_PATH}/$$file tmp/ ; done + mkdir tmp/plugins + cp $(PLUGINS:%=plugins/%.so) tmp/plugins/ + $(STRIP) tmp/$(PLUGINS:%=plugins/%.so) mkdir tmp/share for file in default8x16.psf default8x9.psf ; \ do cp share/$$file tmp/share/ ; done # Create package - wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe /CD tmp/nsi - mv tmp/vlc-${VLC_QUICKVERSION}.exe \ - vlc-${VLC_QUICKVERSION}-win32-installer.exe + wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} /CD tmp/nsi # Clean up rm -Rf tmp @@ -427,10 +426,10 @@ package-beos: for file in default8x16.psf default8x9.psf ; \ do cp share/$$file tmp/vlc/share/ ; done # Create package - mv tmp/vlc tmp/vlc-${VLC_QUICKVERSION} - (cd tmp ; find vlc-${VLC_QUICKVERSION} | \ - zip -9 -@ vlc-${VLC_QUICKVERSION}-beos.zip ) - mv tmp/vlc-${VLC_QUICKVERSION}-BeOS-x86.zip . + mv tmp/vlc tmp/vlc-${VERSION} + (cd tmp ; find vlc-${VERSION} | \ + zip -9 -@ vlc-${VERSION}-beos.zip ) + mv tmp/vlc-${VERSION}-BeOS-x86.zip . # Clean up rm -Rf tmp @@ -447,7 +446,7 @@ package-macosx: cp AUTHORS COPYING ChangeLog README FAQ TODO tmp/ # Create disk image - ./macosx-dmg 0 "vlc-${VLC_QUICKVERSION}" tmp/* + ./macosx-dmg 0 "vlc-${VERSION}" tmp/* # Clean up rm -Rf tmp @@ -528,7 +527,7 @@ endif # Main application target # vlc: Makefile.opts Makefile.dep Makefile $(VLC_OBJ) $(BUILTIN_OBJ) - $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS) $(LIB_VLC) $(LIB_BUILTINS) $(LIB_COMMON) + $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS) $(vlc_LDFLAGS) $(builtins_LDFLAGS) ifeq ($(SYS),beos) xres -o $@ ./share/vlc_beos.rsrc mimeset -f $@ diff --git a/Makefile.dep b/Makefile.dep index fd848ec049..e56e57c62d 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -50,7 +50,7 @@ CFLAGS += -DMAKE_DEP $(C_DEP): .dep/%.d: %.c @test -d .dep/$(dir $*) || mkdir -p $(shell dirname .dep/$*) #@echo "regenerating dependencies for $*.c" - @$(SHELL) -ec '$(CC) $(DCFLAGS) $(CFLAGS) $(DEFINE) 2>/dev/null $< \ + @$(SHELL) -ec '$(CC) -M $(CFLAGS) 2>/dev/null $< \ | sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o \ .dep\/$(subst /,\/,$*).d : /g'\'' > $@; \ [ -s $@ ] || rm -f $@' @@ -58,7 +58,7 @@ $(C_DEP): .dep/%.d: %.c $(CPP_DEP): .dep/%.dpp: %.cpp @test -d .dep/$(dir $*) || mkdir -p $(shell dirname .dep/$*) #@echo "regenerating dependencies for $*.c" - @$(SHELL) -ec '$(CC) $(DCFLAGS) $(CFLAGS) $(DEFINE) 2>/dev/null $< \ + @$(SHELL) -ec '$(CC) -M $(CFLAGS) 2>/dev/null $< \ | sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o \ .dep\/$(subst /,\/,$*).dpp : /g'\'' > $@; \ [ -s $@ ] || rm -f $@' diff --git a/Makefile.modules b/Makefile.modules index 8956888293..9fc3070d51 100644 --- a/Makefile.modules +++ b/Makefile.modules @@ -14,8 +14,6 @@ include Makefile # Analyze the target we are asked to build # module_name := $(shell echo $(MAKECMDGOALS) | sed 's@.*/\(.*\)\..*@\1@') -MODULE_NAME := $(shell echo $(module_name) | tr '[a-z]' '[A-Z]') - suff := $(shell echo $(MAKECMDGOALS) | sed 's@.*\.@@' | tr so/a lo/o) # @@ -25,14 +23,14 @@ SRC_C := $(filter %.c,$($(module_name)_SOURCES)) SRC_CPP := $(filter %.cpp,$($(module_name)_SOURCES)) ifeq (lo,$(suff)) -CFLAGS_EXTRA := -I../../include -I../../extras $(CFLAGS_$(MODULE_NAME)) \ +extra_CFLAGS := $(plugins_CFLAGS) $($(module_name)_CFLAGS) \ -DMODULE_NAME=$(module_name) -DMODULE_NAME_IS_$(module_name) \ - -DPLUGIN $(CFLAGS_$(MODULE_NAME)_PLUGIN) $(PCFLAGS) + $($(module_name)_so_CFLAGS) OBJ_ALL := $(SRC_C:%.c=%.lo.$(module_name)) $(SRC_CPP:%.cpp=%.lo.$(module_name)) else -CFLAGS_EXTRA := -I../../include -I../../extras $(CFLAGS_$(MODULE_NAME)) \ +extra_CFLAGS := $(builtins_CFLAGS) $($(module_name)_CFLAGS) \ -DMODULE_NAME=$(module_name) -DMODULE_NAME_IS_$(module_name) \ - -DBUILTIN $(CFLAGS_$(MODULE_NAME)_BUILTIN) + $($(module_name)_a_CFLAGS) OBJ_ALL := $(SRC_C:%.c=%.o.$(module_name)) $(SRC_CPP:%.cpp=%.o.$(module_name)) endif @@ -51,7 +49,7 @@ all: clean: # rm -f $(PLUGIN_ALL) $(BUILTIN_ALL) - rm -f *.o *.o.* *.lo *.lo.* *.moc *.moc.* *.bak + rm -f *.o *.o.* *.lo *.lo.* *.obj *.moc *.moc.* *.bak rm -rf .dep FORCE: @@ -60,23 +58,23 @@ $(OBJ_ALL): ../../Makefile.modules ../../Makefile.dep ../../Makefile ../../Makef $(OBJ_ALL): $(H_DEP:%=../../include/%) $(C_DEP): %.d: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ CFLAGS="$(CFLAGS) $(CFLAGS_EXTRA)" + @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ CFLAGS="$(CFLAGS) $(extra_CFLAGS)" $(CPP_DEP): %.dpp: FORCE - @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ CFLAGS="$(CFLAGS) $(CFLAGS_EXTRA)" + @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ CFLAGS="$(CFLAGS) $(extra_CFLAGS)" $(SRC_C:%.c=%.$(suff).$(module_name)): %.$(suff).$(module_name): .dep/%.d $(SRC_C:%.c=%.$(suff).$(module_name)): %.$(suff).$(module_name): %.c - $(CC) $(CFLAGS) $(CFLAGS_EXTRA) -c $< -o $@ + $(CC) $(CFLAGS) $(extra_CFLAGS) -c $< -o $@ $(SRC_CPP:%.cpp=%.$(suff).$(module_name)): %.$(suff).$(module_name): .dep/%.dpp $(SRC_CPP:%.cpp=%.$(suff).$(module_name)): %.$(suff).$(module_name): %.cpp - $(CC) $(CFLAGS) $(CFLAGS_EXTRA) -c $< -o $@ + $(CC) $(CFLAGS) $(extra_CFLAGS) -c $< -o $@ # foo_CUSTOM lets us override all target rules for foo.so and foo.a ifeq (,$($(module_name)_CUSTOM)) ../$(module_name).so: $(EXTRA_DEP) $(OBJ_ALL) - $(CC) $(OBJ_ALL) $(PLDFLAGS) $(LIB_$(MODULE_NAME)) $(LIB_COMMON) -o $@ + $(CC) $(OBJ_ALL) $(LDFLAGS) $(plugins_LDFLAGS) $($(module_name)_LDFLAGS) -o $@ chmod a-x $@ ../$(module_name).a: $(EXTRA_DEP) $(OBJ_ALL) diff --git a/Makefile.opts.in b/Makefile.opts.in index f332aab9c0..811ff4cd30 100644 --- a/Makefile.opts.in +++ b/Makefile.opts.in @@ -48,10 +48,10 @@ CC = @CC@ CFLAGS = @CFLAGS@ SHELL = @SHELL@ RANLIB = @RANLIB@ +STRIP = @STRIP@ MOC = @MOC@ WINDRES = @WINDRES@ BCBUILDER = @BCBUILDER@ -DLL_PATH = @DLL_PATH@ # # Installation environment @@ -64,77 +64,75 @@ libdir = @libdir@ includedir = @includedir@ # -# Libraries for special cases +# CFLAGS for special cases # -LIB_COMMON = @LIB_COMMON@ -LIB_VLC = @LIB_VLC@ - -LIB_A52 = @LIB_A52@ -LIB_AA = @LIB_AA@ -LIB_ALSA = @LIB_ALSA@ -LIB_ARTS = @LIB_ARTS@ -LIB_BEOS = @LIB_BEOS@ -LIB_CHROMA_I420_RGB = @LIB_CHROMA_I420_RGB@ -LIB_DARWIN = @LIB_DARWIN@ -LIB_DIRECTX = @LIB_DIRECTX@ -LIB_DSP = @LIB_DSP@ -LIB_DVD = @LIB_DVD@ -LIB_DVDREAD = @LIB_DVDREAD@ -LIB_ESD = @LIB_ESD@ -LIB_FILTER_DISTORT = @LIB_FILTER_DISTORT@ -LIB_GGI = @LIB_GGI@ -LIB_GLIDE = @LIB_GLIDE@ -LIB_GNOME = @LIB_GNOME@ -LIB_GTK = @LIB_GTK@ -LIB_IDCTALTIVEC = @LIB_IDCTALTIVEC@ -LIB_IMDCT = @LIB_IMDCT@ -LIB_IMDCT3DN = @LIB_IMDCT3DN@ -LIB_IMDCTSSE = @LIB_IMDCTSSE@ -LIB_IPV4 = @LIB_IPV4@ -LIB_IPV6 = @LIB_IPV6@ -LIB_KDE = @LIB_KDE@ -LIB_LIRC = @LIB_LIRC@ -LIB_MACOSX = @LIB_MACOSX@ -LIB_MAD = @LIB_MAD@ -LIB_MEMCPYALTIVEC = @LIB_MEMCPYALTIVEC@ -LIB_MOTIONALTIVEC = @LIB_MOTIONALTIVEC@ -LIB_MPEG_TS = @LIB_MPEG_TS@ -LIB_NCURSES = @LIB_NCURSES@ -LIB_QNX = @LIB_QNX@ -LIB_QT = @LIB_QT@ -LIB_RC = @LIB_RC@ -LIB_SDL = @LIB_SDL@ -LIB_VCD = @LIB_VCD@ -LIB_VORBIS = @LIB_VORBIS@ -LIB_WAVEOUT = @LIB_WAVEOUT@ -LIB_WIN32 = @LIB_WIN32@ -LIB_X11 = @LIB_X11@ -LIB_XVIDEO = @LIB_XVIDEO@ +vlc_CFLAGS = @vlc_CFLAGS@ +plugins_CFLAGS := @plugins_CFLAGS@ +builtins_CFLAGS := @builtins_CFLAGS@ + +arts_CFLAGS = @arts_CFLAGS@ +dvd_CFLAGS = @dvd_CFLAGS@ +dvdread_CFLAGS = @dvdread_CFLAGS@ +directx_CFLAGS = @directx_CFLAGS@ +esd_CFLAGS = @esd_CFLAGS@ +glide_CFLAGS = @glide_CFLAGS@ +gnome_CFLAGS = @gnome_CFLAGS@ +gtk_CFLAGS = @gtk_CFLAGS@ +kde_CFLAGS = @kde_CFLAGS@ +idctaltivec_CFLAGS = @idctaltivec_CFLAGS@ +macosx_CFLAGS = @macosx_CFLAGS@ +mad_CFLAGS = @mad_CFLAGS@ +memcpyaltivec_CFLAGS = @memcpyaltivec_CFLAGS@ +motionaltivec_CFLAGS = @motionaltivec_CFLAGS@ +qt_CFLAGS = @qt_CFLAGS@ +sdl_CFLAGS = @sdl_CFLAGS@ +x11_CFLAGS = @x11_CFLAGS@ +xvideo_CFLAGS = @xvideo_CFLAGS@ # -# CFLAGS for special cases +# Libraries for special cases # -CFLAGS_COMMON = @CFLAGS_COMMON@ -CFLAGS_VLC = @CFLAGS_VLC@ - -CFLAGS_ARTS = @CFLAGS_ARTS@ -CFLAGS_DVD = @CFLAGS_DVD@ -CFLAGS_DVDREAD = @CFLAGS_DVDREAD@ -CFLAGS_ESD = @CFLAGS_ESD@ -CFLAGS_GLIDE = @CFLAGS_GLIDE@ -CFLAGS_GNOME = @CFLAGS_GNOME@ -CFLAGS_GTK = @CFLAGS_GTK@ -CFLAGS_KDE = @CFLAGS_KDE@ -CFLAGS_IDCTALTIVEC = @CFLAGS_IDCTALTIVEC@ -CFLAGS_MACOSX = @CFLAGS_MACOSX@ -CFLAGS_MAD = @CFLAGS_MAD@ -CFLAGS_MEMCPYALTIVEC = @CFLAGS_MEMCPYALTIVEC@ -CFLAGS_MOTIONALTIVEC = @CFLAGS_MOTIONALTIVEC@ -CFLAGS_QT = @CFLAGS_QT@ -CFLAGS_SDL = @CFLAGS_SDL@ -CFLAGS_WIN32 = @CFLAGS_WIN32@ -CFLAGS_X11 = @CFLAGS_X11@ -CFLAGS_XVIDEO = @CFLAGS_XVIDEO@ +vlc_LDFLAGS = @vlc_LDFLAGS@ +plugins_LDFLAGS += @plugins_LDFLAGS@ +builtins_LDFLAGS += @builtins_LDFLAGS@ + +a52_LDFLAGS = @a52_LDFLAGS@ +aa_LDFLAGS = @aa_LDFLAGS@ +alsa_LDFLAGS = @alsa_LDFLAGS@ +arts_LDFLAGS = @arts_LDFLAGS@ +beos_LDFLAGS = @beos_LDFLAGS@ +chroma_i420_rgb_LDFLAGS = @chroma_i420_rgb_LDFLAGS@ +directx_LDFLAGS = @directx_LDFLAGS@ +dsp_LDFLAGS = @dsp_LDFLAGS@ +dvd_LDFLAGS = @dvd_LDFLAGS@ +dvdread_LDFLAGS = @dvdread_LDFLAGS@ +esd_LDFLAGS = @esd_LDFLAGS@ +filter_distort_LDFLAGS = @filter_distort_LDFLAGS@ +ggi_LDFLAGS = @ggi_LDFLAGS@ +glide_LDFLAGS = @glide_LDFLAGS@ +gnome_LDFLAGS = @gnome_LDFLAGS@ +gtk_LDFLAGS = @gtk_LDFLAGS@ +idctaltivec_LDFLAGS = @idctaltivec_LDFLAGS@ +imdct_LDFLAGS = @imdct_LDFLAGS@ +imdct3dn_LDFLAGS = @imdct3dn_LDFLAGS@ +imdctsse_LDFLAGS = @imdctsse_LDFLAGS@ +ipv4_LDFLAGS = @ipv4_LDFLAGS@ +kde_LDFLAGS = @kde_LDFLAGS@ +lirc_LDFLAGS = @lirc_LDFLAGS@ +macosx_LDFLAGS = @macosx_LDFLAGS@ +mad_LDFLAGS = @mad_LDFLAGS@ +memcpyaltivec_LDFLAGS = @memcpyaltivec_LDFLAGS@ +motionaltivec_LDFLAGS = @motionaltivec_LDFLAGS@ +ncurses_LDFLAGS = @ncurses_LDFLAGS@ +qnx_LDFLAGS = @qnx_LDFLAGS@ +qt_LDFLAGS = @qt_LDFLAGS@ +rc_LDFLAGS = @rc_LDFLAGS@ +sdl_LDFLAGS = @sdl_LDFLAGS@ +vcd_LDFLAGS = @vcd_LDFLAGS@ +vorbis_LDFLAGS = @vorbis_LDFLAGS@ +waveout_LDFLAGS = @waveout_LDFLAGS@ +x11_LDFLAGS = @x11_LDFLAGS@ +xvideo_LDFLAGS = @xvideo_LDFLAGS@ # # Other special cases @@ -149,15 +147,15 @@ NEED_GETOPT = @NEED_GETOPT@ PROGRAM_OPTIONS = $(SYS) $(ARCH) ifeq ($(DEBUG),1) PROGRAM_OPTIONS += DEBUG -DEFINE += -DDEBUG +CFLAGS += -DDEBUG endif ifeq ($(CPROF),1) PROGRAM_OPTIONS += CPROF -DEFINE += -DCPROF +CFLAGS += -DCPROF endif ifeq ($(GPROF),1) PROGRAM_OPTIONS += GPROF -DEFINE += -DGPROF +CFLAGS += -DGPROF endif # PROGRAM_BUILD is a complete identification of the build @@ -170,20 +168,15 @@ else PROGRAM_BUILD = `date` $(USER)@`hostname` endif -# DEFINE will contain some of the constants definitions decided in Makefile, -# including SYS_xx. It will be passed to C compiler. -DEFINE_SYS := -DSYS_$(shell echo $(SYS) | sed -e 's/-.*//' | tr '[a-z].' '[A-Z]_') -DEFINE += $(DEFINE_SYS) - # On Linux and Solaris, activate 64-bit off_t (by default under BSD) -DEFINE += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE +CFLAGS += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE # Gettext support -DEFINE += -DLOCALEDIR=\"$(datadir)/locale\" +CFLAGS += -DLOCALEDIR=\"$(datadir)/locale\" # Data and plugin location -DEFINE += -DDATA_PATH=\"@prefix@/share/videolan\" -DEFINE += -DPLUGIN_PATH=\"@prefix@/lib/videolan/vlc\" +CFLAGS += -DDATA_PATH=\"@prefix@/share/videolan\" +CFLAGS += -DPLUGIN_PATH=\"@prefix@/lib/videolan/vlc\" ############################################################################### # Tuning and other variables - do not change anything except if you know @@ -193,25 +186,11 @@ DEFINE += -DPLUGIN_PATH=\"@prefix@/lib/videolan/vlc\" # # C headers directories # -INCLUDE += @INCLUDE@ -INCLUDE += -Iinclude -Iextras - -# -# Libraries needed by built-in modules -# -LIB_BUILTINS := $(patsubst %,$$LIB_%,$(shell echo $(BUILTINS) | tr '[a-z]' '[A-Z]')) - -# -# Libraries needed by the vlc executable -# -ifneq (,$(findstring mingw32,$(SYS))) -LIB_VLC += -lws2_32 -lnetapi32 -endif +CFLAGS += -Iinclude -Iextras # # C compiler flags: mainstream compilation # -CFLAGS += $(DEFINE) $(INCLUDE) CFLAGS += -D_REENTRANT CFLAGS += -D_GNU_SOURCE @@ -219,23 +198,6 @@ ifeq ($(RELEASE),1) CFLAGS += -DHAVE_RELEASE endif -# flags needed for clean beos compilation -ifeq ($(SYS),beos) -CFLAGS += -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual -endif - -ifneq (,$(findstring darwin,$(SYS))) -CFLAGS += -no-cpp-precomp -endif - -ifneq (,$(findstring mingw32,$(SYS))) -CFLAGS += -fnative-struct -D_OFF_T_ -D_off_t=long -endif - -ifneq (,$(findstring bsd,$(SYS))) -CFLAGS += -pthread -endif - # Optimizations : don't compile debug versions with them ifeq ($(OPTIMS),1) CFLAGS += @CFLAGS_OPTIM@ @@ -271,17 +233,10 @@ endif #end of optimisations endif -# -# C compiler flags: dependancies -# -DCFLAGS += $(INCLUDE) -DCFLAGS += -M - # # C compiler flags: linking # LDFLAGS += @LDFLAGS@ -LDFLAGS += $(LIB) LDFLAGS += -Wall ifneq ($(DEBUG),1) ifneq ($(GPROF),1) @@ -290,23 +245,17 @@ ifneq ($(CPROF),1) endif endif endif -ifneq (,$(findstring mingw32,$(SYS))) -LDFLAGS += -mwindows -Xlinker --force-exe-suffix -endif # -# C compiler flags: plugin compilation +# C compiler flags: plugins and builtins compilation # -ifneq (,$(findstring mingw32,$(SYS))) -PCFLAGS += -fnative-struct -else -PCFLAGS += -fPIC -endif +plugins_CFLAGS += -DPLUGIN -I../../include -I../../extras +builtins_CFLAGS += -DBUILTIN -I../../include -I../../extras # -# C compiler flags: plugin linking +# Linker flags: plugins and builtins linking # -PLDFLAGS += @PLDFLAGS@ +builtins_LDFLAGS += $(patsubst %,$$%_LDFLAGS,$(BUILTINS)) # # Debugging and profiling support diff --git a/configure b/configure index 9f4c56df84..61b70328e7 100755 --- a/configure +++ b/configure @@ -126,8 +126,6 @@ ac_help="$ac_help Misc options:" ac_help="$ac_help --with-words=endianness set endianness (big or little)" -ac_help="$ac_help - --with-dll-path=PATH path to Win32 DLLs (default search in \$PWD)" ac_help="$ac_help --enable-gprof gprof profiling (default disabled)" ac_help="$ac_help @@ -697,7 +695,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:701: checking host system type" >&5 +echo "configure:699: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -718,7 +716,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:722: checking target system type" >&5 +echo "configure:720: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -736,7 +734,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:740: checking build system type" >&5 +echo "configure:738: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -763,10 +761,11 @@ VERSION="0.3.0" CODENAME=Ourumov save_CFLAGS="${CFLAGS}" +save_CPPFLAGS="${CPPFLAGS}" save_LDFLAGS="${LDFLAGS}" echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:770: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:769: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -795,7 +794,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:799: checking for $ac_word" >&5 +echo "configure:798: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -825,7 +824,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:829: checking for $ac_word" >&5 +echo "configure:828: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -876,7 +875,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:880: checking for $ac_word" >&5 +echo "configure:879: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -908,7 +907,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:912: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:911: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -919,12 +918,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 923 "configure" +#line 922 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -950,12 +949,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:954: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:953: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:959: checking whether we are using GNU C" >&5 +echo "configure:958: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -964,7 +963,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -983,7 +982,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:987: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:986: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1015,7 +1014,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1019: checking how to run the C preprocessor" >&5 +echo "configure:1018: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1030,13 +1029,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1047,13 +1046,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1064,13 +1063,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1104,7 +1103,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1108: checking for $ac_word" >&5 +echo "configure:1107: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1136,7 +1135,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1140: checking for $ac_word" >&5 +echo "configure:1139: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1168,11 +1167,78 @@ else fi fi +# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1174: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +STRIP="$ac_cv_prog_STRIP" +if test -n "$STRIP"; then + echo "$ac_t""$STRIP" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + +if test -z "$ac_cv_prog_STRIP"; then +if test -n "$ac_tool_prefix"; then + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1206: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_STRIP="strip" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":" +fi +fi +STRIP="$ac_cv_prog_STRIP" +if test -n "$STRIP"; then + echo "$ac_t""$STRIP" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +else + STRIP=":" +fi +fi + # Extract the first word of "gmake", so it can be a program name with args. set dummy gmake; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1176: checking for $ac_word" >&5 +echo "configure:1242: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1207,7 +1273,7 @@ fi if test "x$GMAKE" = "xno"; then echo $ac_n "checking whether GNU make is installed""... $ac_c" 1>&6 -echo "configure:1211: checking whether GNU make is installed" >&5 +echo "configure:1277: checking whether GNU make is installed" >&5 if eval "test \"`echo '$''{'ac_cv_gmake'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1239,7 +1305,7 @@ EOF # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1243: checking for $ac_word" >&5 +echo "configure:1309: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1268,7 +1334,7 @@ fi echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:1272: checking for strerror in -lcposix" >&5 +echo "configure:1338: checking for strerror in -lcposix" >&5 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1276,7 +1342,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1310,12 +1376,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1314: checking for ANSI C header files" >&5 +echo "configure:1380: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1323,7 +1389,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1340,7 +1406,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1358,7 +1424,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1379,7 +1445,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1390,7 +1456,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1414,12 +1480,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1418: checking for working const" >&5 +echo "configure:1484: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1489,21 +1555,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1493: checking for inline" >&5 +echo "configure:1559: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1529,12 +1595,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:1533: checking for off_t" >&5 +echo "configure:1599: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1562,12 +1628,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1566: checking for size_t" >&5 +echo "configure:1632: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1597,19 +1663,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1601: checking for working alloca.h" >&5 +echo "configure:1667: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -1630,12 +1696,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1634: checking for alloca" >&5 +echo "configure:1700: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -1695,12 +1761,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1699: checking whether alloca needs Cray hooks" >&5 +echo "configure:1765: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1729: checking for $ac_func" >&5 +echo "configure:1795: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1780,7 +1846,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:1784: checking stack direction for C alloca" >&5 +echo "configure:1850: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1788,7 +1854,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -1832,17 +1898,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1836: checking for $ac_hdr" >&5 +echo "configure:1902: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1912: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1871,12 +1937,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1875: checking for $ac_func" >&5 +echo "configure:1941: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1924,7 +1990,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:1928: checking for working mmap" >&5 +echo "configure:1994: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1932,7 +1998,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -2096,12 +2162,12 @@ fi echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:2100: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo "configure:2166: checking whether we are using the GNU C Library 2.1 or newer" >&5 if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2137,17 +2203,17 @@ stdlib.h string.h unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2141: checking for $ac_hdr" >&5 +echo "configure:2207: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2178,12 +2244,12 @@ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ strdup strtoul tsearch __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2182: checking for $ac_func" >&5 +echo "configure:2248: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2246,7 +2312,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:2250: checking for iconv" >&5 +echo "configure:2316: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2254,7 +2320,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -2264,7 +2330,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:2268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -2276,7 +2342,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext < #include @@ -2286,7 +2352,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:2290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -2307,13 +2373,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:2311: checking for iconv declaration" >&5 +echo "configure:2377: checking for iconv declaration" >&5 if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2332,7 +2398,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -2361,19 +2427,19 @@ EOF echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:2365: checking for nl_langinfo and CODESET" >&5 +echo "configure:2431: checking for nl_langinfo and CODESET" >&5 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:2377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else @@ -2396,19 +2462,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:2400: checking for LC_MESSAGES" >&5 +echo "configure:2466: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:2412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -2429,7 +2495,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:2433: checking whether NLS is requested" >&5 +echo "configure:2499: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -2451,7 +2517,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:2455: checking whether included gettext is requested" >&5 +echo "configure:2521: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -2471,17 +2537,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:2475: checking for libintl.h" >&5 +echo "configure:2541: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2485: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2551: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2498,12 +2564,12 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 -echo "configure:2502: checking for GNU gettext in libc" >&5 +echo "configure:2568: checking for GNU gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -2512,7 +2578,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:2516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext1_libc=yes else @@ -2528,14 +2594,14 @@ echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6 if test "$gt_cv_func_gnugettext1_libc" != "yes"; then echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 -echo "configure:2532: checking for GNU gettext in libintl" >&5 +echo "configure:2598: checking for GNU gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else gt_save_LIBS="$LIBS" LIBS="$LIBS -lintl $LIBICONV" cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -2544,7 +2610,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:2548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext1_libintl=yes else @@ -2577,12 +2643,12 @@ EOF for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2581: checking for $ac_func" >&5 +echo "configure:2647: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2634,7 +2700,7 @@ done # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2638: checking for $ac_word" >&5 +echo "configure:2704: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2668,7 +2734,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2672: checking for $ac_word" >&5 +echo "configure:2738: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2705,7 +2771,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2709: checking for $ac_word" >&5 +echo "configure:2775: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2755,7 +2821,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2759: checking for $ac_word" >&5 +echo "configure:2825: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2789,7 +2855,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2793: checking for $ac_word" >&5 +echo "configure:2859: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2825,7 +2891,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2829: checking for $ac_word" >&5 +echo "configure:2895: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2896,7 +2962,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2900: checking for $ac_word" >&5 +echo "configure:2966: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2929,7 +2995,7 @@ done ac_verc_fail=yes else echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:2933: checking version of bison" >&5 +echo "configure:2999: checking version of bison" >&5 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -2976,7 +3042,7 @@ echo "configure:2933: checking version of bison" >&5 LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:2980: checking for catalogs to be installed" >&5 +echo "configure:3046: checking for catalogs to be installed" >&5 NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -3028,7 +3094,7 @@ echo "configure:2980: checking for catalogs to be installed" >&5 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:3032: checking for a BSD compatible install" >&5 +echo "configure:3098: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3090,18 +3156,24 @@ case x"${target_os}" in ;; xbsdi*) SYS=bsdi - LIB_DVD="${LIB_DVD} -ldvd" - LIB_VCD="${LIB_VCD} -ldvd" + save_CFLAGS="${save_CFLAGS} -pthread" + dvd_LDFLAGS="${dvd_LDFLAGS} -ldvd" + vcd_LDFLAGS="${vcd_LDFLAGS} -ldvd" + ;; + x*bsd*) + SYS="${target_os}" + save_CFLAGS="${save_CFLAGS} -pthread" ;; xdarwin*) SYS=darwin + save_CFLAGS="${save_CFLAGS} -no-cpp-precomp" ;; x*mingw32*) SYS=mingw32 # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. set dummy ${ac_tool_prefix}windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3105: checking for $ac_word" >&5 +echo "configure:3177: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3133,7 +3205,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3137: checking for $ac_word" >&5 +echo "configure:3209: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3165,35 +3237,52 @@ else fi fi - LIB_IPV4="${LIB_IPV4} -lws2_32" - LIB_RC="${LIB_RC} -lws2_32" + save_CFLAGS="${save_CFLAGS} -fnative-struct -D_OFF_T_ -D_off_t=long" + save_LDFLAGS="${save_LDFLAGS} -mwindows -Xlinker --force-exe-suffix" + vlc_LDFLAGS="${vlc_LDFLAGS} -lws2_32 -lnetapi32" + ipv4_LDFLAGS="${ipv4_LDFLAGS} -lws2_32" + rc_LDFLAGS="${rc_LDFLAGS} -lws2_32" ;; x*nto*) SYS=nto - LIB_X11="${LIB_X11} -lsocket" - LIB_XVIDEO="${LIB_XVIDEO} -lsocket" + x11_LDFLAGS="${x11_LDFLAGS} -lsocket" + xvideo_LDFLAGS="${xvideo_LDFLAGS} -lsocket" ;; xbeos) SYS=beos - LIB_VLC="${LIB_VLC} -lbe" - LIB_BEOS="${LIB_BEOS} -lbe -lgame -lroot -ltracker" - LIB_IPV4="${LIB_IPV4} -lbind" - PLDFLAGS="${PLDFLAGS} -nostart" + vlc_LDFLAGS="${vlc_LDFLAGS} -lbe" + plugins_LDFLAGS="${plugins_LDFLAGS} -nostart" + beos_LDFLAGS="${beos_LDFLAGS} -lbe -lgame -lroot -ltracker" + ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind" ;; x*) SYS="${target_os}" ;; esac +if test x"${SYS}" != xbeos +then + save_CFLAGS="${save_CFLAGS} -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual" +fi + +if test x"${SYS}" = xmingw32 +then + plugins_CFLAGS="${plugins_CFLAGS} -fnative-struct" +else + plugins_CFLAGS="${plugins_CFLAGS} -fPIC" +fi + +save_CFLAGS="${save_CFLAGS} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'a-z.' 'A-Z_'`" + for ac_func in gettimeofday select strerror strtod strtol isatty usleep vasprintf swab sigrelse getpwuid memalign posix_memalign do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3192: checking for $ac_func" >&5 +echo "configure:3281: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3242,12 +3331,12 @@ done echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:3246: checking for connect" >&5 +echo "configure:3335: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -3289,7 +3378,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:3293: checking for connect in -lsocket" >&5 +echo "configure:3382: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3297,7 +3386,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3323,8 +3412,8 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIB_IPV4="${LIB_IPV4} -lsocket" - LIB_VLC="${LIB_VLC} -lsocket" + ipv4_LDFLAGS="${ipv4_LDFLAGS} -lsocket" + vlc_LDFLAGS="${vlc_LDFLAGS} -lsocket" else echo "$ac_t""no" 1>&6 @@ -3333,12 +3422,12 @@ fi fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:3337: checking for gethostbyname" >&5 +echo "configure:3426: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -3380,7 +3469,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3384: checking for gethostbyname in -lnsl" >&5 +echo "configure:3473: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3388,7 +3477,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3414,7 +3503,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIB_IPV4="${LIB_IPV4} -lnsl" + ipv4_LDFLAGS="${ipv4_LDFLAGS} -lnsl" else echo "$ac_t""no" 1>&6 fi @@ -3423,12 +3512,12 @@ fi fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:3427: checking for gethostbyname" >&5 +echo "configure:3516: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -3470,7 +3559,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lbind""... $ac_c" 1>&6 -echo "configure:3474: checking for gethostbyname in -lbind" >&5 +echo "configure:3563: checking for gethostbyname in -lbind" >&5 ac_lib_var=`echo bind'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3478,7 +3567,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3504,7 +3593,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIB_IPV4="${LIB_IPV4} -lbind" + ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind" else echo "$ac_t""no" 1>&6 fi @@ -3513,12 +3602,12 @@ fi fi echo $ac_n "checking for nanosleep""... $ac_c" 1>&6 -echo "configure:3517: checking for nanosleep" >&5 +echo "configure:3606: checking for nanosleep" >&5 if eval "test \"`echo '$''{'ac_cv_func_nanosleep'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_nanosleep=yes" else @@ -3560,7 +3649,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6 -echo "configure:3564: checking for nanosleep in -lrt" >&5 +echo "configure:3653: checking for nanosleep in -lrt" >&5 ac_lib_var=`echo rt'_'nanosleep | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3568,7 +3657,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3594,12 +3683,12 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIB_VLC="${LIB_VLC} -lrt" + vlc_LDFLAGS="${vlc_LDFLAGS} -lrt" else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:3603: checking for nanosleep in -lposix4" >&5 +echo "configure:3692: checking for nanosleep in -lposix4" >&5 ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3607,7 +3696,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3633,7 +3722,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIB_VLC="${LIB_VLC} -lposix4" + vlc_LDFLAGS="${vlc_LDFLAGS} -lposix4" else echo "$ac_t""no" 1>&6 fi @@ -3645,12 +3734,12 @@ fi fi echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:3649: checking for inet_aton" >&5 +echo "configure:3738: checking for inet_aton" >&5 if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_inet_aton=yes" else @@ -3692,7 +3781,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:3696: checking for inet_aton in -lresolv" >&5 +echo "configure:3785: checking for inet_aton in -lresolv" >&5 ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3700,7 +3789,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3726,7 +3815,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIB_IPV4="${LIB_IPV4} -lresolv" + ipv4_LDFLAGS="${ipv4_LDFLAGS} -lresolv" else echo "$ac_t""no" 1>&6 fi @@ -3735,12 +3824,12 @@ fi fi echo $ac_n "checking for textdomain""... $ac_c" 1>&6 -echo "configure:3739: checking for textdomain" >&5 +echo "configure:3828: checking for textdomain" >&5 if eval "test \"`echo '$''{'ac_cv_func_textdomain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_textdomain=yes" else @@ -3782,7 +3871,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for textdomain in -lintl""... $ac_c" 1>&6 -echo "configure:3786: checking for textdomain in -lintl" >&5 +echo "configure:3875: checking for textdomain in -lintl" >&5 ac_lib_var=`echo intl'_'textdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3790,7 +3879,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3816,7 +3905,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIB_VLC="${LIB_VLC} -lintl" + vlc_LDFLAGS="${vlc_LDFLAGS} -lintl" else echo "$ac_t""no" 1>&6 fi @@ -3827,12 +3916,12 @@ fi NEED_GETOPT=0 echo $ac_n "checking for getopt_long""... $ac_c" 1>&6 -echo "configure:3831: checking for getopt_long" >&5 +echo "configure:3920: checking for getopt_long" >&5 if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getopt_long=yes" else @@ -3877,7 +3966,7 @@ else echo "$ac_t""no" 1>&6 # FreeBSD has a gnugetopt library for this: echo $ac_n "checking for getopt_long in -lgnugetopt""... $ac_c" 1>&6 -echo "configure:3881: checking for getopt_long in -lgnugetopt" >&5 +echo "configure:3970: checking for getopt_long in -lgnugetopt" >&5 ac_lib_var=`echo gnugetopt'_'getopt_long | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3885,7 +3974,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgnugetopt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3914,7 +4003,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then cat >> confdefs.h <<\EOF #define HAVE_GETOPT_LONG 1 EOF - LIB_VLC="${LIB_VLC} -lgnugetopt" + vlc_LDFLAGS="${vlc_LDFLAGS} -lgnugetopt" else echo "$ac_t""no" 1>&6 NEED_GETOPT=1 @@ -3924,12 +4013,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3928: checking return type of signal handlers" >&5 +echo "configure:4017: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3946,7 +4035,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:3950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3965,7 +4054,7 @@ EOF echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:3969: checking for dlopen in -ldl" >&5 +echo "configure:4058: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3973,7 +4062,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3999,13 +4088,13 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIB_VLC="${LIB_VLC} -ldl" + vlc_LDFLAGS="${vlc_LDFLAGS} -ldl" else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for cos in -lm""... $ac_c" 1>&6 -echo "configure:4009: checking for cos in -lm" >&5 +echo "configure:4098: checking for cos in -lm" >&5 ac_lib_var=`echo m'_'cos | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4013,7 +4102,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4039,14 +4128,14 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIB_IMDCT="${LIB_IMDCT} -lm" - LIB_FILTER_DISTORT="${LIB_FILTER_DISTORT} -lm" + imdct_LDFLAGS="${imdct_LDFLAGS} -lm" + filter_distort_LDFLAGS="${filter_distort_LDFLAGS} -lm" else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6 -echo "configure:4050: checking for pow in -lm" >&5 +echo "configure:4139: checking for pow in -lm" >&5 ac_lib_var=`echo m'_'pow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4054,7 +4143,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4080,10 +4169,10 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIB_IMDCT="${LIB_IMDCT} -lm" - LIB_IMDCT3DN="${LIB_IMDCT3DN} -lm" - LIB_IMDCTSSE="${LIB_IMDCTSSE} -lm" - LIB_CHROMA_I420_RGB="${LIB_CHROMA_I420_RGB} -lm" + imdct_LDFLAGS="${imdct_LDFLAGS} -lm" + imdct3dn_LDFLAGS="${imdct3dn_LDFLAGS} -lm" + imdctsse_LDFLAGS="${imdctsse_LDFLAGS} -lm" + chroma_i420_rgb_LDFLAGS="${chroma_i420_rgb_LDFLAGS} -lm" else echo "$ac_t""no" 1>&6 @@ -4093,7 +4182,7 @@ fi THREAD_LIB=error if test "x${THREAD_LIB}" = xerror; then echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6 -echo "configure:4097: checking for pthread_attr_init in -lpthread" >&5 +echo "configure:4186: checking for pthread_attr_init in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4101,7 +4190,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4135,7 +4224,7 @@ fi fi if test "x${THREAD_LIB}" = xerror; then echo $ac_n "checking for pthread_attr_init in -lpthreads""... $ac_c" 1>&6 -echo "configure:4139: checking for pthread_attr_init in -lpthreads" >&5 +echo "configure:4228: checking for pthread_attr_init in -lpthreads" >&5 ac_lib_var=`echo pthreads'_'pthread_attr_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4143,7 +4232,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4177,7 +4266,7 @@ fi fi if test "x${THREAD_LIB}" = xerror; then echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6 -echo "configure:4181: checking for pthread_attr_init in -lc_r" >&5 +echo "configure:4270: checking for pthread_attr_init in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_attr_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4185,7 +4274,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4219,12 +4308,12 @@ fi fi if test "x${THREAD_LIB}" = xerror; then echo $ac_n "checking for pthread_attr_init""... $ac_c" 1>&6 -echo "configure:4223: checking for pthread_attr_init" >&5 +echo "configure:4312: checking for pthread_attr_init" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pthread_attr_init=yes" else @@ -4270,7 +4359,7 @@ fi fi echo $ac_n "checking for cthread_fork in -lthreads""... $ac_c" 1>&6 -echo "configure:4274: checking for cthread_fork in -lthreads" >&5 +echo "configure:4363: checking for cthread_fork in -lthreads" >&5 ac_lib_var=`echo threads'_'cthread_fork | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4278,7 +4367,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4311,7 +4400,7 @@ fi cat > conftest.$ac_ext < EOF @@ -4327,7 +4416,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < EOF @@ -4347,17 +4436,17 @@ for ac_hdr in getopt.h strings.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4351: checking for $ac_hdr" >&5 +echo "configure:4440: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4387,17 +4476,17 @@ for ac_hdr in sys/sockio.h fcntl.h sys/time.h sys/times.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4391: checking for $ac_hdr" >&5 +echo "configure:4480: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4427,17 +4516,17 @@ for ac_hdr in dlfcn.h image.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4431: checking for $ac_hdr" >&5 +echo "configure:4520: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4441: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4467,17 +4556,17 @@ for ac_hdr in arpa/inet.h net/if.h netinet/in.h sys/socket.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4471: checking for $ac_hdr" >&5 +echo "configure:4560: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4481: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4570: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4507,17 +4596,17 @@ for ac_hdr in machine/param.h sys/shm.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4511: checking for $ac_hdr" >&5 +echo "configure:4600: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4547,17 +4636,17 @@ for ac_hdr in linux/version.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4551: checking for $ac_hdr" >&5 +echo "configure:4640: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4561: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4650: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4585,12 +4674,12 @@ done echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:4589: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:4678: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4599,7 +4688,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:4603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4692: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -4624,17 +4713,17 @@ for ac_hdr in cthreads.h pthread.h kernel/scheduler.h kernel/OS.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4628: checking for $ac_hdr" >&5 +echo "configure:4717: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4669,23 +4758,22 @@ then if test x$x_libraries = xNONE; then x_libraries=/usr/X11R6/lib fi - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$x_includes" + CPPFLAGS="$save_CPPFLAGS -I$x_includes" for ac_hdr in X11/extensions/dpms.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4679: checking for $ac_hdr" >&5 +echo "configure:4767: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4689: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4707,7 +4795,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then EOF cat > conftest.$ac_ext < EOF @@ -4729,24 +4817,24 @@ else fi done - CPPFLAGS=$saved_CPPFLAGS + CPPFLAGS="$save_CPPFLAGS" fi echo $ac_n "checking for ntohl in sys/param.h""... $ac_c" 1>&6 -echo "configure:4737: checking for ntohl in sys/param.h" >&5 +echo "configure:4825: checking for ntohl in sys/param.h" >&5 if eval "test \"`echo '$''{'ac_cv_c_ntohl_sys_param_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -Wall -Werror" cat > conftest.$ac_ext < int main() { void foo() { int meuh; ntohl(meuh); } ; return 0; } EOF -if { (eval echo configure:4750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_ntohl_sys_param_h=yes else @@ -4767,20 +4855,20 @@ EOF fi echo $ac_n "checking if \$CC accepts -finline-limit""... $ac_c" 1>&6 -echo "configure:4771: checking if \$CC accepts -finline-limit" >&5 +echo "configure:4859: checking if \$CC accepts -finline-limit" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline_limit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -finline-limit-30000" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline_limit=yes else @@ -4798,20 +4886,20 @@ if test x"$ac_cv_c_inline_limit" != x"no"; then fi echo $ac_n "checking if \$CC accepts -Wall -Winline""... $ac_c" 1>&6 -echo "configure:4802: checking if \$CC accepts -Wall -Winline" >&5 +echo "configure:4890: checking if \$CC accepts -Wall -Winline" >&5 if eval "test \"`echo '$''{'ac_cv_c_Wall_Winline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -Wall -Winline" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_Wall_Winline=yes else @@ -4828,20 +4916,20 @@ if test x"$ac_cv_c_Wall_Winline" != x"no"; then save_CFLAGS="${save_CFLAGS} -Wall -Winline" else echo $ac_n "checking if \$CC accepts -wall -winline""... $ac_c" 1>&6 -echo "configure:4832: checking if \$CC accepts -wall -winline" >&5 +echo "configure:4920: checking if \$CC accepts -wall -winline" >&5 if eval "test \"`echo '$''{'ac_cv_c_wall_winline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -wall -winline" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_wall_winline=yes else @@ -4860,20 +4948,20 @@ echo "$ac_t""$ac_cv_c_wall_winline" 1>&6 fi echo $ac_n "checking if \$CC accepts -pipe""... $ac_c" 1>&6 -echo "configure:4864: checking if \$CC accepts -pipe" >&5 +echo "configure:4952: checking if \$CC accepts -pipe" >&5 if eval "test \"`echo '$''{'ac_cv_c_pipe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -pipe" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_pipe=yes else @@ -4891,20 +4979,20 @@ if test x"$ac_cv_c_pipe" != x"no"; then fi echo $ac_n "checking if \$CC accepts -O3""... $ac_c" 1>&6 -echo "configure:4895: checking if \$CC accepts -O3" >&5 +echo "configure:4983: checking if \$CC accepts -O3" >&5 if eval "test \"`echo '$''{'ac_cv_c_o3'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -O3" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_o3=yes else @@ -4921,20 +5009,20 @@ if test x"$ac_cv_c_o3" != x"no"; then CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3" else echo $ac_n "checking if \$CC accepts -O2""... $ac_c" 1>&6 -echo "configure:4925: checking if \$CC accepts -O2" >&5 +echo "configure:5013: checking if \$CC accepts -O2" >&5 if eval "test \"`echo '$''{'ac_cv_c_o2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -O2" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_o2=yes else @@ -4951,20 +5039,20 @@ echo "$ac_t""$ac_cv_c_o2" 1>&6 CFLAGS_OPTIM="${CFLAGS_OPTIM} -O2" else echo $ac_n "checking if \$CC accepts -O""... $ac_c" 1>&6 -echo "configure:4955: checking if \$CC accepts -O" >&5 +echo "configure:5043: checking if \$CC accepts -O" >&5 if eval "test \"`echo '$''{'ac_cv_c_o'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -O" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_o=yes else @@ -4984,20 +5072,20 @@ echo "$ac_t""$ac_cv_c_o" 1>&6 fi echo $ac_n "checking if \$CC accepts -ffast-math""... $ac_c" 1>&6 -echo "configure:4988: checking if \$CC accepts -ffast-math" >&5 +echo "configure:5076: checking if \$CC accepts -ffast-math" >&5 if eval "test \"`echo '$''{'ac_cv_c_fast_math'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -ffast-math" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5089: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_fast_math=yes else @@ -5015,20 +5103,20 @@ if test x"$ac_cv_c_fast_math" != x"no"; then fi echo $ac_n "checking if \$CC accepts -funroll-loops""... $ac_c" 1>&6 -echo "configure:5019: checking if \$CC accepts -funroll-loops" >&5 +echo "configure:5107: checking if \$CC accepts -funroll-loops" >&5 if eval "test \"`echo '$''{'ac_cv_c_unroll_loops'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -funroll-loops" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_unroll_loops=yes else @@ -5046,20 +5134,20 @@ if test x"$ac_cv_c_unroll_loops" != x"no"; then fi echo $ac_n "checking if \$CC accepts -fomit-frame-pointer""... $ac_c" 1>&6 -echo "configure:5050: checking if \$CC accepts -fomit-frame-pointer" >&5 +echo "configure:5138: checking if \$CC accepts -fomit-frame-pointer" >&5 if eval "test \"`echo '$''{'ac_cv_c_omit_frame_pointer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -fomit-frame-pointer" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_omit_frame_pointer=yes else @@ -5077,20 +5165,20 @@ if test x"$ac_cv_c_omit_frame_pointer" != x"no"; then fi echo $ac_n "checking if \$CC accepts -bundle -undefined error -lcc_dynamic""... $ac_c" 1>&6 -echo "configure:5081: checking if \$CC accepts -bundle -undefined error -lcc_dynamic" >&5 +echo "configure:5169: checking if \$CC accepts -bundle -undefined error -lcc_dynamic" >&5 if eval "test \"`echo '$''{'ac_cv_ld_darwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -bundle -undefined error -lcc_dynamic" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_ld_darwin=yes else @@ -5104,24 +5192,24 @@ fi echo "$ac_t""$ac_cv_ld_darwin" 1>&6 if test x"$ac_cv_ld_darwin" != x"no"; then - PLDFLAGS="${PLDFLAGS} -bundle -undefined error -lcc_dynamic" + plugins_LDFLAGS="${plugins_LDFLAGS} -bundle -undefined error -lcc_dynamic" fi echo $ac_n "checking if \$CC accepts -shared""... $ac_c" 1>&6 -echo "configure:5112: checking if \$CC accepts -shared" >&5 +echo "configure:5200: checking if \$CC accepts -shared" >&5 if eval "test \"`echo '$''{'ac_cv_ld_plugins'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -shared" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_ld_plugins=yes else @@ -5135,11 +5223,11 @@ fi echo "$ac_t""$ac_cv_ld_plugins" 1>&6 if test x"$ac_cv_ld_plugins" != x"no"; then - PLDFLAGS="${PLDFLAGS} -shared" + plugins_LDFLAGS="${plugins_LDFLAGS} -shared" fi echo $ac_n "checking __attribute__ ((aligned ())) support""... $ac_c" 1>&6 -echo "configure:5143: checking __attribute__ ((aligned ())) support" >&5 +echo "configure:5231: checking __attribute__ ((aligned ())) support" >&5 if eval "test \"`echo '$''{'ac_cv_c_attribute_aligned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5147,14 +5235,14 @@ else CFLAGS="${save_CFLAGS} -Werror" for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_attribute_aligned=$ac_cv_c_attr_align_try else @@ -5174,22 +5262,23 @@ EOF fi CFLAGS="${save_CFLAGS}" +CPPFLAGS="${save_CPPFLAGS}" LDFLAGS="${save_LDFLAGS}" echo $ac_n "checking for boolean_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:5181: checking for boolean_t in sys/types.h" >&5 +echo "configure:5270: checking for boolean_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_sys_types_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { boolean_t foo; ; return 0; } EOF -if { (eval echo configure:5193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_boolean_t_sys_types_h=yes else @@ -5210,19 +5299,19 @@ EOF fi echo $ac_n "checking for boolean_t in pthread.h""... $ac_c" 1>&6 -echo "configure:5214: checking for boolean_t in pthread.h" >&5 +echo "configure:5303: checking for boolean_t in pthread.h" >&5 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_pthread_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { boolean_t foo; ; return 0; } EOF -if { (eval echo configure:5226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_boolean_t_pthread_h=yes else @@ -5243,19 +5332,19 @@ EOF fi echo $ac_n "checking for boolean_t in cthreads.h""... $ac_c" 1>&6 -echo "configure:5247: checking for boolean_t in cthreads.h" >&5 +echo "configure:5336: checking for boolean_t in cthreads.h" >&5 if eval "test \"`echo '$''{'ac_cv_c_boolean_t_cthreads_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { boolean_t foo; ; return 0; } EOF -if { (eval echo configure:5259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_boolean_t_cthreads_h=yes else @@ -5294,19 +5383,19 @@ SSE_MODULES="imdctsse downmixsse" ALTIVEC_MODULES="idctaltivec motionaltivec" echo $ac_n "checking if \$CC groks MMX inline assembly""... $ac_c" 1>&6 -echo "configure:5298: checking if \$CC groks MMX inline assembly" >&5 +echo "configure:5387: checking if \$CC groks MMX inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_mmx_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mmx_inline=yes else @@ -5324,19 +5413,19 @@ if test x"$ac_cv_mmx_inline" != x"no"; then fi echo $ac_n "checking if \$CC groks MMX EXT inline assembly""... $ac_c" 1>&6 -echo "configure:5328: checking if \$CC groks MMX EXT inline assembly" >&5 +echo "configure:5417: checking if \$CC groks MMX EXT inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_mmxext_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mmxext_inline=yes else @@ -5354,19 +5443,19 @@ if test x"$ac_cv_mmxext_inline" != x"no"; then fi echo $ac_n "checking if \$CC groks 3D Now! inline assembly""... $ac_c" 1>&6 -echo "configure:5358: checking if \$CC groks 3D Now! inline assembly" >&5 +echo "configure:5447: checking if \$CC groks 3D Now! inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_3dnow_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_3dnow_inline=yes else @@ -5388,19 +5477,19 @@ EOF fi echo $ac_n "checking if \$CC groks SSE inline assembly""... $ac_c" 1>&6 -echo "configure:5392: checking if \$CC groks SSE inline assembly" >&5 +echo "configure:5481: checking if \$CC groks SSE inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_sse_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sse_inline=yes else @@ -5425,19 +5514,19 @@ fi # we should be able to remove this test with future versions of mingw32 if test x$SYS != xmingw32; then echo $ac_n "checking if \$CC groks Altivec inline assembly""... $ac_c" 1>&6 -echo "configure:5429: checking if \$CC groks Altivec inline assembly" >&5 +echo "configure:5518: checking if \$CC groks Altivec inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_altivec_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_altivec_inline=yes else @@ -5447,14 +5536,14 @@ else save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Wa,-m7400" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5547: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_altivec_inline="-Wa,-m7400" else @@ -5477,16 +5566,16 @@ if test x"$ac_cv_altivec_inline" != x"no"; then EOF if test x"$ac_cv_altivec_inline" != x"yes"; then - CFLAGS_IDCTALTIVEC="$CFLAGS_IDCTALTIVEC $ac_cv_altivec_inline" - CFLAGS_MOTIONALTIVEC="$CFLAGS_MOTIONALTIVEC $ac_cv_altivec_inline" - CFLAGS_MEMCPYALTIVEC="$CFLAGS_MEMCPYALTIVEC $ac_cv_altivec_inline" - CFLAGS_VLC="$CFLAGS_VLC $ac_cv_altivec_inline" + idctaltivec_CFLAGS="$idctaltivec_CFLAGS $ac_cv_altivec_inline" + motionaltivec_CFLAGS="$motionaltivec_CFLAGS $ac_cv_altivec_inline" + memcpyaltivec_CFLAGS="$memcpyaltivec_CFLAGS $ac_cv_altivec_inline" + vlc_CFLAGS="$vlc_CFLAGS $ac_cv_altivec_inline" fi ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" fi echo $ac_n "checking if \$CC groks Altivec C extensions""... $ac_c" 1>&6 -echo "configure:5490: checking if \$CC groks Altivec C extensions" >&5 +echo "configure:5579: checking if \$CC groks Altivec C extensions" >&5 if eval "test \"`echo '$''{'ac_cv_c_altivec'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5494,14 +5583,14 @@ else CFLAGS="$CFLAGS -faltivec" # Darwin test cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5594: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_altivec=-faltivec else @@ -5510,16 +5599,16 @@ else rm -rf conftest* # Linux/PPC test - CFLAGS="$save_CFLAGS $CFLAGS_IDCTALTIVEC -fvec" + CFLAGS="$save_CFLAGS $idctaltivec_CFLAGS -fvec" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_altivec="-fvec" else @@ -5542,29 +5631,29 @@ if test x"$ac_cv_c_altivec" != x"no"; then #define CAN_COMPILE_C_ALTIVEC 1 EOF - CFLAGS_IDCTALTIVEC="$CFLAGS_IDCTALTIVEC $ac_cv_c_altivec" - CFLAGS_MOTIONALTIVEC="$CFLAGS_MOTIONALTIVEC $ac_cv_c_altivec" - CFLAGS_MEMCPYALTIVEC="$CFLAGS_MEMCPYALTIVEC $ac_cv_c_altivec" - CFLAGS_VLC="$CFLAGS_VLC $ac_cv_c_altivec" + idctaltivec_CFLAGS="$idctaltivec_CFLAGS $ac_cv_c_altivec" + motionaltivec_CFLAGS="$motionaltivec_CFLAGS $ac_cv_c_altivec" + memcpyaltivec_CFLAGS="$memcpyaltivec_CFLAGS $ac_cv_c_altivec" + vlc_CFLAGS="$vlc_CFLAGS $ac_cv_c_altivec" ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" fi echo $ac_n "checking if linker needs -framework vecLib""... $ac_c" 1>&6 -echo "configure:5554: checking if linker needs -framework vecLib" >&5 +echo "configure:5643: checking if linker needs -framework vecLib" >&5 if eval "test \"`echo '$''{'ac_cv_ld_altivec'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -framework vecLib" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_ld_altivec=yes else @@ -5580,10 +5669,10 @@ fi echo "$ac_t""$ac_cv_ld_altivec" 1>&6 if test x"$ac_cv_ld_altivec" != x"no"; then - LIB_IDCTALTIVEC="${LIB_IDCTALTIVEC} -framework vecLib" - LIB_MOTIONALTIVEC="${LIB_MOTIONALTIVEC} -framework vecLib" - LIB_MEMCPYALTIVEC="${LIB_MEMCPYALTIVEC} -framework vecLib" - LIB_VLC="${LIB_VLC} -framework vecLib" + idctaltivec_LDFLAGS="${idctaltivec_LDFLAGS} -framework vecLib" + motionaltivec_LDFLAGS="${motionaltivec_LDFLAGS} -framework vecLib" + memcpyaltivec_LDFLAGS="${memcpyaltivec_LDFLAGS} -framework vecLib" + vlc_LDFLAGS="${vlc_LDFLAGS} -framework vecLib" fi fi # end if mingw32 @@ -5650,6 +5739,7 @@ if test "${enable_debug+set}" = set; then fi +RELEASE=0 # Check whether --enable-release or --disable-release was given. if test "${enable_release+set}" = set; then enableval="$enable_release" @@ -5695,17 +5785,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5699: checking for $ac_hdr" >&5 +echo "configure:5789: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5726,7 +5816,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then #define $ac_tr_hdr 1 EOF PLUGINS="${PLUGINS} dvd" - LIB_DVD="${LIB_DVD} -ldvdcss" + dvd_LDFLAGS="${dvd_LDFLAGS} -ldvdcss" else echo "$ac_t""no" 1>&6 echo "configure: warning: libdvdcss is no longer provided with vlc; please get libdvdcss from http://www.videolan.org/libdvdcss/ and build it. Then either use --with-dvdcss= for dynamic linking (recommended under Unix) or --with-dvdcss-tree= for static linking (recommended under BeOS, Windows, MacOS X). Alternatively you can use --disable-dvd to disable the DVD plugin." 1>&2 @@ -5736,7 +5826,7 @@ done else echo $ac_n "checking for libdvdcss.a in ${with_dvdcss_tree}""... $ac_c" 1>&6 -echo "configure:5740: checking for libdvdcss.a in ${with_dvdcss_tree}" >&5 +echo "configure:5830: checking for libdvdcss.a in ${with_dvdcss_tree}" >&5 real_dvdcss_tree="`cd ${with_dvdcss_tree} 2>/dev/null && pwd`" if test "x$real_dvdcss_tree" = x then @@ -5747,8 +5837,8 @@ echo "configure:5740: checking for libdvdcss.a in ${with_dvdcss_tree}" >&5 then echo "$ac_t""${real_dvdcss_tree}/src/.libs/libdvdcss.a" 1>&6 BUILTINS="${BUILTINS} dvd" - LIB_DVD="${LIB_DVD} ${real_dvdcss_tree}/src/.libs/libdvdcss.a" - CFLAGS_DVD="${CFLAGS_DVD} -I${real_dvdcss_tree}/src" + dvd_LDFLAGS="${dvd_LDFLAGS} ${real_dvdcss_tree}/src/.libs/libdvdcss.a" + dvd_CFLAGS="${dvd_CFLAGS} -I${real_dvdcss_tree}/src" else echo "$ac_t""no" 1>&6 { echo "configure: error: cannot find ${real_dvdcss_tree}/src/.libs/libdvdcss.a, make sure you compiled libdvdcss in ${with_dvdcss_tree}" 1>&2; exit 1; } @@ -5757,18 +5847,18 @@ echo "configure:5740: checking for libdvdcss.a in ${with_dvdcss_tree}" >&5 ;; xno) PLUGINS="${PLUGINS} dvd" - CFLAGS_DVD="${CFLAGS_DVD} -DGOD_DAMN_DMCA" - LIB_DVD="${LIB_DVD} -ldl" + dvd_CFLAGS="${dvd_CFLAGS} -DGOD_DAMN_DMCA" + dvd_LDFLAGS="${dvd_LDFLAGS} -ldl" ;; *) echo $ac_n "checking for dvdcss headers in ${with_dvdcss}""... $ac_c" 1>&6 -echo "configure:5766: checking for dvdcss headers in ${with_dvdcss}" >&5 +echo "configure:5856: checking for dvdcss headers in ${with_dvdcss}" >&5 if test -f ${with_dvdcss}/include/dvdcss/dvdcss.h then echo "$ac_t""yes" 1>&6 PLUGINS="${PLUGINS} dvd" - LIB_DVD="${LIB_DVD} -L${with_dvdcss}/lib -ldvdcss" - CFLAGS_DVD="${CFLAGS_DVD} -I${with_dvdcss}/include" + dvd_LDFLAGS="${dvd_LDFLAGS} -L${with_dvdcss}/lib -ldvdcss" + dvd_CFLAGS="${dvd_CFLAGS} -I${with_dvdcss}/include" else echo "$ac_t""no" 1>&6 { echo "configure: error: cannot find ${with_dvdcss}/include/dvdcss/dvdcss.h" 1>&2; exit 1; } @@ -5797,17 +5887,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5801: checking for $ac_hdr" >&5 +echo "configure:5891: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5811: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5828,7 +5918,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then #define $ac_tr_hdr 1 EOF PLUGINS="${PLUGINS} dvdread" - LIB_DVDREAD="${LIB_DVDREAD} -ldvdread" + dvdread_LDFLAGS="${dvdread_LDFLAGS} -ldvdread" else echo "$ac_t""no" 1>&6 fi @@ -5837,13 +5927,13 @@ done ;; *) echo $ac_n "checking for dvdread headers in ${withval}""... $ac_c" 1>&6 -echo "configure:5841: checking for dvdread headers in ${withval}" >&5 +echo "configure:5931: checking for dvdread headers in ${withval}" >&5 if test -f ${withval}/include/dvdread/dvd_reader.h then echo "$ac_t""yes" 1>&6 PLUGINS="${PLUGINS} dvdread" - LIB_DVDREAD="${LIB_DVDREAD} -L${withval}/lib -ldvdread" - CFLAGS_DVDREAD="${CFLAGS_DVDREAD} -I${withval}/include" + dvdread_LDFLAGS="${dvdread_LDFLAGS} -L${withval}/lib -ldvdread" + dvdread_CFLAGS="${dvdread_CFLAGS} -I${withval}/include" else echo "$ac_t""no" 1>&6 { echo "configure: error: Cannot find ${withval}/dvdread/dvd_reader.h" 1>&2; exit 1; } @@ -5862,7 +5952,7 @@ fi if test x$enable_vcd != xno then cat > conftest.$ac_ext < EOF @@ -5884,7 +5974,7 @@ rm -f conftest* if test "x${SYS}" = "xdarwin" then PLUGINS="${PLUGINS} vcd" - LIB_VCD="${LIB_VCD} -framework IOKit -framework CoreFoundation" + vcd_LDFLAGS="${vcd_LDFLAGS} -framework IOKit -framework CoreFoundation" fi fi @@ -5903,12 +5993,12 @@ fi echo $ac_n "checking for inet_pton""... $ac_c" 1>&6 -echo "configure:5907: checking for inet_pton" >&5 +echo "configure:5997: checking for inet_pton" >&5 if eval "test \"`echo '$''{'ac_cv_func_inet_pton'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_inet_pton=yes" else @@ -5968,36 +6058,36 @@ fi if test x$enable_mad = xyes then PLUGINS="${PLUGINS} mad" - LIB_MAD="${LIB_MAD} -lmad" + mad_LDFLAGS="${mad_LDFLAGS} -lmad" # Check whether --with-mad or --without-mad was given. if test "${with_mad+set}" = set; then withval="$with_mad" if test "x$with_val" != "xno" -a "x$with_val" != "x" then - CFLAGS_MAD="${CFLAGS_MAD} -I$with_val/include" - LIB_MAD="${LIB_MAD} -L$with_val/lib" + mad_CFLAGS="${mad_CFLAGS} -I$with_val/include" + mad_LDFLAGS="${mad_LDFLAGS} -L$with_val/lib" fi fi save_CFLAGS=$CFLAGS save_LDFLAGS=$LDFLAGS - CFLAGS="$CFLAGS $CFLAGS_MAD" - LDFLAGS="$LDFLAGS $LIB_MAD" + CFLAGS="$CFLAGS $mad_CFLAGS" + LDFLAGS="$LDFLAGS $mad_LDFLAGS" for ac_hdr in mad.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5991: checking for $ac_hdr" >&5 +echo "configure:6081: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6027,7 +6117,7 @@ fi done echo $ac_n "checking for mad_bit_init in -lmad""... $ac_c" 1>&6 -echo "configure:6031: checking for mad_bit_init in -lmad" >&5 +echo "configure:6121: checking for mad_bit_init in -lmad" >&5 ac_lib_var=`echo mad'_'mad_bit_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6035,7 +6125,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmad $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6083,8 +6173,7 @@ fi if test x$SYS = xbeos then PLUGINS="${PLUGINS} beos" - -else +fi # Check whether --enable-a52 or --disable-a52 was given. if test "${enable_a52+set}" = set; then @@ -6098,17 +6187,17 @@ if test "x$enableval" != "xno" -a x$SYS != xmingw32 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6102: checking for $ac_hdr" >&5 +echo "configure:6191: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6130,7 +6219,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then EOF BUILTINS="${BUILTINS} a52" - LIB_A52="${LIB_A52} -la52 -lm" + a52_LDFLAGS="${a52_LDFLAGS} -la52 -lm" else echo "$ac_t""no" 1>&6 @@ -6151,17 +6240,17 @@ then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6155: checking for $ac_hdr" >&5 +echo "configure:6244: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6183,7 +6272,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then EOF PLUGINS="${PLUGINS} vorbis" - LIB_VORBIS="${LIB_VORBIS} -lvorbis" + vorbis_LDFLAGS="${vorbis_LDFLAGS} -lvorbis" else echo "$ac_t""no" 1>&6 @@ -6214,23 +6303,22 @@ if test x$enable_x11 != xno && if test x$x_libraries = xNONE; then x_libraries=/usr/X11R6/lib fi - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$x_includes" + CPPFLAGS="$save_CPPFLAGS -I$x_includes" for ac_hdr in X11/Xlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6224: checking for $ac_hdr" >&5 +echo "configure:6312: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6322: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6252,15 +6340,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then EOF PLUGINS="${PLUGINS} x11" - LIB_X11="${LIB_X11} -L$x_libraries -lX11 -lXext" - CFLAGS_X11="${CFLAGS_X11} -I$x_includes" + x11_LDFLAGS="${x11_LDFLAGS} -L$x_libraries -lX11 -lXext" + x11_CFLAGS="${x11_CFLAGS} -I$x_includes" else echo "$ac_t""no" 1>&6 fi done - CPPFLAGS=$saved_CPPFLAGS + CPPFLAGS="$save_CPPFLAGS" fi # Check whether --enable-xvideo or --disable-xvideo was given. @@ -6277,23 +6365,23 @@ if test x$enable_xvideo != xno && if test x$x_libraries = xNONE; then x_libraries=/usr/X11R6/lib fi - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$x_includes" + save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$save_CPPFLAGS -I$x_includes" for ac_hdr in X11/extensions/Xv.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6287: checking for $ac_hdr" >&5 +echo "configure:6375: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6314,10 +6402,10 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then #define $ac_tr_hdr 1 EOF - saved_CFLAGS=$CFLAGS + save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -L$x_libraries -lX11 -lXext" echo $ac_n "checking for XvSetPortAttribute in -lXv_pic""... $ac_c" 1>&6 -echo "configure:6321: checking for XvSetPortAttribute in -lXv_pic" >&5 +echo "configure:6409: checking for XvSetPortAttribute in -lXv_pic" >&5 ac_lib_var=`echo Xv_pic'_'XvSetPortAttribute | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6325,7 +6413,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXv_pic $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6353,19 +6441,19 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 # We have Xv_pic, that's good, we can build an xvideo.so plugin ! PLUGINS="${PLUGINS} xvideo" - LIB_XVIDEO="${LIB_XVIDEO} -L$x_libraries -lX11 -lXext -lXv_pic" - CFLAGS_XVIDEO="${CFLAGS_XVIDEO} -I$x_includes" + xvideo_LDFLAGS="${xvideo_LDFLAGS} -L$x_libraries -lX11 -lXext -lXv_pic" + xvideo_CFLAGS="${xvideo_CFLAGS} -I$x_includes" else echo "$ac_t""no" 1>&6 # We don't have Xv_pic, let's make xvideo.a as builtin BUILTINS="${BUILTINS} xvideo" - LIB_XVIDEO="${LIB_XVIDEO} -L$x_libraries -lX11 -lXext -lXv" - CFLAGS_XVIDEO="${CFLAGS_XVIDEO} -I$x_includes" + xvideo_LDFLAGS="${xvideo_LDFLAGS} -L$x_libraries -lX11 -lXext -lXv" + xvideo_CFLAGS="${xvideo_CFLAGS} -I$x_includes" fi - CFLAGS=$saved_CFLAGS + CFLAGS="$save_CFLAGS" - CPPFLAGS=$saved_CPPFLAGS + CPPFLAGS="$save_CPPFLAGS" else echo "$ac_t""no" 1>&6 fi @@ -6394,7 +6482,7 @@ fi # Extract the first word of "sdl12-config", so it can be a program name with args. set dummy sdl12-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6398: checking for $ac_word" >&5 +echo "configure:6486: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDL12_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6434,7 +6522,7 @@ fi # Extract the first word of "sdl11-config", so it can be a program name with args. set dummy sdl11-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6438: checking for $ac_word" >&5 +echo "configure:6526: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDL11_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6475,7 +6563,7 @@ fi # Extract the first word of "sdl-config", so it can be a program name with args. set dummy sdl-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6479: checking for $ac_word" >&5 +echo "configure:6567: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6513,25 +6601,24 @@ fi if test x${SDL_CONFIG} != xno then PLUGINS="${PLUGINS} sdl" - CFLAGS_SDL="${CFLAGS_SDL} `${SDL_CONFIG} --cflags`" - LIB_SDL="${LIB_SDL} `${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`" - save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $CFLAGS_SDL" + sdl_CFLAGS="${sdl_CFLAGS} `${SDL_CONFIG} --cflags`" + sdl_LDFLAGS="${sdl_LDFLAGS} `${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`" + CPPFLAGS="$save_CPPFLAGS $sdl_CFLAGS" for ac_hdr in ${SDL_HEADER} do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6525: checking for $ac_hdr" >&5 +echo "configure:6612: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6564,7 +6651,7 @@ Please install it and try again. Alternatively you can also configure with fi done - CPPFLAGS=$save_CPPFLAGS + CPPFLAGS="$save_CPPFLAGS" if expr 1.1.5 \> `$SDL_CONFIG --version` >/dev/null then { echo "configure: error: The development package for SDL is not installed. @@ -6601,17 +6688,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6605: checking for $ac_hdr" >&5 +echo "configure:6692: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6632,7 +6719,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then #define $ac_tr_hdr 1 EOF PLUGINS="${PLUGINS} directx" - LIB_DIRECTX="${LIB_DIRECTX} -lgdi32" + directx_LDFLAGS="${directx_LDFLAGS} -lgdi32" else echo "$ac_t""no" 1>&6 fi @@ -6640,12 +6727,12 @@ done else echo $ac_n "checking for directX headers in ${withval}""... $ac_c" 1>&6 -echo "configure:6644: checking for directX headers in ${withval}" >&5 +echo "configure:6731: checking for directX headers in ${withval}" >&5 if test -f ${withval}/ddraw.h then PLUGINS="${PLUGINS} directx" - LIB_DIRECTX="${LIB_DIRECTX} -L${withval}/lib -lgdi32" - INCLUDE="${INCLUDE} -I${withval}" + directx_LDFLAGS="${directx_LDFLAGS} -L${withval}/lib -lgdi32" + directx_CFLAGS="${directx_CFLAGS} -I${withval}" echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 @@ -6667,17 +6754,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6671: checking for $ac_hdr" >&5 +echo "configure:6758: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6726,14 +6813,14 @@ fi if test x$enable_ggi = xyes then PLUGINS="${PLUGINS} ggi" - LIB_GGI="${LIB_GGI} -lggi" + ggi_LDFLAGS="${ggi_LDFLAGS} -lggi" # Check whether --with-ggi or --without-ggi was given. if test "${with_ggi+set}" = set; then withval="$with_ggi" if test "x$with_val" != "xno" -a "x$with_val" != "x" then CFLAGS_GGI="${CFLAGS_GGI} -I$with_val/include" - LIB_GGI="${LIB_GGI} -L$with_val/lib" + ggi_LDFLAGS="${ggi_LDFLAGS} -L$with_val/lib" fi fi @@ -6748,15 +6835,15 @@ fi if test x$enable_glide = xyes then PLUGINS="${PLUGINS} glide" - LIB_GLIDE="${LIB_GLIDE} -lglide2x -lm" - CFLAGS_GLIDE="${CFLAGS_GLIDE} -I/usr/include/glide" + glide_LDFLAGS="${glide_LDFLAGS} -lglide2x -lm" + glide_CFLAGS="${glide_CFLAGS} -I/usr/include/glide" # Check whether --with-glide or --without-glide was given. if test "${with_glide+set}" = set; then withval="$with_glide" if test "x$with_val" != "xno" -a "x$with_val" != "x" then - CFLAGS_GLIDE="${CFLAGS_GLIDE} -I$with_val/include" - LIB_GLIDE="${LIB_GLIDE} -L$with_val/lib" + glide_CFLAGS="${glide_CFLAGS} -I$with_val/include" + glide_LDFLAGS="${glide_LDFLAGS} -L$with_val/lib" fi fi @@ -6772,17 +6859,17 @@ if test x$enable_aa = xyes then ac_safe=`echo "aalib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for aalib.h""... $ac_c" 1>&6 -echo "configure:6776: checking for aalib.h" >&5 +echo "configure:6863: checking for aalib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6807,7 +6894,7 @@ fi if test x$have_aa = xtrue then PLUGINS="${PLUGINS} aa" - LIB_AA="${LIB_AA} -laa" + aa_LDFLAGS="${aa_LDFLAGS} -laa" fi fi @@ -6833,17 +6920,17 @@ then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6837: checking for $ac_hdr" >&5 +echo "configure:6924: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6866,7 +6953,7 @@ EOF PLUGINS="${PLUGINS} dsp" echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6 -echo "configure:6870: checking for main in -lossaudio" >&5 +echo "configure:6957: checking for main in -lossaudio" >&5 ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6874,14 +6961,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lossaudio $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6896,7 +6983,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIB_DSP="${LIB_DSP} -lossaudio" + dsp_LDFLAGS="${dsp_LDFLAGS} -lossaudio" else echo "$ac_t""no" 1>&6 fi @@ -6917,7 +7004,7 @@ if test "${enable_esd+set}" = set; then # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6921: checking for $ac_word" >&5 +echo "configure:7008: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6953,8 +7040,8 @@ fi if test x${ESD_CONFIG} != xno then PLUGINS="${PLUGINS} esd" - CFLAGS_ESD="${CFLAGS_ESD} `${ESD_CONFIG} --cflags`" - LIB_ESD="${LIB_ESD} `${ESD_CONFIG} --libs`" + esd_CFLAGS="${esd_CFLAGS} `${ESD_CONFIG} --cflags`" + esd_LDFLAGS="${esd_LDFLAGS} `${ESD_CONFIG} --libs`" fi fi fi @@ -6968,7 +7055,7 @@ if test "${enable_arts+set}" = set; then # Extract the first word of "artsc-config", so it can be a program name with args. set dummy artsc-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6972: checking for $ac_word" >&5 +echo "configure:7059: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ARTS_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7004,8 +7091,8 @@ fi if test x${ARTS_CONFIG} != xno then PLUGINS="${PLUGINS} arts" - CFLAGS_ARTS="${CFLAGS_ARTS} `${ARTS_CONFIG} --cflags`" - LIB_ARTS="${LIB_ARTS} `${ARTS_CONFIG} --libs `" + arts_CFLAGS="${arts_CFLAGS} `${ARTS_CONFIG} --cflags`" + arts_LDFLAGS="${arts_LDFLAGS} `${ARTS_CONFIG} --libs `" fi fi fi @@ -7018,17 +7105,17 @@ if test "${enable_alsa+set}" = set; then then ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6 -echo "configure:7022: checking for alsa/asoundlib.h" >&5 +echo "configure:7109: checking for alsa/asoundlib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7045,7 +7132,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6 -echo "configure:7049: checking for main in -lasound" >&5 +echo "configure:7136: checking for main in -lasound" >&5 ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7053,14 +7140,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7089,7 +7176,7 @@ fi if test x$have_alsa = xtrue then PLUGINS="${PLUGINS} alsa" - LIB_ALSA="${LIB_ALSA} -lasound -lm -ldl" + alsa_LDFLAGS="${alsa_LDFLAGS} -lasound -lm -ldl" fi fi fi @@ -7104,7 +7191,7 @@ fi if test "x$enableval" != "xno" -a x$SYS = xmingw32 then PLUGINS="${PLUGINS} waveout" - LIB_WAVEOUT="-lwinmm" + waveout_LDFLAGS="-lwinmm" fi @@ -7137,7 +7224,7 @@ fi # Extract the first word of "gtk12-config", so it can be a program name with args. set dummy gtk12-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7141: checking for $ac_word" >&5 +echo "configure:7228: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK12_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7176,7 +7263,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7180: checking for $ac_word" >&5 +echo "configure:7267: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7216,27 +7303,26 @@ fi then { echo "configure: error: Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-gtk." 1>&2; exit 1; } fi - CFLAGS_GTK="${CFLAGS_GTK} `${GTK_CONFIG} --cflags gtk`" - LIB_GTK="${LIB_GTK} `${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`" + gtk_CFLAGS="${gtk_CFLAGS} `${GTK_CONFIG} --cflags gtk`" + gtk_LDFLAGS="${gtk_LDFLAGS} `${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`" # now look for the gtk.h header - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $CFLAGS_GTK" + CPPFLAGS="$save_CPPFLAGS $gtk_CFLAGS" ac_cv_gtk_headers=yes for ac_hdr in gtk/gtk.h glib.h gdk/gdk.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7230: checking for $ac_hdr" >&5 +echo "configure:7316: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7326: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7270,7 +7356,7 @@ done PLUGINS="${PLUGINS} gtk" ALIASES="${ALIASES} gvlc" fi - CPPFLAGS=$saved_CPPFLAGS + CPPFLAGS="$save_CPPFLAGS" fi fi @@ -7282,7 +7368,7 @@ if test "${enable_gnome+set}" = set; then # Extract the first word of "gnome-config", so it can be a program name with args. set dummy gnome-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7286: checking for $ac_word" >&5 +echo "configure:7372: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7317,27 +7403,26 @@ fi if test -x ${GNOME_CONFIG} then - CFLAGS_GNOME="${CFLAGS_GNOME} `${GNOME_CONFIG} --cflags gtk gnomeui`" - LIB_GNOME="${LIB_GNOME} `${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`" + gnome_CFLAGS="${gnome_CFLAGS} `${GNOME_CONFIG} --cflags gtk gnomeui`" + gnome_LDFLAGS="${gnome_LDFLAGS} `${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`" fi # now look for the gnome.h header - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $CFLAGS_GNOME" + CPPFLAGS="$save_CPPFLAGS $gnome_CFLAGS" for ac_hdr in gnome.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7331: checking for $ac_hdr" >&5 +echo "configure:7416: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7369,8 +7454,7 @@ developement tools or remove the --enable-gnome option" 1>&2; exit 1; } fi done - - CPPFLAGS=$saved_CPPFLAGS + CPPFLAGS="$save_CPPFLAGS" fi fi @@ -7381,8 +7465,8 @@ if test "${enable_qt+set}" = set; then if test x$enable_qt = xyes; then PLUGINS="${PLUGINS} qt" ALIASES="${ALIASES} qvlc" - LIB_QT="${LIB_QT} -lqt -L${QTDIR}/lib" - CFLAGS_QT="${CFLAGS_QT} -I/usr/include/qt -I${QTDIR}/include" + qt_LDFLAGS="${qt_LDFLAGS} -lqt -L${QTDIR}/lib" + qt_CFLAGS="${qt_CFLAGS} -I/usr/include/qt -I${QTDIR}/include" if test -x ${QTDIR}/bin/moc then MOC=${QTDIR}/bin/moc @@ -7399,9 +7483,9 @@ if test "${enable_kde+set}" = set; then if test x$enable_kde = xyes; then PLUGINS="${PLUGINS} kde" ALIASES="${ALIASES} kvlc" - LIB_KDE="${LIB_KDE} -L${KDEDIR}/lib -lkfile" - CFLAGS_KDE="${CFLAGS_KDE} -I/usr/include/kde -I/usr/include/qt" - CFLAGS_KDE="${CFLAGS_KDE} -I${KDEDIR}/include -I${QTDIR}/include" + kde_LDFLAGS="${kde_LDFLAGS} -L${KDEDIR}/lib -lkfile" + kde_CFLAGS="${kde_CFLAGS} -I/usr/include/kde -I/usr/include/qt" + kde_CFLAGS="${kde_CFLAGS} -I${KDEDIR}/include -I${QTDIR}/include" if test -x ${QTDIR}/bin/moc then MOC=${QTDIR}/bin/moc @@ -7418,26 +7502,26 @@ if test "${enable_macosx+set}" = set; then if test x$enable_macosx = xyes then BUILTINS="${BUILTINS} macosx" - LIB_MACOSX="${LIB_MACOSX} -framework CoreAudio -framework AudioToolbox -framework Cocoa -framework AGL -framework QuickTime -lobjc" - CFLAGS_MACOSX="${CFLAGS_MACOSX} -ObjC" - LIB_COMMON="${LIB_COMMON} -ObjC" + macosx_LDFLAGS="${macosx_LDFLAGS} -framework CoreAudio -framework AudioToolbox -framework Cocoa -framework AGL -framework QuickTime -lobjc" + macosx_CFLAGS="${macosx_CFLAGS} -ObjC" + LDFLAGS="${LDFLAGS} -ObjC" fi else for ac_hdr in Cocoa/Cocoa.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7431: checking for $ac_hdr" >&5 +echo "configure:7515: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7441: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7458,9 +7542,9 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then #define $ac_tr_hdr 1 EOF BUILTINS="${BUILTINS} macosx" - LIB_MACOSX="${LIB_MACOSX} -framework CoreAudio -framework AudioToolbox -framework Cocoa -framework AGL -framework QuickTime -lobjc" - CFLAGS_MACOSX="${CFLAGS_MACOSX} -ObjC" - LIB_COMMON="${LIB_COMMON} -ObjC" + macosx_LDFLAGS="${macosx_LDFLAGS} -framework CoreAudio -framework AudioToolbox -framework Cocoa -framework AGL -framework QuickTime -lobjc" + macosx_CFLAGS="${macosx_CFLAGS} -ObjC" + LDFLAGS="${LDFLAGS} -ObjC" else echo "$ac_t""no" 1>&6 @@ -7482,17 +7566,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7486: checking for $ac_hdr" >&5 +echo "configure:7570: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7514,7 +7598,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then EOF PLUGINS="${PLUGINS} qnx" - LIB_QNX="${LIB_QNX} -lasound -lph" + qnx_LDFLAGS="${qnx_LDFLAGS} -lasound -lph" else echo "$ac_t""no" 1>&6 @@ -7548,7 +7632,7 @@ if test "${enable_ncurses+set}" = set; then enableval="$enable_ncurses" if test x$enable_ncurses = xyes; then PLUGINS="${PLUGINS} ncurses" - LIB_NCURSES="${LIB_NCURSES} -lncurses" + ncurses_LDFLAGS="${ncurses_LDFLAGS} -lncurses" fi fi @@ -7563,17 +7647,17 @@ if test x$enable_lirc = xyes then ac_safe=`echo "lirc/lirc_client.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for lirc/lirc_client.h""... $ac_c" 1>&6 -echo "configure:7567: checking for lirc/lirc_client.h" >&5 +echo "configure:7651: checking for lirc/lirc_client.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7590,7 +7674,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for lirc_init in -llirc_client""... $ac_c" 1>&6 -echo "configure:7594: checking for lirc_init in -llirc_client" >&5 +echo "configure:7678: checking for lirc_init in -llirc_client" >&5 ac_lib_var=`echo lirc_client'_'lirc_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7598,7 +7682,7 @@ else ac_save_LIBS="$LIBS" LIBS="-llirc_client $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7638,12 +7722,10 @@ fi if test x$have_lirc = xtrue then PLUGINS="${PLUGINS} lirc" - LIB_LIRC="${LIB_LIRC} -llirc_client" + lirc_LDFLAGS="${lirc_LDFLAGS} -llirc_client" fi fi -fi - # Check whether --with- or --without- was given. if test "${with_+set}" = set; then withval="$with_" @@ -7666,7 +7748,7 @@ fi ;; *) echo $ac_n "checking whether the byte order is big-endian""... $ac_c" 1>&6 -echo "configure:7670: checking whether the byte order is big-endian" >&5 +echo "configure:7752: checking whether the byte order is big-endian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7714,17 +7796,6 @@ EOF fi -DLL_PATH=. -# Check whether --with-dll-path or --without-dll-path was given. -if test "${with_dll_path+set}" = set; then - withval="$with_dll_path" - if test "x$withval" != "xno" - then - DLL_PATH=$withval - fi -fi - - GPROF=0 # Check whether --enable-gprof or --disable-gprof was given. if test "${enable_gprof+set}" = set; then @@ -7739,7 +7810,7 @@ if test "${enable_cprof+set}" = set; then enableval="$enable_cprof" if test x$enableval = xyes; then - LIB_COMMON="${LIB_COMMON} -lcprof" + LDFLAGS="${LDFLAGS} -lcprof" CPROF=1 fi @@ -7751,7 +7822,7 @@ if test "${enable_pth+set}" = set; then enableval="$enable_pth" if test x$enableval = xyes; then echo $ac_n "checking for pth_init in -lpth""... $ac_c" 1>&6 -echo "configure:7755: checking for pth_init in -lpth" >&5 +echo "configure:7826: checking for pth_init in -lpth" >&5 ac_lib_var=`echo pth'_'pth_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7759,7 +7830,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpth $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7798,7 +7869,7 @@ else fi cat > conftest.$ac_ext < EOF @@ -7824,7 +7895,7 @@ if test "${enable_st+set}" = set; then enableval="$enable_st" if test x$enableval = xyes; then echo $ac_n "checking for st_init in -lst""... $ac_c" 1>&6 -echo "configure:7828: checking for st_init in -lst" >&5 +echo "configure:7899: checking for st_init in -lst" >&5 ac_lib_var=`echo st'_'st_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7832,7 +7903,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lst $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7871,7 +7942,7 @@ else fi cat > conftest.$ac_ext < EOF @@ -7892,7 +7963,7 @@ rm -f conftest* fi -LIB_COMMON="${LIB_COMMON} ${THREAD_LIB}" +LDFLAGS="${LDFLAGS} ${THREAD_LIB}" # Check whether --enable-plugins or --disable-plugins was given. if test "${enable_plugins+set}" = set; then @@ -8017,13 +8088,6 @@ PLUGIN_PATH="${ac_tool_prefix}/share/videolan" - - - - - - - @@ -8184,6 +8248,7 @@ s%@SET_MAKE@%$SET_MAKE%g s%@CC@%$CC%g s%@CPP@%$CPP%g s%@RANLIB@%$RANLIB%g +s%@STRIP@%$STRIP%g s%@GMAKE@%$GMAKE%g s%@ALLOCA@%$ALLOCA%g s%@GLIBC21@%$GLIBC21%g @@ -8226,7 +8291,6 @@ s%@ARCH@%$ARCH%g s%@PLUGINS@%$PLUGINS%g s%@BUILTINS@%$BUILTINS%g s%@ALIASES@%$ALIASES%g -s%@INCLUDE@%$INCLUDE%g s%@DEBUG@%$DEBUG%g s%@ASM@%$ASM%g s%@CPROF@%$CPROF%g @@ -8234,79 +8298,74 @@ s%@GPROF@%$GPROF%g s%@OPTIMS@%$OPTIMS%g s%@TUNING@%$TUNING%g s%@RELEASE@%$RELEASE%g -s%@VERSION@%$VERSION%g s%@MOC@%$MOC%g s%@BCBUILDER@%$BCBUILDER%g -s%@DLL_PATH@%$DLL_PATH%g s%@VLC_PACKAGE@%$VLC_PACKAGE%g s%@VLC_VERSION@%$VLC_VERSION%g -s%@PLDFLAGS@%$PLDFLAGS%g -s%@LIB_COMMON@%$LIB_COMMON%g -s%@LIB_VLC@%$LIB_VLC%g -s%@LIB_A52@%$LIB_A52%g -s%@LIB_AA@%$LIB_AA%g -s%@LIB_ALSA@%$LIB_ALSA%g -s%@LIB_ARTS@%$LIB_ARTS%g -s%@LIB_BEOS@%$LIB_BEOS%g -s%@LIB_CHROMA_I420_RGB@%$LIB_CHROMA_I420_RGB%g -s%@LIB_DARWIN@%$LIB_DARWIN%g -s%@LIB_DIRECTX@%$LIB_DIRECTX%g -s%@LIB_DSP@%$LIB_DSP%g -s%@LIB_DVD@%$LIB_DVD%g -s%@LIB_DVDREAD@%$LIB_DVDREAD%g -s%@LIB_ESD@%$LIB_ESD%g -s%@LIB_FILTER_DISTORT@%$LIB_FILTER_DISTORT%g -s%@LIB_GGI@%$LIB_GGI%g -s%@LIB_GLIDE@%$LIB_GLIDE%g -s%@LIB_GNOME@%$LIB_GNOME%g -s%@LIB_GTK@%$LIB_GTK%g -s%@LIB_IDCTALTIVEC@%$LIB_IDCTALTIVEC%g -s%@LIB_IMDCT@%$LIB_IMDCT%g -s%@LIB_IMDCT3DN@%$LIB_IMDCT3DN%g -s%@LIB_IMDCTSSE@%$LIB_IMDCTSSE%g -s%@LIB_IPV4@%$LIB_IPV4%g -s%@LIB_IPV6@%$LIB_IPV6%g -s%@LIB_KDE@%$LIB_KDE%g -s%@LIB_LIRC@%$LIB_LIRC%g -s%@LIB_MACOSX@%$LIB_MACOSX%g -s%@LIB_MAD@%$LIB_MAD%g -s%@LIB_MEMCPYALTIVEC@%$LIB_MEMCPYALTIVEC%g -s%@LIB_MOTIONALTIVEC@%$LIB_MOTIONALTIVEC%g -s%@LIB_MPEG_TS@%$LIB_MPEG_TS%g -s%@LIB_NCURSES@%$LIB_NCURSES%g -s%@LIB_QNX@%$LIB_QNX%g -s%@LIB_QT@%$LIB_QT%g -s%@LIB_RC@%$LIB_RC%g -s%@LIB_SDL@%$LIB_SDL%g -s%@LIB_VCD@%$LIB_VCD%g -s%@LIB_VORBIS@%$LIB_VORBIS%g -s%@LIB_WAVEOUT@%$LIB_WAVEOUT%g -s%@LIB_WIN32@%$LIB_WIN32%g -s%@LIB_X11@%$LIB_X11%g -s%@LIB_XVIDEO@%$LIB_XVIDEO%g -s%@CFLAGS_COMMON@%$CFLAGS_COMMON%g -s%@CFLAGS_VLC@%$CFLAGS_VLC%g -s%@CFLAGS_ARTS@%$CFLAGS_ARTS%g -s%@CFLAGS_DVD@%$CFLAGS_DVD%g -s%@CFLAGS_DVDREAD@%$CFLAGS_DVDREAD%g -s%@CFLAGS_ESD@%$CFLAGS_ESD%g -s%@CFLAGS_GLIDE@%$CFLAGS_GLIDE%g -s%@CFLAGS_GNOME@%$CFLAGS_GNOME%g -s%@CFLAGS_GTK@%$CFLAGS_GTK%g -s%@CFLAGS_KDE@%$CFLAGS_KDE%g -s%@CFLAGS_IDCTALTIVEC@%$CFLAGS_IDCTALTIVEC%g -s%@CFLAGS_MACOSX@%$CFLAGS_MACOSX%g -s%@CFLAGS_MAD@%$CFLAGS_MAD%g -s%@CFLAGS_MEMCPYALTIVEC@%$CFLAGS_MEMCPYALTIVEC%g -s%@CFLAGS_MOTIONALTIVEC@%$CFLAGS_MOTIONALTIVEC%g +s%@NEED_GETOPT@%$NEED_GETOPT%g s%@CFLAGS_OPTIM@%$CFLAGS_OPTIM%g s%@CFLAGS_OPTIM_NODEBUG@%$CFLAGS_OPTIM_NODEBUG%g -s%@CFLAGS_QT@%$CFLAGS_QT%g -s%@CFLAGS_SDL@%$CFLAGS_SDL%g -s%@CFLAGS_WIN32@%$CFLAGS_WIN32%g -s%@CFLAGS_X11@%$CFLAGS_X11%g -s%@CFLAGS_XVIDEO@%$CFLAGS_XVIDEO%g -s%@NEED_GETOPT@%$NEED_GETOPT%g +s%@vlc_CFLAGS@%$vlc_CFLAGS%g +s%@plugins_CFLAGS@%$plugins_CFLAGS%g +s%@builtins_CFLAGS@%$builtins_CFLAGS%g +s%@arts_CFLAGS@%$arts_CFLAGS%g +s%@dvd_CFLAGS@%$dvd_CFLAGS%g +s%@dvdread_CFLAGS@%$dvdread_CFLAGS%g +s%@directx_CFLAGS@%$directx_CFLAGS%g +s%@esd_CFLAGS@%$esd_CFLAGS%g +s%@glide_CFLAGS@%$glide_CFLAGS%g +s%@gnome_CFLAGS@%$gnome_CFLAGS%g +s%@gtk_CFLAGS@%$gtk_CFLAGS%g +s%@kde_CFLAGS@%$kde_CFLAGS%g +s%@idctaltivec_CFLAGS@%$idctaltivec_CFLAGS%g +s%@macosx_CFLAGS@%$macosx_CFLAGS%g +s%@mad_CFLAGS@%$mad_CFLAGS%g +s%@memcpyaltivec_CFLAGS@%$memcpyaltivec_CFLAGS%g +s%@motionaltivec_CFLAGS@%$motionaltivec_CFLAGS%g +s%@qt_CFLAGS@%$qt_CFLAGS%g +s%@sdl_CFLAGS@%$sdl_CFLAGS%g +s%@x11_CFLAGS@%$x11_CFLAGS%g +s%@xvideo_CFLAGS@%$xvideo_CFLAGS%g +s%@vlc_LDFLAGS@%$vlc_LDFLAGS%g +s%@plugins_LDFLAGS@%$plugins_LDFLAGS%g +s%@builtins_LDFLAGS@%$builtins_LDFLAGS%g +s%@a52_LDFLAGS@%$a52_LDFLAGS%g +s%@aa_LDFLAGS@%$aa_LDFLAGS%g +s%@alsa_LDFLAGS@%$alsa_LDFLAGS%g +s%@arts_LDFLAGS@%$arts_LDFLAGS%g +s%@beos_LDFLAGS@%$beos_LDFLAGS%g +s%@chroma_i420_rgb_LDFLAGS@%$chroma_i420_rgb_LDFLAGS%g +s%@directx_LDFLAGS@%$directx_LDFLAGS%g +s%@dsp_LDFLAGS@%$dsp_LDFLAGS%g +s%@dvd_LDFLAGS@%$dvd_LDFLAGS%g +s%@dvdread_LDFLAGS@%$dvdread_LDFLAGS%g +s%@esd_LDFLAGS@%$esd_LDFLAGS%g +s%@filter_distort_LDFLAGS@%$filter_distort_LDFLAGS%g +s%@ggi_LDFLAGS@%$ggi_LDFLAGS%g +s%@glide_LDFLAGS@%$glide_LDFLAGS%g +s%@gnome_LDFLAGS@%$gnome_LDFLAGS%g +s%@gtk_LDFLAGS@%$gtk_LDFLAGS%g +s%@idctaltivec_LDFLAGS@%$idctaltivec_LDFLAGS%g +s%@imdct_LDFLAGS@%$imdct_LDFLAGS%g +s%@imdct3dn_LDFLAGS@%$imdct3dn_LDFLAGS%g +s%@imdctsse_LDFLAGS@%$imdctsse_LDFLAGS%g +s%@ipv4_LDFLAGS@%$ipv4_LDFLAGS%g +s%@kde_LDFLAGS@%$kde_LDFLAGS%g +s%@lirc_LDFLAGS@%$lirc_LDFLAGS%g +s%@macosx_LDFLAGS@%$macosx_LDFLAGS%g +s%@mad_LDFLAGS@%$mad_LDFLAGS%g +s%@memcpyaltivec_LDFLAGS@%$memcpyaltivec_LDFLAGS%g +s%@motionaltivec_LDFLAGS@%$motionaltivec_LDFLAGS%g +s%@ncurses_LDFLAGS@%$ncurses_LDFLAGS%g +s%@qnx_LDFLAGS@%$qnx_LDFLAGS%g +s%@qt_LDFLAGS@%$qt_LDFLAGS%g +s%@rc_LDFLAGS@%$rc_LDFLAGS%g +s%@sdl_LDFLAGS@%$sdl_LDFLAGS%g +s%@vcd_LDFLAGS@%$vcd_LDFLAGS%g +s%@vorbis_LDFLAGS@%$vorbis_LDFLAGS%g +s%@waveout_LDFLAGS@%$waveout_LDFLAGS%g +s%@x11_LDFLAGS@%$x11_LDFLAGS%g +s%@xvideo_LDFLAGS@%$xvideo_LDFLAGS%g CEOF EOF diff --git a/configure.in b/configure.in index 7d2a42ce66..23b9d42c5b 100644 --- a/configure.in +++ b/configure.in @@ -9,6 +9,7 @@ CODENAME=Ourumov dnl Save CFLAGS and LDFLAGS save_CFLAGS="${CFLAGS}" +save_CPPFLAGS="${CPPFLAGS}" save_LDFLAGS="${LDFLAGS}" dnl Check for tools @@ -18,6 +19,7 @@ AC_PROG_CPP dnl Find the right ranlib, even when cross-compiling AC_CHECK_TOOL(RANLIB, ranlib, :) +AC_CHECK_TOOL(STRIP, strip, :) dnl Check for GNU make AC_PATH_PROG(GMAKE, gmake, no) @@ -58,59 +60,85 @@ case x"${target_os}" in ;; xbsdi*) SYS=bsdi - LIB_DVD="${LIB_DVD} -ldvd" - LIB_VCD="${LIB_VCD} -ldvd" + save_CFLAGS="${save_CFLAGS} -pthread" + dvd_LDFLAGS="${dvd_LDFLAGS} -ldvd" + vcd_LDFLAGS="${vcd_LDFLAGS} -ldvd" + ;; + x*bsd*) + SYS="${target_os}" + save_CFLAGS="${save_CFLAGS} -pthread" ;; xdarwin*) SYS=darwin + save_CFLAGS="${save_CFLAGS} -no-cpp-precomp" ;; x*mingw32*) SYS=mingw32 AC_CHECK_TOOL(WINDRES, windres, :) - LIB_IPV4="${LIB_IPV4} -lws2_32" - LIB_RC="${LIB_RC} -lws2_32" + save_CFLAGS="${save_CFLAGS} -fnative-struct -D_OFF_T_ -D_off_t=long" + save_LDFLAGS="${save_LDFLAGS} -mwindows -Xlinker --force-exe-suffix" + vlc_LDFLAGS="${vlc_LDFLAGS} -lws2_32 -lnetapi32" + ipv4_LDFLAGS="${ipv4_LDFLAGS} -lws2_32" + rc_LDFLAGS="${rc_LDFLAGS} -lws2_32" ;; x*nto*) SYS=nto - LIB_X11="${LIB_X11} -lsocket" - LIB_XVIDEO="${LIB_XVIDEO} -lsocket" + x11_LDFLAGS="${x11_LDFLAGS} -lsocket" + xvideo_LDFLAGS="${xvideo_LDFLAGS} -lsocket" ;; xbeos) SYS=beos - LIB_VLC="${LIB_VLC} -lbe" - LIB_BEOS="${LIB_BEOS} -lbe -lgame -lroot -ltracker" - LIB_IPV4="${LIB_IPV4} -lbind" - PLDFLAGS="${PLDFLAGS} -nostart" + vlc_LDFLAGS="${vlc_LDFLAGS} -lbe" + plugins_LDFLAGS="${plugins_LDFLAGS} -nostart" + beos_LDFLAGS="${beos_LDFLAGS} -lbe -lgame -lroot -ltracker" + ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind" ;; x*) SYS="${target_os}" ;; esac +dnl Flags needed for clean BeOS compilation +if test x"${SYS}" != xbeos +then + save_CFLAGS="${save_CFLAGS} -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual" +fi + +dnl Flags for plugin compilation +if test x"${SYS}" = xmingw32 +then + plugins_CFLAGS="${plugins_CFLAGS} -fnative-struct" +else + plugins_CFLAGS="${plugins_CFLAGS} -fPIC" +fi + +dnl The -DSYS_FOO flag +save_CFLAGS="${save_CFLAGS} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr '[a-z].' '[A-Z]_'`" + dnl Check for system libs needed AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty usleep vasprintf swab sigrelse getpwuid memalign posix_memalign) AC_CHECK_FUNC(connect,,[ AC_CHECK_LIB(socket,connect, - LIB_IPV4="${LIB_IPV4} -lsocket" - LIB_VLC="${LIB_VLC} -lsocket" + ipv4_LDFLAGS="${ipv4_LDFLAGS} -lsocket" + vlc_LDFLAGS="${vlc_LDFLAGS} -lsocket" )]) AC_CHECK_FUNC(gethostbyname,,[ - AC_CHECK_LIB(nsl,gethostbyname,LIB_IPV4="${LIB_IPV4} -lnsl") + AC_CHECK_LIB(nsl,gethostbyname,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lnsl") ]) AC_CHECK_FUNC(gethostbyname,,[ - AC_CHECK_LIB(bind,gethostbyname,LIB_IPV4="${LIB_IPV4} -lbind") + AC_CHECK_LIB(bind,gethostbyname,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lbind") ]) AC_CHECK_FUNC(nanosleep,,[ - AC_CHECK_LIB(rt,nanosleep,LIB_VLC="${LIB_VLC} -lrt",[ - AC_CHECK_LIB(posix4,nanosleep,LIB_VLC="${LIB_VLC} -lposix4") + AC_CHECK_LIB(rt,nanosleep,vlc_LDFLAGS="${vlc_LDFLAGS} -lrt",[ + AC_CHECK_LIB(posix4,nanosleep,vlc_LDFLAGS="${vlc_LDFLAGS} -lposix4") ]) ]) AC_CHECK_FUNC(inet_aton,,[ - AC_CHECK_LIB(resolv,inet_aton,LIB_IPV4="${LIB_IPV4} -lresolv") + AC_CHECK_LIB(resolv,inet_aton,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lresolv") ]) AC_CHECK_FUNC(textdomain,,[ - AC_CHECK_LIB(intl,textdomain,LIB_VLC="${LIB_VLC} -lintl") + AC_CHECK_LIB(intl,textdomain,vlc_LDFLAGS="${vlc_LDFLAGS} -lintl") ]) dnl Check for getopt @@ -118,19 +146,19 @@ NEED_GETOPT=0 AC_CHECK_FUNC(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)], [ # FreeBSD has a gnugetopt library for this: AC_CHECK_LIB([gnugetopt],[getopt_long], - [AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) LIB_VLC="${LIB_VLC} -lgnugetopt"], + [AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) vlc_LDFLAGS="${vlc_LDFLAGS} -lgnugetopt"], [NEED_GETOPT=1])]) AC_TYPE_SIGNAL -AC_CHECK_LIB(dl,dlopen,LIB_VLC="${LIB_VLC} -ldl") +AC_CHECK_LIB(dl,dlopen,vlc_LDFLAGS="${vlc_LDFLAGS} -ldl") AC_CHECK_LIB(m,cos, - LIB_IMDCT="${LIB_IMDCT} -lm" - LIB_FILTER_DISTORT="${LIB_FILTER_DISTORT} -lm") + imdct_LDFLAGS="${imdct_LDFLAGS} -lm" + filter_distort_LDFLAGS="${filter_distort_LDFLAGS} -lm") AC_CHECK_LIB(m,pow, - LIB_IMDCT="${LIB_IMDCT} -lm" - LIB_IMDCT3DN="${LIB_IMDCT3DN} -lm" - LIB_IMDCTSSE="${LIB_IMDCTSSE} -lm" - LIB_CHROMA_I420_RGB="${LIB_CHROMA_I420_RGB} -lm" + imdct_LDFLAGS="${imdct_LDFLAGS} -lm" + imdct3dn_LDFLAGS="${imdct3dn_LDFLAGS} -lm" + imdctsse_LDFLAGS="${imdctsse_LDFLAGS} -lm" + chroma_i420_rgb_LDFLAGS="${chroma_i420_rgb_LDFLAGS} -lm" ) dnl Check for pthreads - borrowed from XMMS @@ -182,15 +210,14 @@ then if test x$x_libraries = xNONE; then x_libraries=/usr/X11R6/lib fi - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$x_includes" + CPPFLAGS="$save_CPPFLAGS -I$x_includes" AC_CHECK_HEADERS(X11/extensions/dpms.h, [ AC_EGREP_HEADER(DPMSInfo,X11/extensions/dpms.h,[ AC_DEFINE(DPMSINFO_IN_DPMS_H, 1, Define if defines DPMSInfo.) ]) ]) - CPPFLAGS=$saved_CPPFLAGS + CPPFLAGS="$save_CPPFLAGS" fi dnl Check for ntohl, etc. @@ -297,7 +324,7 @@ AC_CACHE_CHECK([if \$CC accepts -bundle -undefined error -lcc_dynamic], [CFLAGS="${save_CFLAGS} -bundle -undefined error -lcc_dynamic" AC_TRY_COMPILE([],,ac_cv_ld_darwin=yes, ac_cv_ld_darwin=no)]) if test x"$ac_cv_ld_darwin" != x"no"; then - PLDFLAGS="${PLDFLAGS} -bundle -undefined error -lcc_dynamic" + plugins_LDFLAGS="${plugins_LDFLAGS} -bundle -undefined error -lcc_dynamic" fi dnl Check for standard plugin linking flags @@ -306,7 +333,7 @@ AC_CACHE_CHECK([if \$CC accepts -shared], [CFLAGS="${save_CFLAGS} -shared" AC_TRY_COMPILE([],, ac_cv_ld_plugins=yes, ac_cv_ld_plugins=no)]) if test x"$ac_cv_ld_plugins" != x"no"; then - PLDFLAGS="${PLDFLAGS} -shared" + plugins_LDFLAGS="${plugins_LDFLAGS} -shared" fi dnl Checks for __attribute__(aligned()) directive @@ -326,6 +353,7 @@ fi dnl End of the bizarre compilation tests CFLAGS="${save_CFLAGS}" +CPPFLAGS="${save_CPPFLAGS}" LDFLAGS="${save_LDFLAGS}" dnl Check for boolean_t @@ -431,10 +459,10 @@ AC_CACHE_CHECK([if \$CC groks Altivec inline assembly], if test x"$ac_cv_altivec_inline" != x"no"; then AC_DEFINE(CAN_COMPILE_ALTIVEC, 1, Define if \$CC groks ALTIVEC inline assembly.) if test x"$ac_cv_altivec_inline" != x"yes"; then - CFLAGS_IDCTALTIVEC="$CFLAGS_IDCTALTIVEC $ac_cv_altivec_inline" - CFLAGS_MOTIONALTIVEC="$CFLAGS_MOTIONALTIVEC $ac_cv_altivec_inline" - CFLAGS_MEMCPYALTIVEC="$CFLAGS_MEMCPYALTIVEC $ac_cv_altivec_inline" - CFLAGS_VLC="$CFLAGS_VLC $ac_cv_altivec_inline" + idctaltivec_CFLAGS="$idctaltivec_CFLAGS $ac_cv_altivec_inline" + motionaltivec_CFLAGS="$motionaltivec_CFLAGS $ac_cv_altivec_inline" + memcpyaltivec_CFLAGS="$memcpyaltivec_CFLAGS $ac_cv_altivec_inline" + vlc_CFLAGS="$vlc_CFLAGS $ac_cv_altivec_inline" fi ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" fi @@ -447,7 +475,7 @@ AC_CACHE_CHECK([if \$CC groks Altivec C extensions], AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));], ac_cv_c_altivec=-faltivec, [ # Linux/PPC test - CFLAGS="$save_CFLAGS $CFLAGS_IDCTALTIVEC -fvec" + CFLAGS="$save_CFLAGS $idctaltivec_CFLAGS -fvec" AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));], [ac_cv_c_altivec="-fvec"], ac_cv_c_altivec=no) ]) @@ -455,10 +483,10 @@ AC_CACHE_CHECK([if \$CC groks Altivec C extensions], ]) if test x"$ac_cv_c_altivec" != x"no"; then AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C altivec extensions.) - CFLAGS_IDCTALTIVEC="$CFLAGS_IDCTALTIVEC $ac_cv_c_altivec" - CFLAGS_MOTIONALTIVEC="$CFLAGS_MOTIONALTIVEC $ac_cv_c_altivec" - CFLAGS_MEMCPYALTIVEC="$CFLAGS_MEMCPYALTIVEC $ac_cv_c_altivec" - CFLAGS_VLC="$CFLAGS_VLC $ac_cv_c_altivec" + idctaltivec_CFLAGS="$idctaltivec_CFLAGS $ac_cv_c_altivec" + motionaltivec_CFLAGS="$motionaltivec_CFLAGS $ac_cv_c_altivec" + memcpyaltivec_CFLAGS="$memcpyaltivec_CFLAGS $ac_cv_c_altivec" + vlc_CFLAGS="$vlc_CFLAGS $ac_cv_c_altivec" ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" fi @@ -470,10 +498,10 @@ AC_CACHE_CHECK([if linker needs -framework vecLib], LDFLAGS=$save_LDFLAGS ]) if test x"$ac_cv_ld_altivec" != x"no"; then - LIB_IDCTALTIVEC="${LIB_IDCTALTIVEC} -framework vecLib" - LIB_MOTIONALTIVEC="${LIB_MOTIONALTIVEC} -framework vecLib" - LIB_MEMCPYALTIVEC="${LIB_MEMCPYALTIVEC} -framework vecLib" - LIB_VLC="${LIB_VLC} -framework vecLib" + idctaltivec_LDFLAGS="${idctaltivec_LDFLAGS} -framework vecLib" + motionaltivec_LDFLAGS="${motionaltivec_LDFLAGS} -framework vecLib" + memcpyaltivec_LDFLAGS="${memcpyaltivec_LDFLAGS} -framework vecLib" + vlc_LDFLAGS="${vlc_LDFLAGS} -framework vecLib" fi fi # end if mingw32 @@ -534,6 +562,7 @@ AC_ARG_ENABLE(debug, dnl dnl Enable release-specific flags dnl +RELEASE=0 AC_ARG_ENABLE(release, [ --enable-release activate extra optimizations (default disabled)], [ if test x$enableval = xyes; then RELEASE=1; fi ], @@ -562,7 +591,7 @@ then then AC_CHECK_HEADERS(dvdcss/dvdcss.h, [ PLUGINS="${PLUGINS} dvd" - LIB_DVD="${LIB_DVD} -ldvdcss" ], + dvd_LDFLAGS="${dvd_LDFLAGS} -ldvdcss" ], [ AC_MSG_WARN([libdvdcss is no longer provided with vlc; please get libdvdcss from http://www.videolan.org/libdvdcss/ and build it. Then either use --with-dvdcss= for dynamic linking (recommended under Unix) or --with-dvdcss-tree= for static linking (recommended under BeOS, Windows, MacOS X). Alternatively you can use --disable-dvd to disable the DVD plugin.]) AC_MSG_ERROR([cannot find libdvdcss headers]) ]) else @@ -579,8 +608,8 @@ then dnl Use a custom libdvdcss AC_MSG_RESULT(${real_dvdcss_tree}/src/.libs/libdvdcss.a) BUILTINS="${BUILTINS} dvd" - LIB_DVD="${LIB_DVD} ${real_dvdcss_tree}/src/.libs/libdvdcss.a" - CFLAGS_DVD="${CFLAGS_DVD} -I${real_dvdcss_tree}/src" + dvd_LDFLAGS="${dvd_LDFLAGS} ${real_dvdcss_tree}/src/.libs/libdvdcss.a" + dvd_CFLAGS="${dvd_CFLAGS} -I${real_dvdcss_tree}/src" else dnl The given libdvdcss wasn't built AC_MSG_RESULT(no) @@ -591,8 +620,8 @@ then xno) dnl Compile without dvdcss (dlopen version, works only under Linux) PLUGINS="${PLUGINS} dvd" - CFLAGS_DVD="${CFLAGS_DVD} -DGOD_DAMN_DMCA" - LIB_DVD="${LIB_DVD} -ldl" + dvd_CFLAGS="${dvd_CFLAGS} -DGOD_DAMN_DMCA" + dvd_LDFLAGS="${dvd_LDFLAGS} -ldl" ;; *) AC_MSG_CHECKING(for dvdcss headers in ${with_dvdcss}) @@ -601,8 +630,8 @@ then dnl Use ${with_dvdcss}/include/dvdcss/dvdcss.h AC_MSG_RESULT(yes) PLUGINS="${PLUGINS} dvd" - LIB_DVD="${LIB_DVD} -L${with_dvdcss}/lib -ldvdcss" - CFLAGS_DVD="${CFLAGS_DVD} -I${with_dvdcss}/include" + dvd_LDFLAGS="${dvd_LDFLAGS} -L${with_dvdcss}/lib -ldvdcss" + dvd_CFLAGS="${dvd_CFLAGS} -I${with_dvdcss}/include" else dnl No libdvdcss could be found, sorry AC_MSG_RESULT(no) @@ -625,7 +654,7 @@ then x) AC_CHECK_HEADERS(dvdread/dvd_reader.h, [ PLUGINS="${PLUGINS} dvdread" - LIB_DVDREAD="${LIB_DVDREAD} -ldvdread" ]) + dvdread_LDFLAGS="${dvdread_LDFLAGS} -ldvdread" ]) ;; *) AC_MSG_CHECKING(for dvdread headers in ${withval}) @@ -633,8 +662,8 @@ then then AC_MSG_RESULT(yes) PLUGINS="${PLUGINS} dvdread" - LIB_DVDREAD="${LIB_DVDREAD} -L${withval}/lib -ldvdread" - CFLAGS_DVDREAD="${CFLAGS_DVDREAD} -I${withval}/include" + dvdread_LDFLAGS="${dvdread_LDFLAGS} -L${withval}/lib -ldvdread" + dvdread_CFLAGS="${dvdread_CFLAGS} -I${withval}/include" else AC_MSG_RESULT(no) AC_MSG_ERROR([Cannot find ${withval}/dvdread/dvd_reader.h]) @@ -663,7 +692,7 @@ then if test "x${SYS}" = "xdarwin" then PLUGINS="${PLUGINS} vcd" - LIB_VCD="${LIB_VCD} -framework IOKit -framework CoreFoundation" + vcd_LDFLAGS="${vcd_LDFLAGS} -framework IOKit -framework CoreFoundation" fi fi @@ -697,18 +726,18 @@ AC_ARG_ENABLE(mad, if test x$enable_mad = xyes then PLUGINS="${PLUGINS} mad" - LIB_MAD="${LIB_MAD} -lmad" + mad_LDFLAGS="${mad_LDFLAGS} -lmad" AC_ARG_WITH(mad, [ --with-mad=PATH path to libmad], [ if test "x$with_val" != "xno" -a "x$with_val" != "x" then - CFLAGS_MAD="${CFLAGS_MAD} -I$with_val/include" - LIB_MAD="${LIB_MAD} -L$with_val/lib" + mad_CFLAGS="${mad_CFLAGS} -I$with_val/include" + mad_LDFLAGS="${mad_LDFLAGS} -L$with_val/lib" fi ]) save_CFLAGS=$CFLAGS save_LDFLAGS=$LDFLAGS - CFLAGS="$CFLAGS $CFLAGS_MAD" - LDFLAGS="$LDFLAGS $LIB_MAD" + CFLAGS="$CFLAGS $mad_CFLAGS" + LDFLAGS="$LDFLAGS $mad_LDFLAGS" AC_CHECK_HEADERS(mad.h, , [ echo "Cannot find development headers for libmad..." exit 1 @@ -725,9 +754,7 @@ dnl special case for BeOS if test x$SYS = xbeos then PLUGINS="${PLUGINS} beos" - -dnl default case -else +fi dnl dnl a52 AC3 decoder plugin @@ -738,7 +765,7 @@ if test "x$enableval" != "xno" -a x$SYS != xmingw32 then AC_CHECK_HEADERS(a52dec/a52.h, [ BUILTINS="${BUILTINS} a52" - LIB_A52="${LIB_A52} -la52 -lm" + a52_LDFLAGS="${a52_LDFLAGS} -la52 -lm" ],[]) fi @@ -751,7 +778,7 @@ if test "x$enableval" != "xno" then AC_CHECK_HEADERS(ogg/ogg.h, [ PLUGINS="${PLUGINS} vorbis" - LIB_VORBIS="${LIB_VORBIS} -lvorbis" + vorbis_LDFLAGS="${vorbis_LDFLAGS} -lvorbis" ],[]) fi @@ -775,14 +802,13 @@ if test x$enable_x11 != xno && if test x$x_libraries = xNONE; then x_libraries=/usr/X11R6/lib fi - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$x_includes" + CPPFLAGS="$save_CPPFLAGS -I$x_includes" AC_CHECK_HEADERS(X11/Xlib.h, [ PLUGINS="${PLUGINS} x11" - LIB_X11="${LIB_X11} -L$x_libraries -lX11 -lXext" - CFLAGS_X11="${CFLAGS_X11} -I$x_includes" + x11_LDFLAGS="${x11_LDFLAGS} -L$x_libraries -lX11 -lXext" + x11_CFLAGS="${x11_CFLAGS} -I$x_includes" ]) - CPPFLAGS=$saved_CPPFLAGS + CPPFLAGS="$save_CPPFLAGS" fi dnl @@ -799,23 +825,23 @@ if test x$enable_xvideo != xno && if test x$x_libraries = xNONE; then x_libraries=/usr/X11R6/lib fi - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$x_includes" + save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$save_CPPFLAGS -I$x_includes" AC_CHECK_HEADERS(X11/extensions/Xv.h, [ - saved_CFLAGS=$CFLAGS + save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -L$x_libraries -lX11 -lXext" AC_CHECK_LIB(Xv_pic,XvSetPortAttribute, # We have Xv_pic, that's good, we can build an xvideo.so plugin ! PLUGINS="${PLUGINS} xvideo" - LIB_XVIDEO="${LIB_XVIDEO} -L$x_libraries -lX11 -lXext -lXv_pic" - CFLAGS_XVIDEO="${CFLAGS_XVIDEO} -I$x_includes", + xvideo_LDFLAGS="${xvideo_LDFLAGS} -L$x_libraries -lX11 -lXext -lXv_pic" + xvideo_CFLAGS="${xvideo_CFLAGS} -I$x_includes", # We don't have Xv_pic, let's make xvideo.a as builtin BUILTINS="${BUILTINS} xvideo" - LIB_XVIDEO="${LIB_XVIDEO} -L$x_libraries -lX11 -lXext -lXv" - CFLAGS_XVIDEO="${CFLAGS_XVIDEO} -I$x_includes") - CFLAGS=$saved_CFLAGS + xvideo_LDFLAGS="${xvideo_LDFLAGS} -L$x_libraries -lX11 -lXext -lXv" + xvideo_CFLAGS="${xvideo_CFLAGS} -I$x_includes") + CFLAGS="$save_CFLAGS" ] - CPPFLAGS=$saved_CPPFLAGS) + CPPFLAGS="$save_CPPFLAGS") fi dnl @@ -849,17 +875,16 @@ then if test x${SDL_CONFIG} != xno then PLUGINS="${PLUGINS} sdl" - CFLAGS_SDL="${CFLAGS_SDL} `${SDL_CONFIG} --cflags`" - LIB_SDL="${LIB_SDL} `${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`" - save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $CFLAGS_SDL" + sdl_CFLAGS="${sdl_CFLAGS} `${SDL_CONFIG} --cflags`" + sdl_LDFLAGS="${sdl_LDFLAGS} `${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`" + CPPFLAGS="$save_CPPFLAGS $sdl_CFLAGS" AC_CHECK_HEADERS(${SDL_HEADER}, AC_DEFINE_UNQUOTED(SDL_INCLUDE_FILE, <${SDL_HEADER}>, Indicate whether we should use SDL/SDL.h or SDL11/SDL.h), [ AC_MSG_ERROR([The development package for SDL is not installed. Please install it and try again. Alternatively you can also configure with --disable-sdl.]) ]) - CPPFLAGS=$save_CPPFLAGS + CPPFLAGS="$save_CPPFLAGS" if expr 1.1.5 \> `$SDL_CONFIG --version` >/dev/null then AC_MSG_ERROR([The development package for SDL is not installed. @@ -889,14 +914,14 @@ then then AC_CHECK_HEADERS(ddraw.h, [ PLUGINS="${PLUGINS} directx" - LIB_DIRECTX="${LIB_DIRECTX} -lgdi32" ]) + directx_LDFLAGS="${directx_LDFLAGS} -lgdi32" ]) else AC_MSG_CHECKING(for directX headers in ${withval}) if test -f ${withval}/ddraw.h then PLUGINS="${PLUGINS} directx" - LIB_DIRECTX="${LIB_DIRECTX} -L${withval}/lib -lgdi32" - INCLUDE="${INCLUDE} -I${withval}" + directx_LDFLAGS="${directx_LDFLAGS} -L${withval}/lib -lgdi32" + directx_CFLAGS="${directx_CFLAGS} -I${withval}" AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -936,13 +961,13 @@ AC_ARG_ENABLE(ggi, if test x$enable_ggi = xyes then PLUGINS="${PLUGINS} ggi" - LIB_GGI="${LIB_GGI} -lggi" + ggi_LDFLAGS="${ggi_LDFLAGS} -lggi" AC_ARG_WITH(ggi, [ --with-ggi=PATH path to libggi], [ if test "x$with_val" != "xno" -a "x$with_val" != "x" then CFLAGS_GGI="${CFLAGS_GGI} -I$with_val/include" - LIB_GGI="${LIB_GGI} -L$with_val/lib" + ggi_LDFLAGS="${ggi_LDFLAGS} -L$with_val/lib" fi ]) fi @@ -954,14 +979,14 @@ AC_ARG_ENABLE(glide, if test x$enable_glide = xyes then PLUGINS="${PLUGINS} glide" - LIB_GLIDE="${LIB_GLIDE} -lglide2x -lm" - CFLAGS_GLIDE="${CFLAGS_GLIDE} -I/usr/include/glide" + glide_LDFLAGS="${glide_LDFLAGS} -lglide2x -lm" + glide_CFLAGS="${glide_CFLAGS} -I/usr/include/glide" AC_ARG_WITH(glide, [ --with-glide=PATH path to libglide], [ if test "x$with_val" != "xno" -a "x$with_val" != "x" then - CFLAGS_GLIDE="${CFLAGS_GLIDE} -I$with_val/include" - LIB_GLIDE="${LIB_GLIDE} -L$with_val/lib" + glide_CFLAGS="${glide_CFLAGS} -I$with_val/include" + glide_LDFLAGS="${glide_LDFLAGS} -L$with_val/lib" fi ]) fi @@ -976,7 +1001,7 @@ then if test x$have_aa = xtrue then PLUGINS="${PLUGINS} aa" - LIB_AA="${LIB_AA} -laa" + aa_LDFLAGS="${aa_LDFLAGS} -laa" fi fi @@ -997,7 +1022,7 @@ if test x$enable_dsp != xno && then AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [ PLUGINS="${PLUGINS} dsp" - AC_CHECK_LIB(ossaudio,main,LIB_DSP="${LIB_DSP} -lossaudio") + AC_CHECK_LIB(ossaudio,main,dsp_LDFLAGS="${dsp_LDFLAGS} -lossaudio") ]) fi @@ -1012,8 +1037,8 @@ AC_ARG_ENABLE(esd, if test x${ESD_CONFIG} != xno then PLUGINS="${PLUGINS} esd" - CFLAGS_ESD="${CFLAGS_ESD} `${ESD_CONFIG} --cflags`" - LIB_ESD="${LIB_ESD} `${ESD_CONFIG} --libs`" + esd_CFLAGS="${esd_CFLAGS} `${ESD_CONFIG} --cflags`" + esd_LDFLAGS="${esd_LDFLAGS} `${ESD_CONFIG} --libs`" fi fi]) @@ -1028,8 +1053,8 @@ AC_ARG_ENABLE(arts, if test x${ARTS_CONFIG} != xno then PLUGINS="${PLUGINS} arts" - CFLAGS_ARTS="${CFLAGS_ARTS} `${ARTS_CONFIG} --cflags`" - LIB_ARTS="${LIB_ARTS} `${ARTS_CONFIG} --libs `" + arts_CFLAGS="${arts_CFLAGS} `${ARTS_CONFIG} --cflags`" + arts_LDFLAGS="${arts_LDFLAGS} `${ARTS_CONFIG} --libs `" fi fi]) @@ -1044,7 +1069,7 @@ AC_ARG_ENABLE(alsa, if test x$have_alsa = xtrue then PLUGINS="${PLUGINS} alsa" - LIB_ALSA="${LIB_ALSA} -lasound -lm -ldl" + alsa_LDFLAGS="${alsa_LDFLAGS} -lasound -lm -ldl" fi fi]) @@ -1056,7 +1081,7 @@ AC_ARG_ENABLE(waveout, if test "x$enableval" != "xno" -a x$SYS = xmingw32 then PLUGINS="${PLUGINS} waveout" - LIB_WAVEOUT="-lwinmm" + waveout_LDFLAGS="-lwinmm" fi dnl @@ -1092,11 +1117,10 @@ then then AC_MSG_ERROR([Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-gtk.]) fi - CFLAGS_GTK="${CFLAGS_GTK} `${GTK_CONFIG} --cflags gtk`" - LIB_GTK="${LIB_GTK} `${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`" + gtk_CFLAGS="${gtk_CFLAGS} `${GTK_CONFIG} --cflags gtk`" + gtk_LDFLAGS="${gtk_LDFLAGS} `${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`" # now look for the gtk.h header - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $CFLAGS_GTK" + CPPFLAGS="$save_CPPFLAGS $gtk_CFLAGS" ac_cv_gtk_headers=yes AC_CHECK_HEADERS(gtk/gtk.h glib.h gdk/gdk.h, , [ ac_cv_gtk_headers=no @@ -1107,7 +1131,7 @@ then PLUGINS="${PLUGINS} gtk" ALIASES="${ALIASES} gvlc" fi - CPPFLAGS=$saved_CPPFLAGS + CPPFLAGS="$save_CPPFLAGS" fi fi @@ -1121,12 +1145,11 @@ AC_ARG_ENABLE(gnome, AC_PATH_PROG(GNOME_CONFIG, gnome-config, no) if test -x ${GNOME_CONFIG} then - CFLAGS_GNOME="${CFLAGS_GNOME} `${GNOME_CONFIG} --cflags gtk gnomeui`" - LIB_GNOME="${LIB_GNOME} `${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`" + gnome_CFLAGS="${gnome_CFLAGS} `${GNOME_CONFIG} --cflags gtk gnomeui`" + gnome_LDFLAGS="${gnome_LDFLAGS} `${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`" fi # now look for the gnome.h header - saved_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $CFLAGS_GNOME" + CPPFLAGS="$save_CPPFLAGS $gnome_CFLAGS" AC_CHECK_HEADERS(gnome.h, [ PLUGINS="${PLUGINS} gnome" ALIASES="${ALIASES} gnome-vlc" @@ -1134,8 +1157,7 @@ AC_ARG_ENABLE(gnome, AC_MSG_ERROR([Can't find gnome headers. Please install the gnome developement tools or remove the --enable-gnome option]) ]) - - CPPFLAGS=$saved_CPPFLAGS + CPPFLAGS="$save_CPPFLAGS" fi]) dnl @@ -1146,8 +1168,8 @@ AC_ARG_ENABLE(qt, [if test x$enable_qt = xyes; then PLUGINS="${PLUGINS} qt" ALIASES="${ALIASES} qvlc" - LIB_QT="${LIB_QT} -lqt -L${QTDIR}/lib" - CFLAGS_QT="${CFLAGS_QT} -I/usr/include/qt -I${QTDIR}/include" + qt_LDFLAGS="${qt_LDFLAGS} -lqt -L${QTDIR}/lib" + qt_CFLAGS="${qt_CFLAGS} -I/usr/include/qt -I${QTDIR}/include" if test -x ${QTDIR}/bin/moc then MOC=${QTDIR}/bin/moc @@ -1164,9 +1186,9 @@ AC_ARG_ENABLE(kde, [if test x$enable_kde = xyes; then PLUGINS="${PLUGINS} kde" ALIASES="${ALIASES} kvlc" - LIB_KDE="${LIB_KDE} -L${KDEDIR}/lib -lkfile" - CFLAGS_KDE="${CFLAGS_KDE} -I/usr/include/kde -I/usr/include/qt" - CFLAGS_KDE="${CFLAGS_KDE} -I${KDEDIR}/include -I${QTDIR}/include" + kde_LDFLAGS="${kde_LDFLAGS} -L${KDEDIR}/lib -lkfile" + kde_CFLAGS="${kde_CFLAGS} -I/usr/include/kde -I/usr/include/qt" + kde_CFLAGS="${kde_CFLAGS} -I${KDEDIR}/include -I${QTDIR}/include" if test -x ${QTDIR}/bin/moc then MOC=${QTDIR}/bin/moc @@ -1183,15 +1205,15 @@ AC_ARG_ENABLE(macosx, [if test x$enable_macosx = xyes then BUILTINS="${BUILTINS} macosx" - LIB_MACOSX="${LIB_MACOSX} -framework CoreAudio -framework AudioToolbox -framework Cocoa -framework AGL -framework QuickTime -lobjc" - CFLAGS_MACOSX="${CFLAGS_MACOSX} -ObjC" - LIB_COMMON="${LIB_COMMON} -ObjC" + macosx_LDFLAGS="${macosx_LDFLAGS} -framework CoreAudio -framework AudioToolbox -framework Cocoa -framework AGL -framework QuickTime -lobjc" + macosx_CFLAGS="${macosx_CFLAGS} -ObjC" + LDFLAGS="${LDFLAGS} -ObjC" fi], [AC_CHECK_HEADERS(Cocoa/Cocoa.h, BUILTINS="${BUILTINS} macosx" - LIB_MACOSX="${LIB_MACOSX} -framework CoreAudio -framework AudioToolbox -framework Cocoa -framework AGL -framework QuickTime -lobjc" - CFLAGS_MACOSX="${CFLAGS_MACOSX} -ObjC" - LIB_COMMON="${LIB_COMMON} -ObjC" + macosx_LDFLAGS="${macosx_LDFLAGS} -framework CoreAudio -framework AudioToolbox -framework Cocoa -framework AGL -framework QuickTime -lobjc" + macosx_CFLAGS="${macosx_CFLAGS} -ObjC" + LDFLAGS="${LDFLAGS} -ObjC" )]) dnl @@ -1203,7 +1225,7 @@ AC_ARG_ENABLE(qnx, then AC_CHECK_HEADERS(Ph.h, [ PLUGINS="${PLUGINS} qnx" - LIB_QNX="${LIB_QNX} -lasound -lph" + qnx_LDFLAGS="${qnx_LDFLAGS} -lasound -lph" ]) fi @@ -1230,7 +1252,7 @@ AC_ARG_ENABLE(ncurses, [ --enable-ncurses ncurses interface support (default disabled)], [if test x$enable_ncurses = xyes; then PLUGINS="${PLUGINS} ncurses" - LIB_NCURSES="${LIB_NCURSES} -lncurses" + ncurses_LDFLAGS="${ncurses_LDFLAGS} -lncurses" fi]) dnl @@ -1244,13 +1266,10 @@ then if test x$have_lirc = xtrue then PLUGINS="${PLUGINS} lirc" - LIB_LIRC="${LIB_LIRC} -llirc_client" + lirc_LDFLAGS="${lirc_LDFLAGS} -llirc_client" fi fi -dnl end of non-BeOS stuff -fi - AC_ARG_WITH(,[Misc options:]) dnl @@ -1312,17 +1331,6 @@ then AC_DEFINE(WORDS_BIGENDIAN, 1, big endian system) fi -dnl -dnl DLLs - used for Win32 package build -dnl -DLL_PATH=. -AC_ARG_WITH(dll-path, - [ --with-dll-path=PATH path to Win32 DLLs (default search in \$PWD)], - [ if test "x$withval" != "xno" - then - DLL_PATH=$withval - fi ]) - dnl dnl Profiling dnl @@ -1336,7 +1344,7 @@ AC_ARG_ENABLE(cprof, [ --enable-cprof cprof profiling (default disabled)], [ if test x$enableval = xyes; then - LIB_COMMON="${LIB_COMMON} -lcprof" + LDFLAGS="${LDFLAGS} -lcprof" CPROF=1 fi ]) @@ -1369,7 +1377,7 @@ AC_ARG_ENABLE(st, fi]) ]) -LIB_COMMON="${LIB_COMMON} ${THREAD_LIB}" +LDFLAGS="${LDFLAGS} ${THREAD_LIB}" dnl dnl Plug-ins - this must be AT THE END @@ -1415,7 +1423,6 @@ AC_SUBST(ARCH) AC_SUBST(PLUGINS) AC_SUBST(BUILTINS) AC_SUBST(ALIASES) -AC_SUBST(INCLUDE) AC_SUBST(DEBUG) AC_SUBST(ASM) AC_SUBST(CPROF) @@ -1426,83 +1433,78 @@ AC_SUBST(RELEASE) AC_SUBST(MOC) AC_SUBST(WINDRES) AC_SUBST(BCBUILDER) -AC_SUBST(DLL_PATH) AC_SUBST(VLC_PACKAGE) AC_SUBST(VLC_VERSION) +AC_SUBST(NEED_GETOPT) -AC_SUBST(LDFLAGS) -AC_SUBST(PLDFLAGS) - -AC_SUBST(LIB_COMMON) -AC_SUBST(LIB_VLC) - -AC_SUBST(LIB_A52) -AC_SUBST(LIB_AA) -AC_SUBST(LIB_ALSA) -AC_SUBST(LIB_ARTS) -AC_SUBST(LIB_BEOS) -AC_SUBST(LIB_CHROMA_I420_RGB) -AC_SUBST(LIB_DARWIN) -AC_SUBST(LIB_DIRECTX) -AC_SUBST(LIB_DSP) -AC_SUBST(LIB_DVD) -AC_SUBST(LIB_DVDREAD) -AC_SUBST(LIB_ESD) -AC_SUBST(LIB_FILTER_DISTORT) -AC_SUBST(LIB_GGI) -AC_SUBST(LIB_GLIDE) -AC_SUBST(LIB_GNOME) -AC_SUBST(LIB_GTK) -AC_SUBST(LIB_IDCTALTIVEC) -AC_SUBST(LIB_IMDCT) -AC_SUBST(LIB_IMDCT3DN) -AC_SUBST(LIB_IMDCTSSE) -AC_SUBST(LIB_IPV4) -AC_SUBST(LIB_IPV6) -AC_SUBST(LIB_KDE) -AC_SUBST(LIB_LIRC) -AC_SUBST(LIB_MACOSX) -AC_SUBST(LIB_MAD) -AC_SUBST(LIB_MEMCPYALTIVEC) -AC_SUBST(LIB_MOTIONALTIVEC) -AC_SUBST(LIB_MPEG_TS) -AC_SUBST(LIB_NCURSES) -AC_SUBST(LIB_QNX) -AC_SUBST(LIB_QT) -AC_SUBST(LIB_RC) -AC_SUBST(LIB_SDL) -AC_SUBST(LIB_VCD) -AC_SUBST(LIB_VORBIS) -AC_SUBST(LIB_WAVEOUT) -AC_SUBST(LIB_WIN32) -AC_SUBST(LIB_X11) -AC_SUBST(LIB_XVIDEO) - -AC_SUBST(CFLAGS_COMMON) -AC_SUBST(CFLAGS_VLC) - -AC_SUBST(CFLAGS_ARTS) -AC_SUBST(CFLAGS_DVD) -AC_SUBST(CFLAGS_DVDREAD) -AC_SUBST(CFLAGS_ESD) -AC_SUBST(CFLAGS_GLIDE) -AC_SUBST(CFLAGS_GNOME) -AC_SUBST(CFLAGS_GTK) -AC_SUBST(CFLAGS_KDE) -AC_SUBST(CFLAGS_IDCTALTIVEC) -AC_SUBST(CFLAGS_MACOSX) -AC_SUBST(CFLAGS_MAD) -AC_SUBST(CFLAGS_MEMCPYALTIVEC) -AC_SUBST(CFLAGS_MOTIONALTIVEC) AC_SUBST(CFLAGS_OPTIM) AC_SUBST(CFLAGS_OPTIM_NODEBUG) -AC_SUBST(CFLAGS_QT) -AC_SUBST(CFLAGS_SDL) -AC_SUBST(CFLAGS_WIN32) -AC_SUBST(CFLAGS_X11) -AC_SUBST(CFLAGS_XVIDEO) +AC_SUBST(LDFLAGS) -AC_SUBST(NEED_GETOPT) +AC_SUBST(vlc_CFLAGS) +AC_SUBST(plugins_CFLAGS) +AC_SUBST(builtins_CFLAGS) + +AC_SUBST(arts_CFLAGS) +AC_SUBST(dvd_CFLAGS) +AC_SUBST(dvdread_CFLAGS) +AC_SUBST(directx_CFLAGS) +AC_SUBST(esd_CFLAGS) +AC_SUBST(glide_CFLAGS) +AC_SUBST(gnome_CFLAGS) +AC_SUBST(gtk_CFLAGS) +AC_SUBST(kde_CFLAGS) +AC_SUBST(idctaltivec_CFLAGS) +AC_SUBST(macosx_CFLAGS) +AC_SUBST(mad_CFLAGS) +AC_SUBST(memcpyaltivec_CFLAGS) +AC_SUBST(motionaltivec_CFLAGS) +AC_SUBST(qt_CFLAGS) +AC_SUBST(sdl_CFLAGS) +AC_SUBST(x11_CFLAGS) +AC_SUBST(xvideo_CFLAGS) + +AC_SUBST(vlc_LDFLAGS) +AC_SUBST(plugins_LDFLAGS) +AC_SUBST(builtins_LDFLAGS) + +AC_SUBST(a52_LDFLAGS) +AC_SUBST(aa_LDFLAGS) +AC_SUBST(alsa_LDFLAGS) +AC_SUBST(arts_LDFLAGS) +AC_SUBST(beos_LDFLAGS) +AC_SUBST(chroma_i420_rgb_LDFLAGS) +AC_SUBST(directx_LDFLAGS) +AC_SUBST(dsp_LDFLAGS) +AC_SUBST(dvd_LDFLAGS) +AC_SUBST(dvdread_LDFLAGS) +AC_SUBST(esd_LDFLAGS) +AC_SUBST(filter_distort_LDFLAGS) +AC_SUBST(ggi_LDFLAGS) +AC_SUBST(glide_LDFLAGS) +AC_SUBST(gnome_LDFLAGS) +AC_SUBST(gtk_LDFLAGS) +AC_SUBST(idctaltivec_LDFLAGS) +AC_SUBST(imdct_LDFLAGS) +AC_SUBST(imdct3dn_LDFLAGS) +AC_SUBST(imdctsse_LDFLAGS) +AC_SUBST(ipv4_LDFLAGS) +AC_SUBST(kde_LDFLAGS) +AC_SUBST(lirc_LDFLAGS) +AC_SUBST(macosx_LDFLAGS) +AC_SUBST(mad_LDFLAGS) +AC_SUBST(memcpyaltivec_LDFLAGS) +AC_SUBST(motionaltivec_LDFLAGS) +AC_SUBST(ncurses_LDFLAGS) +AC_SUBST(qnx_LDFLAGS) +AC_SUBST(qt_LDFLAGS) +AC_SUBST(rc_LDFLAGS) +AC_SUBST(sdl_LDFLAGS) +AC_SUBST(vcd_LDFLAGS) +AC_SUBST(vorbis_LDFLAGS) +AC_SUBST(waveout_LDFLAGS) +AC_SUBST(x11_LDFLAGS) +AC_SUBST(xvideo_LDFLAGS) AC_OUTPUT([Makefile.opts po/Makefile.in]) diff --git a/install-win32 b/install-win32 index 10183afe69..91dec7758c 100644 --- a/install-win32 +++ b/install-win32 @@ -1,13 +1,16 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; NSIS installer script for vlc ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; written by Pierre Baillet 29/7/01 v0.2 -; modifications by Samuel Hocevar 12/11/01 ;;;;;;;;;;;;; ; CHANGELOG ; ;;;;;;;;;;;;; +; modifications by Samuel Hocevar 05 Apr 2002 +; . no need for @VERSION@ anymore +; . updated script for NSIS 1.96. +; modifications by Samuel Hocevar 12 Nov 2001 ; . removed version information. +; written by Pierre Baillet 29 Jul 2001 v0.2 ; . lists all installed files so as to prevent installer.nsi to be included ; in the release. ; . really remove the shortcuts. @@ -17,14 +20,15 @@ ; General configuration ; ;;;;;;;;;;;;;;;;;;;;;;;;; -OutFile vlc-@VERSION@.exe +OutFile ..\vlc-${VERSION}-win32.exe + Name "the VideoLAN Client" -Caption "vlc @VERSION@ for Win32 Setup" -;Icon ../share/gvlc_win32.ico +Caption "VideoLAN Client '${VERSION}' for Win32 Setup" +;Icon ../share/gvlc32x32.ico CRCCheck on -InstallDir $PROGRAMFILES\vlc +InstallDir "$PROGRAMFILES\VideoLAN\VideoLAN Client" ; check if the program has already been installed, if so, take this dir ; as install dir InstallDirRegKey HKLM SOFTWARE\VideoLAN\VLC "Install_Dir" @@ -33,15 +37,13 @@ DirText "Choose a directory to install in to:" AutoCloseWindow false ShowInstDetails show -; uninstall stuff -UninstallText "This will uninstall the VideoLAN Client. Hit next to continue." -UninstallExeName "vlc-uninst.exe" - SetOverwrite ifnewer SetDatablockOptimize on SetDateSave off SetCompress auto +UninstallText "This will uninstall the VideoLAN Client. Hit next to continue." + ;;;;;;;;;;;;;;;;;;;; ; Install settings ; ;;;;;;;;;;;;;;;;;;;; @@ -50,17 +52,19 @@ Section "Install" SetOutPath $INSTDIR File vlc.exe - File *.so - File *.dll File *.txt File /r share + File /r plugins CreateDirectory "$SMPROGRAMS\VideoLAN" - CreateShortCut "$SMPROGRAMS\VideoLAN\vlc_@VERSION@.lnk" "$INSTDIR\vlc.exe" - CreateShortCut "$SMPROGRAMS\VideoLAN\Uninstall VLC.lnk" "$INSTDIR\vlc-uninst.exe" + CreateShortCut "$SMPROGRAMS\VideoLAN\vlc.lnk" "$INSTDIR\vlc.exe" + CreateShortCut "$SMPROGRAMS\VideoLAN\Uninstall VLC.lnk" "$INSTDIR\uninstall.exe" + WriteUninstaller "uninstall.exe" + WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "Install_Dir" $INSTDIR - WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "version" "@VERSION@" + WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "version" "${VERSION}" + Exec "explorer $SMPROGRAMS\VideoLAN\" SectionEnd @@ -73,6 +77,8 @@ Section "Uninstall" RMDir $SMPROGRAMS\VideoLAN Delete $INSTDIR\share\* RMDir $INSTDIR\share + Delete $INSTDIR\plugins\* + RMDir $INSTDIR\plugins Delete $INSTDIR\* RMDir $INSTDIR DeleteRegKey HKLM SOFTWARE\VideoLAN diff --git a/plugins/.cvsignore b/plugins/.cvsignore index 54d99fe3a8..6e930bdc59 100644 --- a/plugins/.cvsignore +++ b/plugins/.cvsignore @@ -1,3 +1,5 @@ *.a *.so *.so.* +*.tds +*.lib diff --git a/plugins/win32/.cvsignore b/plugins/win32/.cvsignore index 435f39ed89..eecf24d826 100644 --- a/plugins/win32/.cvsignore +++ b/plugins/win32/.cvsignore @@ -2,3 +2,5 @@ *.lo *.o.* *.lo.* +intfwin.mak +*MAKE* diff --git a/plugins/win32/win32.cpp b/plugins/win32/win32.cpp index 3167bad3b6..bd69f50ae7 100644 --- a/plugins/win32/win32.cpp +++ b/plugins/win32/win32.cpp @@ -44,7 +44,9 @@ MODULE_CONFIG_STOP MODULE_INIT_START SET_DESCRIPTION( "Win32 interface module" ) ADD_CAPABILITY( INTF, 100 ) + ADD_SHORTCUT( "win" ) ADD_SHORTCUT( "win32" ) + ADD_SHORTCUT( "intfwin" ) MODULE_INIT_STOP MODULE_ACTIVATE_START diff --git a/share/gvlc_win32.ico b/share/gvlc48x48.ico similarity index 100% rename from share/gvlc_win32.ico rename to share/gvlc48x48.ico diff --git a/share/vlc_win32_rc.rc b/share/vlc_win32_rc.rc index 19c48cafcd..a179e61fa9 100644 --- a/share/vlc_win32_rc.rc +++ b/share/vlc_win32_rc.rc @@ -1 +1 @@ -VLC_ICON ICON "share/gvlc_win32.ico" +VLC_ICON ICON "share/vlc48x48.ico"