Changeset 1b0868ed29bc006d5939c91c064ed3d7931a7432

Show
Ignore:
Timestamp:
04/05/02 22:44:23 (6 years ago)
Author:
Sam Hocevar <sam@videolan.org>
git-committer:
Sam Hocevar <sam@videolan.org> 1018039463 +0000
git-parent:

[0d691469a766b18159a80de5589bf4ae3f6bce37]

git-author:
Sam Hocevar <sam@videolan.org> 1018039463 +0000
Message:
  • ./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...

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • .cvsignore

    r735d6f7 r1b0868e  
    22core 
    33core.* 
     4conftest 
     5conftest.* 
    46.dep 
    57gmon.out 
  • ChangeLog

    r0d69146 r1b0868e  
    55HEAD 
    66 
     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. 
    714  * ./configure.in: added --enable-intfwin to enable the win32 interface and 
    815    --with-bcbuilder to tell make where to find Borland C++ Builder. 
  • INSTALL.win32

    re98aae2 r1b0868e  
    124124 If you are happy with the GTK interface, then you can skip this section) 
    125125 
    126 [Steps 2 and 3 are temporary] 
    127  
    1281261) Compile vlc as usual. 
    129 include\defs.h should be generated. 
    130127 
    1311282) From the plugin\win32 directory, use Borland C++ command-line tools 
  • Makefile

    re98aae2 r1b0868e  
    212212# Misc variables 
    213213# 
    214 VLC_QUICKVERSION := $(shell grep '^ *VERSION=' configure.in | head -1 | sed 's/"//g' | cut -f2 -d=) 
     214VERSION := $(shell grep '^ *VERSION=' configure.in | head -1 | sed 's/"//g' | cut -f2 -d=) 
    215215 
    216216# All symbols must be exported 
     
    236236    @echo CC: $(CC) 
    237237    @echo CFLAGS: $(CFLAGS) 
    238     @echo DCFLAGS: $(DCFLAGS) 
    239238    @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) 
    242243    @echo C_OBJ: $(C_OBJ) 
    243244    @echo CPP_OBJ: $(CPP_OBJ) 
     
    251252    rm -f src/*/*.o extras/*/*.o 
    252253    rm -f lib/*.so* lib/*.a 
    253     rm -f plugins/*.so plugins/*.a 
     254    rm -f plugins/*.so plugins/*.a plugins/*.lib plugins/*.tds 
    254255    rm -rf extras/MacOSX/build 
    255256 
     
    373374            cp share/$$file tmp/vlc/share/ ; done 
    374375    # Build archives 
    375     F=vlc-${VLC_QUICKVERSION}; \ 
     376    F=vlc-${VERSION}; \ 
    376377    mv tmp/vlc tmp/$$F; (cd tmp ; tar cf $$F.tar $$F); \ 
    377378    bzip2 -f -9 < tmp/$$F.tar > $$F.tar.bz2; \ 
     
    391392    fi 
    392393    # Create installation script 
    393     sed -e 's#@VERSION@#'${VLC_QUICKVERSION}'#' < install-win32 > tmp/nsi 
     394    cp install-win32 tmp/nsi 
    394395    # Copy relevant files 
    395     cp vlc.exe $(PLUGINS:%=plugins/%.so) tmp/  
     396    cp vlc.exe tmp/  
     397    $(STRIP) tmp/vlc.exe 
    396398    cp INSTALL.win32 tmp/INSTALL.txt ; unix2dos tmp/INSTALL.txt 
    397399    for file in AUTHORS COPYING ChangeLog README FAQ TODO ; \ 
    398400            do cp $$file tmp/$${file}.txt ; \ 
    399401            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) 
    404405    mkdir tmp/share 
    405406    for file in default8x16.psf default8x9.psf ; \ 
    406407        do cp share/$$file tmp/share/ ; done 
    407408    # 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 
    411410    # Clean up 
    412411    rm -Rf tmp 
     
    428427        do cp share/$$file tmp/vlc/share/ ; done 
    429428    # Create package  
    430     mv tmp/vlc tmp/vlc-${VLC_QUICKVERSION} 
    431     (cd tmp ; find vlc-${VLC_QUICKVERSION} | \ 
    432     zip -9 -@ vlc-${VLC_QUICKVERSION}-beos.zip ) 
    433     mv tmp/vlc-${VLC_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 . 
    434433    # Clean up 
    435434    rm -Rf tmp 
     
    448447 
    449448    # Create disk image  
    450     ./macosx-dmg 0 "vlc-${VLC_QUICKVERSION}" tmp/*  
     449    ./macosx-dmg 0 "vlc-${VERSION}" tmp/*  
    451450 
    452451    # Clean up 
     
    529528# 
    530529vlc: 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
    532531ifeq ($(SYS),beos) 
    533532    xres -o $@ ./share/vlc_beos.rsrc 
  • Makefile.dep

    rcc0f0bb r1b0868e  
    5151    @test -d .dep/$(dir $*) || mkdir -p $(shell dirname .dep/$*) 
    5252    #@echo "regenerating dependencies for $*.c" 
    53     @$(SHELL) -ec '$(CC) $(DCFLAGS) $(CFLAGS) $(DEFINE) 2>/dev/null $< \ 
     53    @$(SHELL) -ec '$(CC) -M $(CFLAGS) 2>/dev/null $< \ 
    5454    | sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o \ 
    5555    .dep\/$(subst /,\/,$*).d : /g'\'' > $@; \ 
     
    5959    @test -d .dep/$(dir $*) || mkdir -p $(shell dirname .dep/$*) 
    6060    #@echo "regenerating dependencies for $*.c" 
    61     @$(SHELL) -ec '$(CC) $(DCFLAGS) $(CFLAGS) $(DEFINE) 2>/dev/null $< \ 
     61    @$(SHELL) -ec '$(CC) -M $(CFLAGS) 2>/dev/null $< \ 
    6262    | sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o \ 
    6363    .dep\/$(subst /,\/,$*).dpp : /g'\'' > $@; \ 
  • Makefile.modules

    re98aae2 r1b0868e  
    1515# 
    1616module_name := $(shell echo $(MAKECMDGOALS) | sed 's@.*/\(.*\)\..*@\1@') 
    17 MODULE_NAME := $(shell echo $(module_name) | tr '[a-z]' '[A-Z]') 
    18  
    1917suff := $(shell echo $(MAKECMDGOALS) | sed 's@.*\.@@' | tr so/a lo/o) 
    2018 
     
    2624 
    2725ifeq (lo,$(suff)) 
    28 CFLAGS_EXTRA := -I../../include -I../../extras $(CFLAGS_$(MODULE_NAME)) \ 
     26extra_CFLAGS := $(plugins_CFLAGS) $($(module_name)_CFLAGS) \ 
    2927                -DMODULE_NAME=$(module_name) -DMODULE_NAME_IS_$(module_name) \ 
    30                 -DPLUGIN $(CFLAGS_$(MODULE_NAME)_PLUGIN) $(PCFLAGS) 
     28                $($(module_name)_so_CFLAGS) 
    3129OBJ_ALL := $(SRC_C:%.c=%.lo.$(module_name)) $(SRC_CPP:%.cpp=%.lo.$(module_name)) 
    3230else 
    33 CFLAGS_EXTRA := -I../../include -I../../extras $(CFLAGS_$(MODULE_NAME)) \ 
     31extra_CFLAGS := $(builtins_CFLAGS) $($(module_name)_CFLAGS) \ 
    3432                -DMODULE_NAME=$(module_name) -DMODULE_NAME_IS_$(module_name) \ 
    35                 -DBUILTIN $(CFLAGS_$(MODULE_NAME)_BUILTIN
     33                $($(module_name)_a_CFLAGS
    3634OBJ_ALL := $(SRC_C:%.c=%.o.$(module_name)) $(SRC_CPP:%.cpp=%.o.$(module_name)) 
    3735endif 
     
    5250clean: 
    5351#   rm -f $(PLUGIN_ALL) $(BUILTIN_ALL) 
    54     rm -f *.o *.o.* *.lo *.lo.* *.moc *.moc.* *.bak 
     52    rm -f *.o *.o.* *.lo *.lo.* *.obj *.moc *.moc.* *.bak 
    5553    rm -rf .dep 
    5654 
     
    6159 
    6260$(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)" 
    6462 
    6563$(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)" 
    6765 
    6866$(SRC_C:%.c=%.$(suff).$(module_name)): %.$(suff).$(module_name): .dep/%.d 
    6967$(SRC_C:%.c=%.$(suff).$(module_name)): %.$(suff).$(module_name): %.c 
    70     $(CC) $(CFLAGS) $(CFLAGS_EXTRA) -c $< -o $@ 
     68    $(CC) $(CFLAGS) $(extra_CFLAGS) -c $< -o $@ 
    7169 
    7270$(SRC_CPP:%.cpp=%.$(suff).$(module_name)): %.$(suff).$(module_name): .dep/%.dpp 
    7371$(SRC_CPP:%.cpp=%.$(suff).$(module_name)): %.$(suff).$(module_name): %.cpp 
    74     $(CC) $(CFLAGS) $(CFLAGS_EXTRA) -c $< -o $@ 
     72    $(CC) $(CFLAGS) $(extra_CFLAGS) -c $< -o $@ 
    7573 
    7674# foo_CUSTOM lets us override all target rules for foo.so and foo.a 
    7775ifeq (,$($(module_name)_CUSTOM)) 
    7876../$(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 $@ 
    8078    chmod a-x $@ 
    8179 
  • Makefile.opts.in

    r0d69146 r1b0868e  
    4949SHELL = @SHELL@ 
    5050RANLIB = @RANLIB@ 
     51STRIP = @STRIP@ 
    5152MOC = @MOC@ 
    5253WINDRES = @WINDRES@ 
    5354BCBUILDER = @BCBUILDER@ 
    54 DLL_PATH = @DLL_PATH@ 
    5555 
    5656#  
     
    6565 
    6666# 
     67# CFLAGS for special cases 
     68# 
     69vlc_CFLAGS = @vlc_CFLAGS@ 
     70plugins_CFLAGS := @plugins_CFLAGS@ 
     71builtins_CFLAGS := @builtins_CFLAGS@ 
     72 
     73arts_CFLAGS = @arts_CFLAGS@ 
     74dvd_CFLAGS = @dvd_CFLAGS@ 
     75dvdread_CFLAGS = @dvdread_CFLAGS@ 
     76directx_CFLAGS = @directx_CFLAGS@ 
     77esd_CFLAGS = @esd_CFLAGS@ 
     78glide_CFLAGS = @glide_CFLAGS@ 
     79gnome_CFLAGS = @gnome_CFLAGS@ 
     80gtk_CFLAGS = @gtk_CFLAGS@ 
     81kde_CFLAGS = @kde_CFLAGS@ 
     82idctaltivec_CFLAGS = @idctaltivec_CFLAGS@ 
     83macosx_CFLAGS = @macosx_CFLAGS@ 
     84mad_CFLAGS = @mad_CFLAGS@ 
     85memcpyaltivec_CFLAGS = @memcpyaltivec_CFLAGS@ 
     86motionaltivec_CFLAGS = @motionaltivec_CFLAGS@ 
     87qt_CFLAGS = @qt_CFLAGS@ 
     88sdl_CFLAGS = @sdl_CFLAGS@ 
     89x11_CFLAGS = @x11_CFLAGS@ 
     90xvideo_CFLAGS = @xvideo_CFLAGS@ 
     91 
     92# 
    6793# Libraries for special cases 
    6894# 
    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@ 
     95vlc_LDFLAGS = @vlc_LDFLAGS@ 
     96plugins_LDFLAGS += @plugins_LDFLAGS@ 
     97builtins_LDFLAGS += @builtins_LDFLAGS@ 
     98 
     99a52_LDFLAGS = @a52_LDFLAGS@ 
     100aa_LDFLAGS = @aa_LDFLAGS@ 
     101alsa_LDFLAGS = @alsa_LDFLAGS@ 
     102arts_LDFLAGS = @arts_LDFLAGS@ 
     103beos_LDFLAGS = @beos_LDFLAGS@ 
     104chroma_i420_rgb_LDFLAGS = @chroma_i420_rgb_LDFLAGS@ 
     105directx_LDFLAGS = @directx_LDFLAGS@ 
     106dsp_LDFLAGS = @dsp_LDFLAGS@ 
     107dvd_LDFLAGS = @dvd_LDFLAGS@ 
     108dvdread_LDFLAGS = @dvdread_LDFLAGS@ 
     109esd_LDFLAGS = @esd_LDFLAGS@ 
     110filter_distort_LDFLAGS = @filter_distort_LDFLAGS@ 
     111ggi_LDFLAGS = @ggi_LDFLAGS@ 
     112glide_LDFLAGS = @glide_LDFLAGS@ 
     113gnome_LDFLAGS = @gnome_LDFLAGS@ 
     114gtk_LDFLAGS = @gtk_LDFLAGS@ 
     115idctaltivec_LDFLAGS = @idctaltivec_LDFLAGS@ 
     116imdct_LDFLAGS = @imdct_LDFLAGS@ 
     117imdct3dn_LDFLAGS = @imdct3dn_LDFLAGS@ 
     118imdctsse_LDFLAGS = @imdctsse_LDFLAGS@ 
     119ipv4_LDFLAGS = @ipv4_LDFLAGS@ 
     120kde_LDFLAGS = @kde_LDFLAGS@ 
     121lirc_LDFLAGS = @lirc_LDFLAGS@ 
     122macosx_LDFLAGS = @macosx_LDFLAGS@ 
     123mad_LDFLAGS = @mad_LDFLAGS@ 
     124memcpyaltivec_LDFLAGS = @memcpyaltivec_LDFLAGS@ 
     125motionaltivec_LDFLAGS = @motionaltivec_LDFLAGS@ 
     126ncurses_LDFLAGS = @ncurses_LDFLAGS@ 
     127qnx_LDFLAGS = @qnx_LDFLAGS@ 
     128qt_LDFLAGS = @qt_LDFLAGS@ 
     129rc_LDFLAGS = @rc_LDFLAGS@ 
     130sdl_LDFLAGS = @sdl_LDFLAGS@ 
     131vcd_LDFLAGS = @vcd_LDFLAGS@ 
     132vorbis_LDFLAGS = @vorbis_LDFLAGS@ 
     133waveout_LDFLAGS = @waveout_LDFLAGS@ 
     134x11_LDFLAGS = @x11_LDFLAGS@ 
     135xvideo_LDFLAGS = @xvideo_LDFLAGS@ 
    138136 
    139137# 
     
    150148ifeq ($(DEBUG),1) 
    151149PROGRAM_OPTIONS += DEBUG 
    152 DEFINE += -DDEBUG 
     150CFLAGS += -DDEBUG 
    153151endif 
    154152ifeq ($(CPROF),1) 
    155153PROGRAM_OPTIONS += CPROF 
    156 DEFINE += -DCPROF 
     154CFLAGS += -DCPROF 
    157155endif 
    158156ifeq ($(GPROF),1) 
    159157PROGRAM_OPTIONS += GPROF 
    160 DEFINE += -DGPROF 
     158CFLAGS += -DGPROF 
    161159endif 
    162160 
     
    171169endif 
    172170 
    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  
    178171# 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_SOURCE 
     172CFLAGS += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE 
    180173 
    181174# Gettext support 
    182 DEFINE += -DLOCALEDIR=\"$(datadir)/locale\" 
     175CFLAGS += -DLOCALEDIR=\"$(datadir)/locale\" 
    183176 
    184177# Data and plugin location 
    185 DEFINE += -DDATA_PATH=\"@prefix@/share/videolan\" 
    186 DEFINE += -DPLUGIN_PATH=\"@prefix@/lib/videolan/vlc\" 
     178CFLAGS += -DDATA_PATH=\"@prefix@/share/videolan\" 
     179CFLAGS += -DPLUGIN_PATH=\"@prefix@/lib/videolan/vlc\" 
    187180 
    188181############################################################################### 
     
    194187# C headers directories 
    195188# 
    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 
     189CFLAGS += -Iinclude -Iextras 
    210190 
    211191# 
    212192# C compiler flags: mainstream compilation 
    213193# 
    214 CFLAGS += $(DEFINE) $(INCLUDE) 
    215194CFLAGS += -D_REENTRANT 
    216195CFLAGS += -D_GNU_SOURCE 
     
    218197ifeq ($(RELEASE),1) 
    219198CFLAGS += -DHAVE_RELEASE 
    220 endif 
    221  
    222 # flags needed for clean beos compilation 
    223 ifeq ($(SYS),beos) 
    224 CFLAGS += -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual 
    225 endif 
    226  
    227 ifneq (,$(findstring darwin,$(SYS))) 
    228 CFLAGS += -no-cpp-precomp 
    229 endif 
    230  
    231 ifneq (,$(findstring mingw32,$(SYS))) 
    232 CFLAGS += -fnative-struct -D_OFF_T_ -D_off_t=long 
    233 endif 
    234  
    235 ifneq (,$(findstring bsd,$(SYS))) 
    236 CFLAGS += -pthread 
    237199endif 
    238200 
     
    273235 
    274236# 
    275 # C compiler flags: dependancies 
    276 # 
    277 DCFLAGS += $(INCLUDE) 
    278 DCFLAGS += -M 
    279  
    280 # 
    281237# C compiler flags: linking 
    282238# 
    283239LDFLAGS += @LDFLAGS@ 
    284 LDFLAGS += $(LIB) 
    285240LDFLAGS += -Wall 
    286241ifneq ($(DEBUG),1) 
     
    291246endif 
    292247endif 
    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
     252plugins_CFLAGS += -DPLUGIN -I../../include -I../../extras 
     253builtins_CFLAGS += -DBUILTIN -I../../include -I../../extras 
     254 
     255
     256# Linker flags: plugins and builtins linking 
     257
     258builtins_LDFLAGS += $(patsubst %,$$%_LDFLAGS,$(BUILTINS)) 
    310259 
    311260# 
  • configure

    r0d69146 r1b0868e  
    128128  --with-words=endianness set endianness (big or little)" 
    129129ac_help="$ac_help 
    130   --with-dll-path=PATH    path to Win32 DLLs (default search in \$PWD)" 
    131 ac_help="$ac_help 
    132130  --enable-gprof          gprof profiling (default disabled)" 
    133131ac_help="$ac_help 
     
    698696 
    699697echo $ac_n "checking host system type""... $ac_c" 1>&6 
    700 echo "configure:701: checking host system type" >&5 
     698echo "configure:699: checking host system type" >&5 
    701699 
    702700host_alias=$host 
     
    719717 
    720718echo $ac_n "checking target system type""... $ac_c" 1>&6 
    721 echo "configure:722: checking target system type" >&5 
     719echo "configure:720: checking target system type" >&5 
    722720 
    723721target_alias=$target 
     
    737735 
    738736echo $ac_n "checking build system type""... $ac_c" 1>&6 
    739 echo "configure:740: checking build system type" >&5 
     737echo "configure:738: checking build system type" >&5 
    740738 
    741739build_alias=$build 
     
    764762 
    765763save_CFLAGS="${CFLAGS}" 
     764save_CPPFLAGS="${CPPFLAGS}" 
    766765save_LDFLAGS="${LDFLAGS}" 
    767766 
    768767echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 
    769 echo "configure:770: checking whether ${MAKE-make} sets \${MAKE}" >&5 
     768echo "configure:769: checking whether ${MAKE-make} sets \${MAKE}" >&5 
    770769set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` 
    771770if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then 
     
    796795set dummy gcc; ac_word=$2 
    797796echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 
    798 echo "configure:799: checking for $ac_word" >&5 
     797echo "configure:798: checking for $ac_word" >&5 
    799798if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then 
    800799  echo $ac_n "(cached) $ac_c" 1>&6 
     
    826825set dummy cc; ac_word=$2 
    827826echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 
    828 echo "configure:829: checking for $ac_word" >&5 
     827echo "configure:828: checking for $ac_word" >&5 
    829828if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then 
    830829  echo $ac_n "(cached) $ac_c" 1>&6 
     
    877876set dummy cl; ac_word=$2 
    878877echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 
    879 echo "configure:880: checking for $ac_word" >&5 
     878echo "configure:879: checking for $ac_word" >&5 
    880879if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then 
    881880  echo $ac_n "(cached) $ac_c" 1>&6 
     
    909908 
    910909echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 
    911 echo "configure:912: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 
     910echo "configure:911: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 
    912911 
    913912ac_ext=c 
     
    920919cat > conftest.$ac_ext << EOF 
    921920 
    922 #line 923 "configure" 
     921#line 922 "configure" 
    923922#include "confdefs.h" 
    924923 
    925924main(){return(0);} 
    926925EOF 
    927 if { (eval echo configure:928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     926if { (eval echo configure:927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    928927  ac_cv_prog_cc_works=yes 
    929928  # If we can't run a trivial program, we are probably using a cross compiler. 
     
    951950fi 
    952951echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 
    953 echo "configure:954: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 
     952echo "configure:953: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 
    954953echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 
    955954cross_compiling=$ac_cv_prog_cc_cross 
    956955 
    957956echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 
    958 echo "configure:959: checking whether we are using GNU C" >&5 
     957echo "configure:958: checking whether we are using GNU C" >&5 
    959958if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then 
    960959  echo $ac_n "(cached) $ac_c" 1>&6 
     
    965964#endif 
    966965EOF 
    967 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 
     966if { 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 
    968967  ac_cv_prog_gcc=yes 
    969968else 
     
    984983CFLAGS= 
    985984echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 
    986 echo "configure:987: checking whether ${CC-cc} accepts -g" >&5 
     985echo "configure:986: checking whether ${CC-cc} accepts -g" >&5 
    987986if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then 
    988987  echo $ac_n "(cached) $ac_c" 1>&6 
     
    10161015 
    10171016echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 
    1018 echo "configure:1019: checking how to run the C preprocessor" >&5 
     1017echo "configure:1018: checking how to run the C preprocessor" >&5 
    10191018# On Suns, sometimes $CPP names a directory. 
    10201019if test -n "$CPP" && test -d "$CPP"; then 
     
    10311030  # not just through cpp. 
    10321031  cat > conftest.$ac_ext <<EOF 
    1033 #line 1034 "configure" 
     1032#line 1033 "configure" 
    10341033#include "confdefs.h" 
    10351034#include <assert.h> 
     
    10371036EOF 
    10381037ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 
    1039 { (eval echo configure:1040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
     1038{ (eval echo configure:1039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
    10401039ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 
    10411040if test -z "$ac_err"; then 
     
    10481047  CPP="${CC-cc} -E -traditional-cpp" 
    10491048  cat > conftest.$ac_ext <<EOF 
    1050 #line 1051 "configure" 
     1049#line 1050 "configure" 
    10511050#include "confdefs.h" 
    10521051#include <assert.h> 
     
    10541053EOF 
    10551054ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 
    1056 { (eval echo configure:1057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
     1055{ (eval echo configure:1056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
    10571056ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 
    10581057if test -z "$ac_err"; then 
     
    10651064  CPP="${CC-cc} -nologo -E" 
    10661065  cat > conftest.$ac_ext <<EOF 
    1067 #line 1068 "configure" 
     1066#line 1067 "configure" 
    10681067#include "confdefs.h" 
    10691068#include <assert.h> 
     
    10711070EOF 
    10721071ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 
    1073 { (eval echo configure:1074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
     1072{ (eval echo configure:1073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
    10741073ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 
    10751074if test -z "$ac_err"; then 
     
    11051104set dummy ${ac_tool_prefix}ranlib; ac_word=$2 
    11061105echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 
    1107 echo "configure:1108: checking for $ac_word" >&5 
     1106echo "configure:1107: checking for $ac_word" >&5 
    11081107if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then 
    11091108  echo $ac_n "(cached) $ac_c" 1>&6 
     
    11371136set dummy ranlib; ac_word=$2 
    11381137echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 
    1139 echo "configure:1140: checking for $ac_word" >&5 
     1138echo "configure:1139: checking for $ac_word" >&5 
    11401139if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then 
    11411140  echo $ac_n "(cached) $ac_c" 1>&6 
     
    11691168fi 
    11701169 
     1170# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 
     1171set dummy ${ac_tool_prefix}strip; ac_word=$2 
     1172echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 
     1173echo "configure:1174: checking for $ac_word" >&5 
     1174if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then 
     1175  echo $ac_n "(cached) $ac_c" 1>&6 
     1176else 
     1177  if test -n "$STRIP"; then 
     1178  ac_cv_prog_STRIP="$STRIP" # Let the user override the test. 
     1179else 
     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" 
     1190fi 
     1191fi 
     1192STRIP="$ac_cv_prog_STRIP" 
     1193if test -n "$STRIP"; then 
     1194  echo "$ac_t""$STRIP" 1>&6 
     1195else 
     1196  echo "$ac_t""no" 1>&6 
     1197fi 
     1198 
     1199 
     1200if test -z "$ac_cv_prog_STRIP"; then 
     1201if test -n "$ac_tool_prefix"; then 
     1202  # Extract the first word of "strip", so it can be a program name with args. 
     1203set dummy strip; ac_word=$2 
     1204echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 
     1205echo "configure:1206: checking for $ac_word" >&5 
     1206if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then 
     1207  echo $ac_n "(cached) $ac_c" 1>&6 
     1208else 
     1209  if test -n "$STRIP"; then 
     1210  ac_cv_prog_STRIP="$STRIP" # Let the user override the test. 
     1211else 
     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=":" 
     1223fi 
     1224fi 
     1225STRIP="$ac_cv_prog_STRIP" 
     1226if test -n "$STRIP"; then 
     1227  echo "$ac_t""$STRIP" 1>&6 
     1228else 
     1229  echo "$ac_t""no" 1>&6 
     1230fi 
     1231 
     1232else 
     1233  STRIP=":" 
     1234fi 
     1235fi 
     1236 
    11711237 
    11721238# Extract the first word of "gmake", so it can be a program name with args. 
    11731239set dummy gmake; ac_word=$2 
    11741240echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 
    1175 echo "configure:1176: checking for $ac_word" >&5 
     1241echo "configure:1242: checking for $ac_word" >&5 
    11761242if eval "test \"`echo '$''{'ac_cv_path_GMAKE'+set}'`\" = set"; then 
    11771243  echo $ac_n "(cached) $ac_c" 1>&6 
     
    12081274if test "x$GMAKE" = "xno"; then 
    12091275  echo $ac_n "checking whether GNU make is installed""... $ac_c" 1>&6 
    1210 echo "configure:1211: checking whether GNU make is installed" >&5 
     1276echo "configure:1277: checking whether GNU make is installed" >&5 
    12111277if eval "test \"`echo '$''{'ac_cv_gmake'+set}'`\" = set"; then 
    12121278  echo $ac_n "(cached) $ac_c" 1>&6 
     
    12401306set dummy ranlib; ac_word=$2 
    12411307echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 
    1242 echo "configure:1243: checking for $ac_word" >&5 
     1308echo "configure:1309: checking for $ac_word" >&5 
    12431309if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then 
    12441310  echo $ac_n "(cached) $ac_c" 1>&6 
     
    12691335 
    12701336        echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 
    1271 echo "configure:1272: checking for strerror in -lcposix" >&5 
     1337echo "configure:1338: checking for strerror in -lcposix" >&5 
    12721338ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` 
    12731339if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 
     
    12771343LIBS="-lcposix  $LIBS" 
    12781344cat > conftest.$ac_ext <<EOF 
    1279 #line 1280 "configure" 
     1345#line 1346 "configure" 
    12801346#include "confdefs.h" 
    12811347/* Override any gcc2 internal prototype to avoid an error.  */ 
     
    12881354; return 0; } 
    12891355EOF 
    1290 if { (eval echo configure:1291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     1356if { (eval echo configure:1357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    12911357  rm -rf conftest* 
    12921358  eval "ac_cv_lib_$ac_lib_var=yes" 
     
    13111377 
    13121378echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 
    1313 echo "configure:1314: checking for ANSI C header files" >&5 
     1379echo "configure:1380: checking for ANSI C header files" >&5 
    13141380if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then 
    13151381  echo $ac_n "(cached) $ac_c" 1>&6 
    13161382else 
    13171383  cat > conftest.$ac_ext <<EOF 
    1318 #line 1319 "configure" 
     1384#line 1385 "configure" 
    13191385#include "confdefs.h" 
    13201386#include <stdlib.h> 
     
    13241390EOF 
    13251391ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 
    1326 { (eval echo configure:1327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
     1392{ (eval echo configure:1393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
    13271393ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 
    13281394if test -z "$ac_err"; then 
     
    13411407  # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 
    13421408cat > conftest.$ac_ext <<EOF 
    1343 #line 1344 "configure" 
     1409#line 1410 "configure" 
    13441410#include "confdefs.h" 
    13451411#include <string.h> 
     
    13591425  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 
    13601426cat > conftest.$ac_ext <<EOF 
    1361 #line 1362 "configure" 
     1427#line 1428 "configure" 
    13621428#include "confdefs.h" 
    13631429#include <stdlib.h> 
     
    13801446else 
    13811447  cat > conftest.$ac_ext <<EOF 
    1382 #line 1383 "configure" 
     1448#line 1449 "configure" 
    13831449#include "confdefs.h" 
    13841450#include <ctype.h> 
     
    13911457 
    13921458EOF 
    1393 if { (eval echo configure:1394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 
     1459if { (eval echo configure:1460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 
    13941460then 
    13951461  : 
     
    14151481 
    14161482echo $ac_n "checking for working const""... $ac_c" 1>&6 
    1417 echo "configure:1418: checking for working const" >&5 
     1483echo "configure:1484: checking for working const" >&5 
    14181484if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then 
    14191485  echo $ac_n "(cached) $ac_c" 1>&6 
    14201486else 
    14211487  cat > conftest.$ac_ext <<EOF 
    1422 #line 1423 "configure" 
     1488#line 1489 "configure" 
    14231489#include "confdefs.h" 
    14241490 
     
    14691535; return 0; } 
    14701536EOF 
    1471 if { (eval echo configure:1472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 
     1537if { (eval echo configure:1538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 
    14721538  rm -rf conftest* 
    14731539  ac_cv_c_const=yes 
     
    14901556 
    14911557echo $ac_n "checking for inline""... $ac_c" 1>&6 
    1492 echo "configure:1493: checking for inline" >&5 
     1558echo "configure:1559: checking for inline" >&5 
    14931559if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then 
    14941560  echo $ac_n "(cached) $ac_c" 1>&6 
     
    14971563for ac_kw in inline __inline__ __inline; do 
    14981564  cat > conftest.$ac_ext <<EOF 
    1499 #line 1500 "configure" 
     1565#line 1566 "configure" 
    15001566#include "confdefs.h" 
    15011567 
     
    15041570; return 0; } 
    15051571EOF 
    1506 if { (eval echo configure:1507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 
     1572if { (eval echo configure:1573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 
    15071573  rm -rf conftest* 
    15081574  ac_cv_c_inline=$ac_kw; break 
     
    15301596 
    15311597echo $ac_n "checking for off_t""... $ac_c" 1>&6 
    1532 echo "configure:1533: checking for off_t" >&5 
     1598echo "configure:1599: checking for off_t" >&5 
    15331599if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then 
    15341600  echo $ac_n "(cached) $ac_c" 1>&6 
    15351601else 
    15361602  cat > conftest.$ac_ext <<EOF 
    1537 #line 1538 "configure" 
     1603#line 1604 "configure" 
    15381604#include "confdefs.h" 
    15391605#include <sys/types.h> 
     
    15631629 
    15641630echo $ac_n "checking for size_t""... $ac_c" 1>&6 
    1565 echo "configure:1566: checking for size_t" >&5 
     1631echo "configure:1632: checking for size_t" >&5 
    15661632if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then 
    15671633  echo $ac_n "(cached) $ac_c" 1>&6 
    15681634else 
    15691635  cat > conftest.$ac_ext <<EOF 
    1570 #line 1571 "configure" 
     1636#line 1637 "configure" 
    15711637#include "confdefs.h" 
    15721638#include <sys/types.h> 
     
    15981664# for constant arguments.  Useless! 
    15991665echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 
    1600 echo "configure:1601: checking for working alloca.h" >&5 
     1666echo "configure:1667: checking for working alloca.h" >&5 
    16011667if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then 
    16021668  echo $ac_n "(cached) $ac_c" 1>&6 
    16031669else 
    16041670  cat > conftest.$ac_ext <<EOF 
    1605 #line 1606 "configure" 
     1671#line 1672 "configure" 
    16061672#include "confdefs.h" 
    16071673#include <alloca.h> 
     
    16101676; return 0; } 
    16111677EOF 
    1612 if { (eval echo configure:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     1678if { (eval echo configure:1679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    16131679  rm -rf conftest* 
    16141680  ac_cv_header_alloca_h=yes 
     
    16311697 
    16321698echo $ac_n "checking for alloca""... $ac_c" 1>&6 
    1633 echo "configure:1634: checking for alloca" >&5 
     1699echo "configure:1700: checking for alloca" >&5 
    16341700if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then 
    16351701  echo $ac_n "(cached) $ac_c" 1>&6 
    16361702else 
    16371703  cat > conftest.$ac_ext <<EOF 
    1638 #line 1639 "configure" 
     1704#line 1705 "configure" 
    16391705#include "confdefs.h" 
    16401706 
     
    16641730; return 0; } 
    16651731EOF 
    1666 if { (eval echo configure:1667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     1732if { (eval echo configure:1733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    16671733  rm -rf conftest* 
    16681734  ac_cv_func_alloca_works=yes 
     
    16961762 
    16971763echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 
    1698 echo "configure:1699: checking whether alloca needs Cray hooks" >&5 
     1764echo "configure:1765: checking whether alloca needs Cray hooks" >&5 
    16991765if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then 
    17001766  echo $ac_n "(cached) $ac_c" 1>&6 
    17011767else 
    17021768  cat > conftest.$ac_ext <<EOF 
    1703 #line 1704 "configure" 
     1769#line 1770 "configure" 
    17041770#include "confdefs.h" 
    17051771#if defined(CRAY) && ! defined(CRAY2) 
     
    17261792for ac_func in _getb67 GETB67 getb67; do 
    17271793  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 
    1728 echo "configure:1729: checking for $ac_func" >&5 
     1794echo "configure:1795: checking for $ac_func" >&5 
    17291795if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 
    17301796  echo $ac_n "(cached) $ac_c" 1>&6 
    17311797else 
    17321798  cat > conftest.$ac_ext <<EOF 
    1733 #line 1734 "configure" 
     1799#line 1800 "configure" 
    17341800#include "confdefs.h" 
    17351801/* System header to define __stub macros and hopefully few prototypes, 
     
    17541820; return 0; } 
    17551821EOF 
    1756 if { (eval echo configure:1757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     1822if { (eval echo configure:1823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    17571823  rm -rf conftest* 
    17581824  eval "ac_cv_func_$ac_func=yes" 
     
    17811847 
    17821848echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 
    1783 echo "configure:1784: checking stack direction for C alloca" >&5 
     1849echo "configure:1850: checking stack direction for C alloca" >&5 
    17841850if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then 
    17851851  echo $ac_n "(cached) $ac_c" 1>&6