Changeset 1b0868ed29bc006d5939c91c064ed3d7931a7432
- Timestamp:
- 04/05/02 22:44:23 (6 years ago)
- git-parent:
- Files:
-
- .cvsignore (modified) (1 diff)
- ChangeLog (modified) (1 diff)
- INSTALL.win32 (modified) (1 diff)
- Makefile (modified) (8 diffs)
- Makefile.dep (modified) (2 diffs)
- Makefile.modules (modified) (4 diffs)
- Makefile.opts.in (modified) (8 diffs)
- configure (modified) (354 diffs)
- configure.in (modified) (57 diffs)
- install-win32 (modified) (5 diffs)
- plugins/.cvsignore (modified) (1 diff)
- plugins/win32/.cvsignore (modified) (1 diff)
- plugins/win32/win32.cpp (modified) (1 diff)
- share/gvlc48x48.ico (added)
- share/gvlc_win32.ico (deleted)
- share/vlc_win32_rc.rc (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
.cvsignore
r735d6f7 r1b0868e 2 2 core 3 3 core.* 4 conftest 5 conftest.* 4 6 .dep 5 7 gmon.out ChangeLog
r0d69146 r1b0868e 5 5 HEAD 6 6 7 * ./plugins/win32/win32.cpp: fixed `--intf intfwin' which wasn't working. 8 * ./Makefile: we don't include the Gtk+ and SDL DLLs in the win32 package 9 anymore, the package is now 700k instead of 4MB. 10 * ./configure.in, ./Makefile, ./Makefile.opts.in: replaced LIB_FOO with 11 foo_LDFLAGS and CFLAGS_BAR with bar_CFLAGS for faster builds, and moved a 12 lot of stuff from Makefile.opts.in back to configure.in. 13 * ./install-win32: updated script for NSIS 1.96. 7 14 * ./configure.in: added --enable-intfwin to enable the win32 interface and 8 15 --with-bcbuilder to tell make where to find Borland C++ Builder. INSTALL.win32
re98aae2 r1b0868e 124 124 If you are happy with the GTK interface, then you can skip this section) 125 125 126 [Steps 2 and 3 are temporary]127 128 126 1) Compile vlc as usual. 129 include\defs.h should be generated.130 127 131 128 2) From the plugin\win32 directory, use Borland C++ command-line tools Makefile
re98aae2 r1b0868e 212 212 # Misc variables 213 213 # 214 V LC_QUICKVERSION := $(shell grep '^ *VERSION=' configure.in | head -1 | sed 's/"//g' | cut -f2 -d=)214 VERSION := $(shell grep '^ *VERSION=' configure.in | head -1 | sed 's/"//g' | cut -f2 -d=) 215 215 216 216 # All symbols must be exported … … 236 236 @echo CC: $(CC) 237 237 @echo CFLAGS: $(CFLAGS) 238 @echo DCFLAGS: $(DCFLAGS)239 238 @echo LDFLAGS: $(LDFLAGS) 240 @echo PCFLAGS: $(PCFLAGS) 241 @echo PLDFLAGS: $(PLDFLAGS) 239 @echo plugins_CFLAGS: $(plugins_CFLAGS) 240 @echo plugins_LDFLAGS: $(plugins_LDFLAGS) 241 @echo builtins_CFLAGS: $(builtins_CFLAGS) 242 @echo builtins_LDFLAGS: $(builtins_LDFLAGS) 242 243 @echo C_OBJ: $(C_OBJ) 243 244 @echo CPP_OBJ: $(CPP_OBJ) … … 251 252 rm -f src/*/*.o extras/*/*.o 252 253 rm -f lib/*.so* lib/*.a 253 rm -f plugins/*.so plugins/*.a 254 rm -f plugins/*.so plugins/*.a plugins/*.lib plugins/*.tds 254 255 rm -rf extras/MacOSX/build 255 256 … … 373 374 cp share/$$file tmp/vlc/share/ ; done 374 375 # Build archives 375 F=vlc-${V LC_QUICKVERSION}; \376 F=vlc-${VERSION}; \ 376 377 mv tmp/vlc tmp/$$F; (cd tmp ; tar cf $$F.tar $$F); \ 377 378 bzip2 -f -9 < tmp/$$F.tar > $$F.tar.bz2; \ … … 391 392 fi 392 393 # Create installation script 393 sed -e 's#@VERSION@#'${VLC_QUICKVERSION}'#' < install-win32 >tmp/nsi394 cp install-win32 tmp/nsi 394 395 # Copy relevant files 395 cp vlc.exe $(PLUGINS:%=plugins/%.so) tmp/ 396 cp vlc.exe tmp/ 397 $(STRIP) tmp/vlc.exe 396 398 cp INSTALL.win32 tmp/INSTALL.txt ; unix2dos tmp/INSTALL.txt 397 399 for file in AUTHORS COPYING ChangeLog README FAQ TODO ; \ 398 400 do cp $$file tmp/$${file}.txt ; \ 399 401 unix2dos tmp/$${file}.txt ; done 400 for file in iconv.dll libgmodule-1.3-12.dll libgtk-0.dll libgdk-0.dll \ 401 libgobject-1.3-12.dll libintl-1.dll libglib-1.3-12.dll \ 402 libgthread-1.3-12.dll SDL.dll README-SDL.txt ; \ 403 do cp ${DLL_PATH}/$$file tmp/ ; done 402 mkdir tmp/plugins 403 cp $(PLUGINS:%=plugins/%.so) tmp/plugins/ 404 $(STRIP) tmp/$(PLUGINS:%=plugins/%.so) 404 405 mkdir tmp/share 405 406 for file in default8x16.psf default8x9.psf ; \ 406 407 do cp share/$$file tmp/share/ ; done 407 408 # Create package 408 wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe /CD tmp/nsi 409 mv tmp/vlc-${VLC_QUICKVERSION}.exe \ 410 vlc-${VLC_QUICKVERSION}-win32-installer.exe 409 wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} /CD tmp/nsi 411 410 # Clean up 412 411 rm -Rf tmp … … 428 427 do cp share/$$file tmp/vlc/share/ ; done 429 428 # Create package 430 mv tmp/vlc tmp/vlc-${V LC_QUICKVERSION}431 (cd tmp ; find vlc-${V LC_QUICKVERSION} | \432 zip -9 -@ vlc-${V LC_QUICKVERSION}-beos.zip )433 mv tmp/vlc-${V LC_QUICKVERSION}-BeOS-x86.zip .429 mv tmp/vlc tmp/vlc-${VERSION} 430 (cd tmp ; find vlc-${VERSION} | \ 431 zip -9 -@ vlc-${VERSION}-beos.zip ) 432 mv tmp/vlc-${VERSION}-BeOS-x86.zip . 434 433 # Clean up 435 434 rm -Rf tmp … … 448 447 449 448 # Create disk image 450 ./macosx-dmg 0 "vlc-${V LC_QUICKVERSION}" tmp/*449 ./macosx-dmg 0 "vlc-${VERSION}" tmp/* 451 450 452 451 # Clean up … … 529 528 # 530 529 vlc: Makefile.opts Makefile.dep Makefile $(VLC_OBJ) $(BUILTIN_OBJ) 531 $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS) $( LIB_VLC) $(LIB_BUILTINS) $(LIB_COMMON)530 $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS) $(vlc_LDFLAGS) $(builtins_LDFLAGS) 532 531 ifeq ($(SYS),beos) 533 532 xres -o $@ ./share/vlc_beos.rsrc Makefile.dep
rcc0f0bb r1b0868e 51 51 @test -d .dep/$(dir $*) || mkdir -p $(shell dirname .dep/$*) 52 52 #@echo "regenerating dependencies for $*.c" 53 @$(SHELL) -ec '$(CC) $(DCFLAGS) $(CFLAGS) $(DEFINE) 2>/dev/null $< \53 @$(SHELL) -ec '$(CC) -M $(CFLAGS) 2>/dev/null $< \ 54 54 | sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o \ 55 55 .dep\/$(subst /,\/,$*).d : /g'\'' > $@; \ … … 59 59 @test -d .dep/$(dir $*) || mkdir -p $(shell dirname .dep/$*) 60 60 #@echo "regenerating dependencies for $*.c" 61 @$(SHELL) -ec '$(CC) $(DCFLAGS) $(CFLAGS) $(DEFINE) 2>/dev/null $< \61 @$(SHELL) -ec '$(CC) -M $(CFLAGS) 2>/dev/null $< \ 62 62 | sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o \ 63 63 .dep\/$(subst /,\/,$*).dpp : /g'\'' > $@; \ Makefile.modules
re98aae2 r1b0868e 15 15 # 16 16 module_name := $(shell echo $(MAKECMDGOALS) | sed 's@.*/\(.*\)\..*@\1@') 17 MODULE_NAME := $(shell echo $(module_name) | tr '[a-z]' '[A-Z]')18 19 17 suff := $(shell echo $(MAKECMDGOALS) | sed 's@.*\.@@' | tr so/a lo/o) 20 18 … … 26 24 27 25 ifeq (lo,$(suff)) 28 CFLAGS_EXTRA := -I../../include -I../../extras $(CFLAGS_$(MODULE_NAME)) \26 extra_CFLAGS := $(plugins_CFLAGS) $($(module_name)_CFLAGS) \ 29 27 -DMODULE_NAME=$(module_name) -DMODULE_NAME_IS_$(module_name) \ 30 -DPLUGIN $(CFLAGS_$(MODULE_NAME)_PLUGIN) $(PCFLAGS)28 $($(module_name)_so_CFLAGS) 31 29 OBJ_ALL := $(SRC_C:%.c=%.lo.$(module_name)) $(SRC_CPP:%.cpp=%.lo.$(module_name)) 32 30 else 33 CFLAGS_EXTRA := -I../../include -I../../extras $(CFLAGS_$(MODULE_NAME)) \31 extra_CFLAGS := $(builtins_CFLAGS) $($(module_name)_CFLAGS) \ 34 32 -DMODULE_NAME=$(module_name) -DMODULE_NAME_IS_$(module_name) \ 35 -DBUILTIN $(CFLAGS_$(MODULE_NAME)_BUILTIN)33 $($(module_name)_a_CFLAGS) 36 34 OBJ_ALL := $(SRC_C:%.c=%.o.$(module_name)) $(SRC_CPP:%.cpp=%.o.$(module_name)) 37 35 endif … … 52 50 clean: 53 51 # rm -f $(PLUGIN_ALL) $(BUILTIN_ALL) 54 rm -f *.o *.o.* *.lo *.lo.* *. moc *.moc.* *.bak52 rm -f *.o *.o.* *.lo *.lo.* *.obj *.moc *.moc.* *.bak 55 53 rm -rf .dep 56 54 … … 61 59 62 60 $(C_DEP): %.d: FORCE 63 @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ CFLAGS="$(CFLAGS) $( CFLAGS_EXTRA)"61 @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ CFLAGS="$(CFLAGS) $(extra_CFLAGS)" 64 62 65 63 $(CPP_DEP): %.dpp: FORCE 66 @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ CFLAGS="$(CFLAGS) $( CFLAGS_EXTRA)"64 @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@ CFLAGS="$(CFLAGS) $(extra_CFLAGS)" 67 65 68 66 $(SRC_C:%.c=%.$(suff).$(module_name)): %.$(suff).$(module_name): .dep/%.d 69 67 $(SRC_C:%.c=%.$(suff).$(module_name)): %.$(suff).$(module_name): %.c 70 $(CC) $(CFLAGS) $( CFLAGS_EXTRA) -c $< -o $@68 $(CC) $(CFLAGS) $(extra_CFLAGS) -c $< -o $@ 71 69 72 70 $(SRC_CPP:%.cpp=%.$(suff).$(module_name)): %.$(suff).$(module_name): .dep/%.dpp 73 71 $(SRC_CPP:%.cpp=%.$(suff).$(module_name)): %.$(suff).$(module_name): %.cpp 74 $(CC) $(CFLAGS) $( CFLAGS_EXTRA) -c $< -o $@72 $(CC) $(CFLAGS) $(extra_CFLAGS) -c $< -o $@ 75 73 76 74 # foo_CUSTOM lets us override all target rules for foo.so and foo.a 77 75 ifeq (,$($(module_name)_CUSTOM)) 78 76 ../$(module_name).so: $(EXTRA_DEP) $(OBJ_ALL) 79 $(CC) $(OBJ_ALL) $( PLDFLAGS) $(LIB_$(MODULE_NAME)) $(LIB_COMMON) -o $@77 $(CC) $(OBJ_ALL) $(LDFLAGS) $(plugins_LDFLAGS) $($(module_name)_LDFLAGS) -o $@ 80 78 chmod a-x $@ 81 79 Makefile.opts.in
r0d69146 r1b0868e 49 49 SHELL = @SHELL@ 50 50 RANLIB = @RANLIB@ 51 STRIP = @STRIP@ 51 52 MOC = @MOC@ 52 53 WINDRES = @WINDRES@ 53 54 BCBUILDER = @BCBUILDER@ 54 DLL_PATH = @DLL_PATH@55 55 56 56 # … … 65 65 66 66 # 67 # CFLAGS for special cases 68 # 69 vlc_CFLAGS = @vlc_CFLAGS@ 70 plugins_CFLAGS := @plugins_CFLAGS@ 71 builtins_CFLAGS := @builtins_CFLAGS@ 72 73 arts_CFLAGS = @arts_CFLAGS@ 74 dvd_CFLAGS = @dvd_CFLAGS@ 75 dvdread_CFLAGS = @dvdread_CFLAGS@ 76 directx_CFLAGS = @directx_CFLAGS@ 77 esd_CFLAGS = @esd_CFLAGS@ 78 glide_CFLAGS = @glide_CFLAGS@ 79 gnome_CFLAGS = @gnome_CFLAGS@ 80 gtk_CFLAGS = @gtk_CFLAGS@ 81 kde_CFLAGS = @kde_CFLAGS@ 82 idctaltivec_CFLAGS = @idctaltivec_CFLAGS@ 83 macosx_CFLAGS = @macosx_CFLAGS@ 84 mad_CFLAGS = @mad_CFLAGS@ 85 memcpyaltivec_CFLAGS = @memcpyaltivec_CFLAGS@ 86 motionaltivec_CFLAGS = @motionaltivec_CFLAGS@ 87 qt_CFLAGS = @qt_CFLAGS@ 88 sdl_CFLAGS = @sdl_CFLAGS@ 89 x11_CFLAGS = @x11_CFLAGS@ 90 xvideo_CFLAGS = @xvideo_CFLAGS@ 91 92 # 67 93 # Libraries for special cases 68 94 # 69 LIB_COMMON = @LIB_COMMON@ 70 LIB_VLC = @LIB_VLC@ 71 72 LIB_A52 = @LIB_A52@ 73 LIB_AA = @LIB_AA@ 74 LIB_ALSA = @LIB_ALSA@ 75 LIB_ARTS = @LIB_ARTS@ 76 LIB_BEOS = @LIB_BEOS@ 77 LIB_CHROMA_I420_RGB = @LIB_CHROMA_I420_RGB@ 78 LIB_DARWIN = @LIB_DARWIN@ 79 LIB_DIRECTX = @LIB_DIRECTX@ 80 LIB_DSP = @LIB_DSP@ 81 LIB_DVD = @LIB_DVD@ 82 LIB_DVDREAD = @LIB_DVDREAD@ 83 LIB_ESD = @LIB_ESD@ 84 LIB_FILTER_DISTORT = @LIB_FILTER_DISTORT@ 85 LIB_GGI = @LIB_GGI@ 86 LIB_GLIDE = @LIB_GLIDE@ 87 LIB_GNOME = @LIB_GNOME@ 88 LIB_GTK = @LIB_GTK@ 89 LIB_IDCTALTIVEC = @LIB_IDCTALTIVEC@ 90 LIB_IMDCT = @LIB_IMDCT@ 91 LIB_IMDCT3DN = @LIB_IMDCT3DN@ 92 LIB_IMDCTSSE = @LIB_IMDCTSSE@ 93 LIB_IPV4 = @LIB_IPV4@ 94 LIB_IPV6 = @LIB_IPV6@ 95 LIB_KDE = @LIB_KDE@ 96 LIB_LIRC = @LIB_LIRC@ 97 LIB_MACOSX = @LIB_MACOSX@ 98 LIB_MAD = @LIB_MAD@ 99 LIB_MEMCPYALTIVEC = @LIB_MEMCPYALTIVEC@ 100 LIB_MOTIONALTIVEC = @LIB_MOTIONALTIVEC@ 101 LIB_MPEG_TS = @LIB_MPEG_TS@ 102 LIB_NCURSES = @LIB_NCURSES@ 103 LIB_QNX = @LIB_QNX@ 104 LIB_QT = @LIB_QT@ 105 LIB_RC = @LIB_RC@ 106 LIB_SDL = @LIB_SDL@ 107 LIB_VCD = @LIB_VCD@ 108 LIB_VORBIS = @LIB_VORBIS@ 109 LIB_WAVEOUT = @LIB_WAVEOUT@ 110 LIB_WIN32 = @LIB_WIN32@ 111 LIB_X11 = @LIB_X11@ 112 LIB_XVIDEO = @LIB_XVIDEO@ 113 114 # 115 # CFLAGS for special cases 116 # 117 CFLAGS_COMMON = @CFLAGS_COMMON@ 118 CFLAGS_VLC = @CFLAGS_VLC@ 119 120 CFLAGS_ARTS = @CFLAGS_ARTS@ 121 CFLAGS_DVD = @CFLAGS_DVD@ 122 CFLAGS_DVDREAD = @CFLAGS_DVDREAD@ 123 CFLAGS_ESD = @CFLAGS_ESD@ 124 CFLAGS_GLIDE = @CFLAGS_GLIDE@ 125 CFLAGS_GNOME = @CFLAGS_GNOME@ 126 CFLAGS_GTK = @CFLAGS_GTK@ 127 CFLAGS_KDE = @CFLAGS_KDE@ 128 CFLAGS_IDCTALTIVEC = @CFLAGS_IDCTALTIVEC@ 129 CFLAGS_MACOSX = @CFLAGS_MACOSX@ 130 CFLAGS_MAD = @CFLAGS_MAD@ 131 CFLAGS_MEMCPYALTIVEC = @CFLAGS_MEMCPYALTIVEC@ 132 CFLAGS_MOTIONALTIVEC = @CFLAGS_MOTIONALTIVEC@ 133 CFLAGS_QT = @CFLAGS_QT@ 134 CFLAGS_SDL = @CFLAGS_SDL@ 135 CFLAGS_WIN32 = @CFLAGS_WIN32@ 136 CFLAGS_X11 = @CFLAGS_X11@ 137 CFLAGS_XVIDEO = @CFLAGS_XVIDEO@ 95 vlc_LDFLAGS = @vlc_LDFLAGS@ 96 plugins_LDFLAGS += @plugins_LDFLAGS@ 97 builtins_LDFLAGS += @builtins_LDFLAGS@ 98 99 a52_LDFLAGS = @a52_LDFLAGS@ 100 aa_LDFLAGS = @aa_LDFLAGS@ 101 alsa_LDFLAGS = @alsa_LDFLAGS@ 102 arts_LDFLAGS = @arts_LDFLAGS@ 103 beos_LDFLAGS = @beos_LDFLAGS@ 104 chroma_i420_rgb_LDFLAGS = @chroma_i420_rgb_LDFLAGS@ 105 directx_LDFLAGS = @directx_LDFLAGS@ 106 dsp_LDFLAGS = @dsp_LDFLAGS@ 107 dvd_LDFLAGS = @dvd_LDFLAGS@ 108 dvdread_LDFLAGS = @dvdread_LDFLAGS@ 109 esd_LDFLAGS = @esd_LDFLAGS@ 110 filter_distort_LDFLAGS = @filter_distort_LDFLAGS@ 111 ggi_LDFLAGS = @ggi_LDFLAGS@ 112 glide_LDFLAGS = @glide_LDFLAGS@ 113 gnome_LDFLAGS = @gnome_LDFLAGS@ 114 gtk_LDFLAGS = @gtk_LDFLAGS@ 115 idctaltivec_LDFLAGS = @idctaltivec_LDFLAGS@ 116 imdct_LDFLAGS = @imdct_LDFLAGS@ 117 imdct3dn_LDFLAGS = @imdct3dn_LDFLAGS@ 118 imdctsse_LDFLAGS = @imdctsse_LDFLAGS@ 119 ipv4_LDFLAGS = @ipv4_LDFLAGS@ 120 kde_LDFLAGS = @kde_LDFLAGS@ 121 lirc_LDFLAGS = @lirc_LDFLAGS@ 122 macosx_LDFLAGS = @macosx_LDFLAGS@ 123 mad_LDFLAGS = @mad_LDFLAGS@ 124 memcpyaltivec_LDFLAGS = @memcpyaltivec_LDFLAGS@ 125 motionaltivec_LDFLAGS = @motionaltivec_LDFLAGS@ 126 ncurses_LDFLAGS = @ncurses_LDFLAGS@ 127 qnx_LDFLAGS = @qnx_LDFLAGS@ 128 qt_LDFLAGS = @qt_LDFLAGS@ 129 rc_LDFLAGS = @rc_LDFLAGS@ 130 sdl_LDFLAGS = @sdl_LDFLAGS@ 131 vcd_LDFLAGS = @vcd_LDFLAGS@ 132 vorbis_LDFLAGS = @vorbis_LDFLAGS@ 133 waveout_LDFLAGS = @waveout_LDFLAGS@ 134 x11_LDFLAGS = @x11_LDFLAGS@ 135 xvideo_LDFLAGS = @xvideo_LDFLAGS@ 138 136 139 137 # … … 150 148 ifeq ($(DEBUG),1) 151 149 PROGRAM_OPTIONS += DEBUG 152 DEFINE+= -DDEBUG150 CFLAGS += -DDEBUG 153 151 endif 154 152 ifeq ($(CPROF),1) 155 153 PROGRAM_OPTIONS += CPROF 156 DEFINE+= -DCPROF154 CFLAGS += -DCPROF 157 155 endif 158 156 ifeq ($(GPROF),1) 159 157 PROGRAM_OPTIONS += GPROF 160 DEFINE+= -DGPROF158 CFLAGS += -DGPROF 161 159 endif 162 160 … … 171 169 endif 172 170 173 # DEFINE will contain some of the constants definitions decided in Makefile,174 # including SYS_xx. It will be passed to C compiler.175 DEFINE_SYS := -DSYS_$(shell echo $(SYS) | sed -e 's/-.*//' | tr '[a-z].' '[A-Z]_')176 DEFINE += $(DEFINE_SYS)177 178 171 # On Linux and Solaris, activate 64-bit off_t (by default under BSD) 179 DEFINE+= -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE172 CFLAGS += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE 180 173 181 174 # Gettext support 182 DEFINE+= -DLOCALEDIR=\"$(datadir)/locale\"175 CFLAGS += -DLOCALEDIR=\"$(datadir)/locale\" 183 176 184 177 # Data and plugin location 185 DEFINE+= -DDATA_PATH=\"@prefix@/share/videolan\"186 DEFINE+= -DPLUGIN_PATH=\"@prefix@/lib/videolan/vlc\"178 CFLAGS += -DDATA_PATH=\"@prefix@/share/videolan\" 179 CFLAGS += -DPLUGIN_PATH=\"@prefix@/lib/videolan/vlc\" 187 180 188 181 ############################################################################### … … 194 187 # C headers directories 195 188 # 196 INCLUDE += @INCLUDE@ 197 INCLUDE += -Iinclude -Iextras 198 199 # 200 # Libraries needed by built-in modules 201 # 202 LIB_BUILTINS := $(patsubst %,$$LIB_%,$(shell echo $(BUILTINS) | tr '[a-z]' '[A-Z]')) 203 204 # 205 # Libraries needed by the vlc executable 206 # 207 ifneq (,$(findstring mingw32,$(SYS))) 208 LIB_VLC += -lws2_32 -lnetapi32 209 endif 189 CFLAGS += -Iinclude -Iextras 210 190 211 191 # 212 192 # C compiler flags: mainstream compilation 213 193 # 214 CFLAGS += $(DEFINE) $(INCLUDE)215 194 CFLAGS += -D_REENTRANT 216 195 CFLAGS += -D_GNU_SOURCE … … 218 197 ifeq ($(RELEASE),1) 219 198 CFLAGS += -DHAVE_RELEASE 220 endif221 222 # flags needed for clean beos compilation223 ifeq ($(SYS),beos)224 CFLAGS += -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual225 endif226 227 ifneq (,$(findstring darwin,$(SYS)))228 CFLAGS += -no-cpp-precomp229 endif230 231 ifneq (,$(findstring mingw32,$(SYS)))232 CFLAGS += -fnative-struct -D_OFF_T_ -D_off_t=long233 endif234 235 ifneq (,$(findstring bsd,$(SYS)))236 CFLAGS += -pthread237 199 endif 238 200 … … 273 235 274 236 # 275 # C compiler flags: dependancies276 #277 DCFLAGS += $(INCLUDE)278 DCFLAGS += -M279 280 #281 237 # C compiler flags: linking 282 238 # 283 239 LDFLAGS += @LDFLAGS@ 284 LDFLAGS += $(LIB)285 240 LDFLAGS += -Wall 286 241 ifneq ($(DEBUG),1) … … 291 246 endif 292 247 endif 293 ifneq (,$(findstring mingw32,$(SYS))) 294 LDFLAGS += -mwindows -Xlinker --force-exe-suffix 295 endif 296 297 # 298 # C compiler flags: plugin compilation 299 # 300 ifneq (,$(findstring mingw32,$(SYS))) 301 PCFLAGS += -fnative-struct 302 else 303 PCFLAGS += -fPIC 304 endif 305 306 # 307 # C compiler flags: plugin linking 308 # 309 PLDFLAGS += @PLDFLAGS@ 248 249 # 250 # C compiler flags: plugins and builtins compilation 251 # 252 plugins_CFLAGS += -DPLUGIN -I../../include -I../../extras 253 builtins_CFLAGS += -DBUILTIN -I../../include -I../../extras 254 255 # 256 # Linker flags: plugins and builtins linking 257 # 258 builtins_LDFLAGS += $(patsubst %,$$%_LDFLAGS,$(BUILTINS)) 310 259 311 260 # configure
r0d69146 r1b0868e 128 128 --with-words=endianness set endianness (big or little)" 129 129 ac_help="$ac_help 130 --with-dll-path=PATH path to Win32 DLLs (default search in \$PWD)"131 ac_help="$ac_help132 130 --enable-gprof gprof profiling (default disabled)" 133 131 ac_help="$ac_help … … 698 696 699 697 echo $ac_n "checking host system type""... $ac_c" 1>&6 700 echo "configure: 701: checking host system type" >&5698 echo "configure:699: checking host system type" >&5 701 699 702 700 host_alias=$host … … 719 717 720 718 echo $ac_n "checking target system type""... $ac_c" 1>&6 721 echo "configure:72 2: checking target system type" >&5719 echo "configure:720: checking target system type" >&5 722 720 723 721 target_alias=$target … … 737 735 738 736 echo $ac_n "checking build system type""... $ac_c" 1>&6 739 echo "configure:7 40: checking build system type" >&5737 echo "configure:738: checking build system type" >&5 740 738 741 739 build_alias=$build … … 764 762 765 763 save_CFLAGS="${CFLAGS}" 764 save_CPPFLAGS="${CPPFLAGS}" 766 765 save_LDFLAGS="${LDFLAGS}" 767 766 768 767 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 769 echo "configure:7 70: checking whether ${MAKE-make} sets \${MAKE}" >&5768 echo "configure:769: checking whether ${MAKE-make} sets \${MAKE}" >&5 770 769 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` 771 770 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then … … 796 795 set dummy gcc; ac_word=$2 797 796 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 798 echo "configure:79 9: checking for $ac_word" >&5797 echo "configure:798: checking for $ac_word" >&5 799 798 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then 800 799 echo $ac_n "(cached) $ac_c" 1>&6 … … 826 825 set dummy cc; ac_word=$2 827 826 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 828 echo "configure:82 9: checking for $ac_word" >&5827 echo "configure:828: checking for $ac_word" >&5 829 828 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then 830 829 echo $ac_n "(cached) $ac_c" 1>&6 … … 877 876 set dummy cl; ac_word=$2 878 877 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 879 echo "configure:8 80: checking for $ac_word" >&5878 echo "configure:879: checking for $ac_word" >&5 880 879 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then 881 880 echo $ac_n "(cached) $ac_c" 1>&6 … … 909 908 910 909 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 911 echo "configure:91 2: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5910 echo "configure:911: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 912 911 913 912 ac_ext=c … … 920 919 cat > conftest.$ac_ext << EOF 921 920 922 #line 92 3"configure"921 #line 922 "configure" 923 922 #include "confdefs.h" 924 923 925 924 main(){return(0);} 926 925 EOF 927 if { (eval echo configure:92 8: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then926 if { (eval echo configure:927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 928 927 ac_cv_prog_cc_works=yes 929 928 # If we can't run a trivial program, we are probably using a cross compiler. … … 951 950 fi 952 951 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 953 echo "configure:95 4: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5952 echo "configure:953: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 954 953 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 955 954 cross_compiling=$ac_cv_prog_cc_cross 956 955 957 956 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 958 echo "configure:95 9: checking whether we are using GNU C" >&5957 echo "configure:958: checking whether we are using GNU C" >&5 959 958 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then 960 959 echo $ac_n "(cached) $ac_c" 1>&6 … … 965 964 #endif 966 965 EOF 967 if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:96 8: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then966 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 968 967 ac_cv_prog_gcc=yes 969 968 else … … 984 983 CFLAGS= 985 984 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 986 echo "configure:98 7: checking whether ${CC-cc} accepts -g" >&5985 echo "configure:986: checking whether ${CC-cc} accepts -g" >&5 987 986 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then 988 987 echo $ac_n "(cached) $ac_c" 1>&6 … … 1016 1015 1017 1016 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 1018 echo "configure:101 9: checking how to run the C preprocessor" >&51017 echo "configure:1018: checking how to run the C preprocessor" >&5 1019 1018 # On Suns, sometimes $CPP names a directory. 1020 1019 if test -n "$CPP" && test -d "$CPP"; then … … 1031 1030 # not just through cpp. 1032 1031 cat > conftest.$ac_ext <<EOF 1033 #line 103 4"configure"1032 #line 1033 "configure" 1034 1033 #include "confdefs.h" 1035 1034 #include <assert.h> … … 1037 1036 EOF 1038 1037 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 1039 { (eval echo configure:10 40: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }1038 { (eval echo configure:1039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 1040 1039 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 1041 1040 if test -z "$ac_err"; then … … 1048 1047 CPP="${CC-cc} -E -traditional-cpp" 1049 1048 cat > conftest.$ac_ext <<EOF 1050 #line 105 1"configure"1049 #line 1050 "configure" 1051 1050 #include "confdefs.h" 1052 1051 #include <assert.h> … … 1054 1053 EOF 1055 1054 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 1056 { (eval echo configure:105 7: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }1055 { (eval echo configure:1056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 1057 1056 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 1058 1057 if test -z "$ac_err"; then … … 1065 1064 CPP="${CC-cc} -nologo -E" 1066 1065 cat > conftest.$ac_ext <<EOF 1067 #line 106 8"configure"1066 #line 1067 "configure" 1068 1067 #include "confdefs.h" 1069 1068 #include <assert.h> … … 1071 1070 EOF 1072 1071 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 1073 { (eval echo configure:107 4: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }1072 { (eval echo configure:1073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 1074 1073 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 1075 1074 if test -z "$ac_err"; then … … 1105 1104 set dummy ${ac_tool_prefix}ranlib; ac_word=$2 1106 1105 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 1107 echo "configure:110 8: checking for $ac_word" >&51106 echo "configure:1107: checking for $ac_word" >&5 1108 1107 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then 1109 1108 echo $ac_n "(cached) $ac_c" 1>&6 … … 1137 1136 set dummy ranlib; ac_word=$2 1138 1137 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 1139 echo "configure:11 40: checking for $ac_word" >&51138 echo "configure:1139: checking for $ac_word" >&5 1140 1139 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then 1141 1140 echo $ac_n "(cached) $ac_c" 1>&6 … … 1169 1168 fi 1170 1169 1170 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 1171 set dummy ${ac_tool_prefix}strip; ac_word=$2 1172 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 1173 echo "configure:1174: checking for $ac_word" >&5 1174 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then 1175 echo $ac_n "(cached) $ac_c" 1>&6 1176 else 1177 if test -n "$STRIP"; then 1178 ac_cv_prog_STRIP="$STRIP" # Let the user override the test. 1179 else 1180 IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 1181 ac_dummy="$PATH" 1182 for ac_dir in $ac_dummy; do 1183 test -z "$ac_dir" && ac_dir=. 1184 if test -f $ac_dir/$ac_word; then 1185 ac_cv_prog_STRIP="${ac_tool_prefix}strip" 1186 break 1187 fi 1188 done 1189 IFS="$ac_save_ifs" 1190 fi 1191 fi 1192 STRIP="$ac_cv_prog_STRIP" 1193 if test -n "$STRIP"; then 1194 echo "$ac_t""$STRIP" 1>&6 1195 else 1196 echo "$ac_t""no" 1>&6 1197 fi 1198 1199 1200 if test -z "$ac_cv_prog_STRIP"; then 1201 if test -n "$ac_tool_prefix"; then 1202 # Extract the first word of "strip", so it can be a program name with args. 1203 set dummy strip; ac_word=$2 1204 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 1205 echo "configure:1206: checking for $ac_word" >&5 1206 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then 1207 echo $ac_n "(cached) $ac_c" 1>&6 1208 else 1209 if test -n "$STRIP"; then 1210 ac_cv_prog_STRIP="$STRIP" # Let the user override the test. 1211 else 1212 IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 1213 ac_dummy="$PATH" 1214 for ac_dir in $ac_dummy; do 1215 test -z "$ac_dir" && ac_dir=. 1216 if test -f $ac_dir/$ac_word; then 1217 ac_cv_prog_STRIP="strip" 1218 break 1219 fi 1220 done 1221 IFS="$ac_save_ifs" 1222 test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":" 1223 fi 1224 fi 1225 STRIP="$ac_cv_prog_STRIP" 1226 if test -n "$STRIP"; then 1227 echo "$ac_t""$STRIP" 1>&6 1228 else 1229 echo "$ac_t""no" 1>&6 1230 fi 1231 1232 else 1233 STRIP=":" 1234 fi 1235 fi 1236 1171 1237 1172 1238 # Extract the first word of "gmake", so it can be a program name with args. 1173 1239 set dummy gmake; ac_word=$2 1174 1240 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 1175 echo "configure:1 176: checking for $ac_word" >&51241 echo "configure:1242: checking for $ac_word" >&5 1176 1242 if eval "test \"`echo '$''{'ac_cv_path_GMAKE'+set}'`\" = set"; then 1177 1243 echo $ac_n "(cached) $ac_c" 1>&6 … … 1208 1274 if test "x$GMAKE" = "xno"; then 1209 1275 echo $ac_n "checking whether GNU make is installed""... $ac_c" 1>&6 1210 echo "configure:12 11: checking whether GNU make is installed" >&51276 echo "configure:1277: checking whether GNU make is installed" >&5 1211 1277 if eval "test \"`echo '$''{'ac_cv_gmake'+set}'`\" = set"; then 1212 1278 echo $ac_n "(cached) $ac_c" 1>&6 … … 1240 1306 set dummy ranlib; ac_word=$2 1241 1307 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 1242 echo "configure:1 243: checking for $ac_word" >&51308 echo "configure:1309: checking for $ac_word" >&5 1243 1309 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then 1244 1310 echo $ac_n "(cached) $ac_c" 1>&6 … … 1269 1335 1270 1336 echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 1271 echo "configure:1 272: checking for strerror in -lcposix" >&51337 echo "configure:1338: checking for strerror in -lcposix" >&5 1272 1338 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` 1273 1339 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then … … 1277 1343 LIBS="-lcposix $LIBS" 1278 1344 cat > conftest.$ac_ext <<EOF 1279 #line 1 280"configure"1345 #line 1346 "configure" 1280 1346 #include "confdefs.h" 1281 1347 /* Override any gcc2 internal prototype to avoid an error. */ … … 1288 1354 ; return 0; } 1289 1355 EOF 1290 if { (eval echo configure:1 291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then1356 if { (eval echo configure:1357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 1291 1357 rm -rf conftest* 1292 1358 eval "ac_cv_lib_$ac_lib_var=yes" … … 1311 1377 1312 1378 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 1313 echo "configure:13 14: checking for ANSI C header files" >&51379 echo "configure:1380: checking for ANSI C header files" >&5 1314 1380 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then 1315 1381 echo $ac_n "(cached) $ac_c" 1>&6 1316 1382 else 1317 1383 cat > conftest.$ac_ext <<EOF 1318 #line 13 19"configure"1384 #line 1385 "configure" 1319 1385 #include "confdefs.h" 1320 1386 #include <stdlib.h> … … 1324 1390 EOF 1325 1391 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 1326 { (eval echo configure:13 27: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }1392 { (eval echo configure:1393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 1327 1393 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 1328 1394 if test -z "$ac_err"; then … … 1341 1407 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 1342 1408 cat > conftest.$ac_ext <<EOF 1343 #line 1 344"configure"1409 #line 1410 "configure" 1344 1410 #include "confdefs.h" 1345 1411 #include <string.h> … … 1359 1425 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 1360 1426 cat > conftest.$ac_ext <<EOF 1361 #line 1 362"configure"1427 #line 1428 "configure" 1362 1428 #include "confdefs.h" 1363 1429 #include <stdlib.h> … … 1380 1446 else 1381 1447 cat > conftest.$ac_ext <<EOF 1382 #line 1 383"configure"1448 #line 1449 "configure" 1383 1449 #include "confdefs.h" 1384 1450 #include <ctype.h> … … 1391 1457 1392 1458 EOF 1393 if { (eval echo configure:1 394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null1459 if { (eval echo configure:1460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 1394 1460 then 1395 1461 : … … 1415 1481 1416 1482 echo $ac_n "checking for working const""... $ac_c" 1>&6 1417 echo "configure:14 18: checking for working const" >&51483 echo "configure:1484: checking for working const" >&5 1418 1484 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then 1419 1485 echo $ac_n "(cached) $ac_c" 1>&6 1420 1486 else 1421 1487 cat > conftest.$ac_ext <<EOF 1422 #line 14 23"configure"1488 #line 1489 "configure" 1423 1489 #include "confdefs.h" 1424 1490 … … 1469 1535 ; return 0; } 1470 1536 EOF 1471 if { (eval echo configure:1 472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then1537 if { (eval echo configure:1538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 1472 1538 rm -rf conftest* 1473 1539 ac_cv_c_const=yes … … 1490 1556 1491 1557 echo $ac_n "checking for inline""... $ac_c" 1>&6 1492 echo "configure:1 493: checking for inline" >&51558 echo "configure:1559: checking for inline" >&5 1493 1559 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then 1494 1560 echo $ac_n "(cached) $ac_c" 1>&6 … … 1497 1563 for ac_kw in inline __inline__ __inline; do 1498 1564 cat > conftest.$ac_ext <<EOF 1499 #line 15 00"configure"1565 #line 1566 "configure" 1500 1566 #include "confdefs.h" 1501 1567 … … 1504 1570 ; return 0; } 1505 1571 EOF 1506 if { (eval echo configure:15 07: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then1572 if { (eval echo configure:1573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 1507 1573 rm -rf conftest* 1508 1574 ac_cv_c_inline=$ac_kw; break … … 1530 1596 1531 1597 echo $ac_n "checking for off_t""... $ac_c" 1>&6 1532 echo "configure:15 33: checking for off_t" >&51598 echo "configure:1599: checking for off_t" >&5 1533 1599 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then 1534 1600 echo $ac_n "(cached) $ac_c" 1>&6 1535 1601 else 1536 1602 cat > conftest.$ac_ext <<EOF 1537 #line 1 538"configure"1603 #line 1604 "configure" 1538 1604 #include "confdefs.h" 1539 1605 #include <sys/types.h> … … 1563 1629 1564 1630 echo $ac_n "checking for size_t""... $ac_c" 1>&6 1565 echo "configure:1 566: checking for size_t" >&51631 echo "configure:1632: checking for size_t" >&5 1566 1632 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then 1567 1633 echo $ac_n "(cached) $ac_c" 1>&6 1568 1634 else 1569 1635 cat > conftest.$ac_ext <<EOF 1570 #line 1 571"configure"1636 #line 1637 "configure" 1571 1637 #include "confdefs.h" 1572 1638 #include <sys/types.h> … … 1598 1664 # for constant arguments. Useless! 1599 1665 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 1600 echo "configure:16 01: checking for working alloca.h" >&51666 echo "configure:1667: checking for working alloca.h" >&5 1601 1667 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then 1602 1668 echo $ac_n "(cached) $ac_c" 1>&6 1603 1669 else 1604 1670 cat > conftest.$ac_ext <<EOF 1605 #line 16 06"configure"1671 #line 1672 "configure" 1606 1672 #include "confdefs.h" 1607 1673 #include <alloca.h> … … 1610 1676 ; return 0; } 1611 1677 EOF 1612 if { (eval echo configure:16 13: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then1678 if { (eval echo configure:1679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 1613 1679 rm -rf conftest* 1614 1680 ac_cv_header_alloca_h=yes … … 1631 1697 1632 1698 echo $ac_n "checking for alloca""... $ac_c" 1>&6 1633 echo "configure:1 634: checking for alloca" >&51699 echo "configure:1700: checking for alloca" >&5 1634 1700 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then 1635 1701 echo $ac_n "(cached) $ac_c" 1>&6 1636 1702 else 1637 1703 cat > conftest.$ac_ext <<EOF 1638 #line 1 639"configure"1704 #line 1705 "configure" 1639 1705 #include "confdefs.h" 1640 1706 … … 1664 1730 ; return 0; } 1665 1731 EOF 1666 if { (eval echo configure:1 667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then1732 if { (eval echo configure:1733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 1667 1733 rm -rf conftest* 1668 1734 ac_cv_func_alloca_works=yes … … 1696 1762 1697 1763 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 1698 echo "configure:1 699: checking whether alloca needs Cray hooks" >&51764 echo "configure:1765: checking whether alloca needs Cray hooks" >&5 1699 1765 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then 1700 1766 echo $ac_n "(cached) $ac_c" 1>&6 1701 1767 else 1702 1768 cat > conftest.$ac_ext <<EOF 1703 #line 17 04"configure"1769 #line 1770 "configure" 1704 1770 #include "confdefs.h" 1705 1771 #if defined(CRAY) && ! defined(CRAY2) … … 1726 1792 for ac_func in _getb67 GETB67 getb67; do 1727 1793 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 1728 echo "configure:17 29: checking for $ac_func" >&51794 echo "configure:1795: checking for $ac_func" >&5 1729 1795 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 1730 1796 echo $ac_n "(cached) $ac_c" 1>&6 1731 1797 else 1732 1798 cat > conftest.$ac_ext <<EOF 1733 #line 1 734"configure"1799 #line 1800 "configure" 1734 1800 #include "confdefs.h" 1735 1801 /* System header to define __stub macros and hopefully few prototypes, … … 1754 1820 ; return 0; } 1755 1821 EOF 1756 if { (eval echo configure:1 757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then1822 if { (eval echo configure:1823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 1757 1823 rm -rf conftest* 1758 1824 eval "ac_cv_func_$ac_func=yes" … … 1781 1847 1782 1848 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 1783 echo "configure:1 784: checking stack direction for C alloca" >&51849 echo "configure:1850: checking stack direction for C alloca" >&5 1784 1850 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then 1785 1851 echo $ac_n "(cached) $ac_c" 1>&6 … …
