Skip to content

V
vlc-1.1
Commit 53c2e3ac authored by Benoit Steiner's avatar Benoit Steiner
Browse files
Options 

Generation d'un makefile presque correct pour les vieilles versions de make
Nettoyage: gestion des dependances pour les plugins, suppressions de pas
mal de redondances, options de compilations coherentes, etc...
parent 93d8bc14
Show whitespace changes
Inline Side-by-side
Showing with 294 additions and 205 deletions
Makefile.in
View file @ 53c2e3ac
...@@ -20,6 +20,9 @@ SNAPSHOTDIR=vlc-@VLC_VERSION@ ...@@ -20,6 +20,9 @@ SNAPSHOTDIR=vlc-@VLC_VERSION@
INSTALL=@INSTALL@ INSTALL=@INSTALL@
ARCH=@ARCH@ ARCH=@ARCH@
prefix=@prefix@ prefix=@prefix@
CC=@CC@
SHELL=@SHELL@
#----------------- do not change anything below this line ---------------------- #----------------- do not change anything below this line ----------------------
...@@ -62,7 +65,6 @@ INCLUDE += -Iinclude -I/usr/local/include -I/usr/X11R6/include ...@@ -62,7 +65,6 @@ INCLUDE += -Iinclude -I/usr/local/include -I/usr/X11R6/include
# #
# Libraries # Libraries
# #
ifeq ($(SYS),gnu) ifeq ($(SYS),gnu)
LIB += -lthreads -ldl LIB += -lthreads -ldl
endif endif
...@@ -76,6 +78,10 @@ ifneq (,$(findstring linux,$(SYS))) ...@@ -76,6 +78,10 @@ ifneq (,$(findstring linux,$(SYS)))
LIB += -lpthread -ldl LIB += -lpthread -ldl
endif endif
ifneq (,$(findstring solaris,$(SYS)))
LIB += -ldl -lsocket -lnsl -lposix4 -lpthread
endif
ifeq ($(SYS),beos) ifeq ($(SYS),beos)
LIB += -lbe -lroot -lgame LIB += -lbe -lroot -lgame
else else
...@@ -83,7 +89,7 @@ LIB += -lm ...@@ -83,7 +89,7 @@ LIB += -lm
endif endif
# #
# C compiler flags: compilation # C compiler flags: mainstream compilation
# #
CFLAGS += $(DEFINE) $(INCLUDE) CFLAGS += $(DEFINE) $(INCLUDE)
CFLAGS += -Wall -Winline CFLAGS += -Wall -Winline
...@@ -130,7 +136,7 @@ ifneq (,$(findstring sparc,$(ARCH))) ...@@ -130,7 +136,7 @@ ifneq (,$(findstring sparc,$(ARCH)))
CFLAGS += -mhard-float CFLAGS += -mhard-float
endif endif
# /debug #end of optimisations
endif endif
# Optional MMX optimizations for x86 # Optional MMX optimizations for x86
...@@ -138,7 +144,12 @@ ifneq (,$(findstring mmx,$(ARCH))) ...@@ -138,7 +144,12 @@ ifneq (,$(findstring mmx,$(ARCH)))
CFLAGS += -DHAVE_MMX CFLAGS += -DHAVE_MMX
endif endif
# End of optimizations #
# C compiler flags: plugin compilation
#
ifneq (,$(findstring solaris,$(SYS)))
PCFLAGS += -fPIC
endif
# #
# C compiler flags: dependancies # C compiler flags: dependancies
...@@ -154,13 +165,13 @@ LCFLAGS += -Wall ...@@ -154,13 +165,13 @@ LCFLAGS += -Wall
#LCFLAGS += -s #LCFLAGS += -s
# #
# Additionnal debugging flags # Debugging and profiling support (unless optimisations are active)
# #
ifeq ($(DEBUG),1)
# Debugging and profiling support ifneq ($(OPTIMS),1)
ifneq ($(OPTIMS),0)
CFLAGS += -g CFLAGS += -g
endif endif
endif
################################################################################# #################################################################################
# Objects and files # Objects and files
...@@ -169,88 +180,91 @@ endif ...@@ -169,88 +180,91 @@ endif
# #
# C Objects # C Objects
# #
interface_obj = interface/main.o \ INTERFACE = src/interface/main.o \
interface/interface.o \ src/interface/interface.o \
interface/intf_msg.o \ src/interface/intf_msg.o \
interface/intf_cmd.o \ src/interface/intf_cmd.o \
interface/intf_ctrl.o \ src/interface/intf_ctrl.o \
interface/intf_console.o src/interface/intf_console.o
input_obj = input/input_ps.o \ INPUT = src/input/input_ps.o \
input/mpeg_system.o \ src/input/mpeg_system.o \
input/input_ext-dec.o \ src/input/input_ext-dec.o \
input/input.o src/input/input.o
audio_output_obj = audio_output/audio_output.o AUDIO_OUTPUT = src/audio_output/audio_output.o
video_output_obj = video_output/video_output.o \ VIDEO_OUTPUT = src/video_output/video_output.o \
video_output/video_text.o \ src/video_output/video_text.o \
video_output/video_spu.o \ src/video_output/video_spu.o \
video_output/video_yuv.o src/video_output/video_yuv.o
ac3_decoder_obj = ac3_decoder/ac3_decoder_thread.o \ AC3_DECODER = src/ac3_decoder/ac3_decoder_thread.o \
ac3_decoder/ac3_decoder.o \ src/ac3_decoder/ac3_decoder.o \
ac3_decoder/ac3_parse.o \ src/ac3_decoder/ac3_parse.o \
ac3_decoder/ac3_exponent.o \ src/ac3_decoder/ac3_exponent.o \
ac3_decoder/ac3_bit_allocate.o \ src/ac3_decoder/ac3_bit_allocate.o \
ac3_decoder/ac3_mantissa.o \ src/ac3_decoder/ac3_mantissa.o \
ac3_decoder/ac3_rematrix.o \ src/ac3_decoder/ac3_rematrix.o \
ac3_decoder/ac3_imdct.o \ src/ac3_decoder/ac3_imdct.o \
ac3_decoder/ac3_downmix.o src/ac3_decoder/ac3_downmix.o
lpcm_decoder_obj = lpcm_decoder/lpcm_decoder_thread.o \ LPCM_DECODER = src/lpcm_decoder/lpcm_decoder_thread.o \
lpcm_decoder/lpcm_decoder.o src/lpcm_decoder/lpcm_decoder.o
audio_decoder_obj = audio_decoder/audio_decoder_thread.o \ AUDIO_DECODER = src/audio_decoder/audio_decoder_thread.o \
audio_decoder/audio_decoder.o \ src/audio_decoder/audio_decoder.o \
audio_decoder/audio_math.o src/audio_decoder/audio_math.o
spu_decoder_obj = spu_decoder/spu_decoder.o SPU_DECODER = src/spu_decoder/spu_decoder.o
#??generic_decoder_obj = generic_decoder/generic_decoder.o #GEN_DECODER = src/generic_decoder/generic_decoder.o
# remeber to add it to OBJ
video_parser_obj = video_parser/video_parser.o \ VIDEO_PARSER = src/video_parser/video_parser.o \
video_parser/vpar_headers.o \ src/video_parser/vpar_headers.o \
video_parser/vpar_blocks.o \ src/video_parser/vpar_blocks.o \
video_parser/vpar_synchro.o \ src/video_parser/vpar_synchro.o \
video_parser/video_fifo.o src/video_parser/video_fifo.o
ifneq (,$(findstring mmx,$(ARCH))) ifneq (,$(findstring mmx,$(ARCH)))
vdec_motion_inner = video_decoder/vdec_motion_inner_mmx.o vdec_motion_inner = src/video_decoder/vdec_motion_inner_mmx.o
else else
vdec_motion_inner = video_decoder/vdec_motion_inner.o vdec_motion_inner = src/video_decoder/vdec_motion_inner.o
endif endif
video_decoder_obj = video_decoder/video_decoder.o \ VIDEO_DECODER = src/video_decoder/video_decoder.o \
video_decoder/vdec_motion.o \ src/video_decoder/vdec_motion.o \
video_decoder/vdec_idct.o \ src/video_decoder/vdec_idct.o \
$(vdec_motion_inner) $(vdec_motion_inner)
misc_obj = misc/mtime.o \ MISC = src/misc/mtime.o \
misc/tests.o \ src/misc/tests.o \
misc/rsc_files.o \ src/misc/rsc_files.o \
misc/netutils.o \ src/misc/netutils.o \
misc/playlist.o \ src/misc/playlist.o \
misc/plugins.o src/misc/plugins.o
C_OBJ = $(interface_obj) \ C_OBJ = $(INTERFACE) \
$(input_obj) \ $(INPUT) \
$(audio_output_obj) \ $(VIDEO_OUTPUT) \
$(video_output_obj) \ $(AUDIO_OUTPUT) \
$(ac3_decoder_obj) \ $(AC3_DECODER) \
$(lpcm_decoder_obj) \ $(LPCM_DECODER) \
$(audio_decoder_obj) \ $(AUDIO_DECODER) \
$(spu_decoder_obj) \ $(SPU_DEOCDER) \
$(generic_decoder_obj) \ $(GEN_DECODER) \
$(video_parser_obj) \ $(VIDEO_PARSER) \
$(video_decoder_obj) \ $(VIDEO_DECODER) \
$(vlan_obj) \ $(MISC)
$(misc_obj)
#
# CPP Objects
#
ifeq ($(SYS),beos) ifeq ($(SYS),beos)
CPP_OBJ = misc/beos_specific.o CPP_OBJ = src/misc/beos_specific.o
endif endif
# #
...@@ -258,16 +272,14 @@ endif ...@@ -258,16 +272,14 @@ endif
# #
ifneq (,$(findstring 86,$(ARCH))) ifneq (,$(findstring 86,$(ARCH)))
ifneq (,$(findstring mmx,$(ARCH))) ifneq (,$(findstring mmx,$(ARCH)))
ASM_OBJ = video_decoder/vdec_idctmmx.o \ ASM_OBJ = src/video_decoder/vdec_idctmmx.o \
video_output/video_yuv_mmx.o src/video_output/video_yuv_mmx.o
endif endif
endif endif
# #
# Plugins # Plugins
# #
PLUGINS := $(PLUGINS:%=lib/%.so)
PLUGIN_BEOS = plugins/beos/beos.o \ PLUGIN_BEOS = plugins/beos/beos.o \
plugins/beos/aout_beos.o \ plugins/beos/aout_beos.o \
plugins/beos/intf_beos.o \ plugins/beos/intf_beos.o \
...@@ -298,7 +310,6 @@ PLUGIN_SDL = plugins/sdl/sdl.o \ ...@@ -298,7 +310,6 @@ PLUGIN_SDL = plugins/sdl/sdl.o \
# plugins/sdl/video_yuv.o \ # plugins/sdl/video_yuv.o \
# plugins/sdl/video_yuvall.o # plugins/sdl/video_yuvall.o
PLUGIN_GLIDE = plugins/glide/glide.o \ PLUGIN_GLIDE = plugins/glide/glide.o \
plugins/glide/intf_glide.o \ plugins/glide/intf_glide.o \
plugins/glide/vout_glide.o plugins/glide/vout_glide.o
...@@ -314,7 +325,7 @@ PLUGIN_MGA = plugins/mga/mga.o \ ...@@ -314,7 +325,7 @@ PLUGIN_MGA = plugins/mga/mga.o \
plugins/mga/intf_mga.o \ plugins/mga/intf_mga.o \
plugins/mga/vout_mga.o plugins/mga/vout_mga.o
PLUGIN_X11 = plugins/x11/x11.o \ PLUGIN_X11= plugins/x11/x11.o \
plugins/x11/intf_x11.o \ plugins/x11/intf_x11.o \
plugins/x11/vout_x11.o plugins/x11/vout_x11.o
...@@ -326,7 +337,6 @@ PLUGIN_YUV = plugins/yuv/yuv.o \ ...@@ -326,7 +337,6 @@ PLUGIN_YUV = plugins/yuv/yuv.o \
plugins/yuv/video_yuv24.o \ plugins/yuv/video_yuv24.o \
plugins/yuv/video_yuv32.o plugins/yuv/video_yuv32.o
PLUGIN_YUVMMX = plugins/yuvmmx/yuvmmx.o \ PLUGIN_YUVMMX = plugins/yuvmmx/yuvmmx.o \
plugins/yuvmmx/video_yuv.o \ plugins/yuvmmx/video_yuv.o \
plugins/yuvmmx/video_yuv8.o \ plugins/yuvmmx/video_yuv8.o \
...@@ -338,18 +348,24 @@ PLUGIN_YUVMMX = plugins/yuvmmx/yuvmmx.o \ ...@@ -338,18 +348,24 @@ PLUGIN_YUVMMX = plugins/yuvmmx/yuvmmx.o \
PLUGIN_ALSA = plugins/alsa/alsa.o \ PLUGIN_ALSA = plugins/alsa/alsa.o \
plugins/alsa/aout_alsa.o plugins/alsa/aout_alsa.o
PLUGIN_OBJ = $(PLUGIN_BEOS) $(PLUGIN_DSP) $(PLUGIN_DUMMY) $(PLUGIN_ESD) \ STD_PLUGIN_OBJ =$(PLUGIN_BEOS) \
$(PLUGIN_FB) $(PLUGIN_GGI) $(PLUGIN_GLIDE) $(PLUGIN_GNOME) \ $(PLUGIN_DSP) \
$(PLUGIN_MGA) $(PLUGIN_X11) $(PLUGIN_YUV) $(PLUGIN_YUVMMX) \ $(PLUGIN_DUMMY) \
$(PLUGIN_SDL) $(PLUGIN_ALSA) $(PLUGIN_ESD) \
$(PLUGIN_FB) \
$(PLUGIN_GGI) \
$(PLUGIN_MGA) \
$(PLUGIN_X11) \
$(PLUGIN_YUV) \
$(PLUGIN_YUVMMX) \
$(PLUGIN_SDL) \
$(PLUGIN_ALSA)
# #
# Other lists of files # Other lists of files
# #
C_OBJ := $(C_OBJ:%.o=src/%.o) objects := $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) $(STD_PLUGIN_OBJ)
CPP_OBJ := $(CPP_OBJ:%.o=src/%.o) dependancies := $(objects:%.o=.dep/%.d)
ASM_OBJ := $(ASM_OBJ:%.o=src/%.o)
sources_c := $(C_OBJ:%.o=%.c)
dependancies := $(sources_c:%.c=.dep/%.d)
# All symbols must be exported # All symbols must be exported
export export
...@@ -379,7 +395,7 @@ distclean: clean ...@@ -379,7 +395,7 @@ distclean: clean
install: install:
mkdir -p $(prefix)/bin mkdir -p $(prefix)/bin
$(INSTALL) vlc $(prefix)/bin $(INSTALL) vlc $(prefix)/bin
# ugly # ugly
for alias in "" @ALIASES@ ; do if test $$alias ; then ln -s vlc $(prefix)/bin/$$alias ; fi ; done for alias in "" @ALIASES@ ; do if test $$alias ; then ln -s vlc $(prefix)/bin/$$alias ; fi ; done
mkdir -p $(prefix)/lib/videolan/vlc mkdir -p $(prefix)/lib/videolan/vlc
$(INSTALL) -m 644 $(PLUGINS) $(prefix)/lib/videolan/vlc $(INSTALL) -m 644 $(PLUGINS) $(prefix)/lib/videolan/vlc
...@@ -411,19 +427,9 @@ snapshot: ...@@ -411,19 +427,9 @@ snapshot:
mv /tmp/${SNAPSHOTDIR}.tar.bz2 .. mv /tmp/${SNAPSHOTDIR}.tar.bz2 ..
@echo "Sources are in ../${SNAPSHOTDIR}.tar.[gz,bz2]" @echo "Sources are in ../${SNAPSHOTDIR}.tar.[gz,bz2]"
FORCE: plugins: $(PLUGINS:%=lib/%.so)
# FORCE:
# Real targets
#
vlc: $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
ifeq ($(SYS),beos)
$(CC) $(CFLAGS) $(LCFLAGS) -Xlinker -soname=_APP_ -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
rm -f ./plugins/_APP_
ln -s ../vlc ./plugins/_APP_
else
$(CC) $(CFLAGS) $(LCFLAGS) --export-dynamic -rdynamic -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
endif
# #
# Gnome and Framebuffer aliases - don't add new aliases which could bloat # Gnome and Framebuffer aliases - don't add new aliases which could bloat
...@@ -432,7 +438,6 @@ endif ...@@ -432,7 +438,6 @@ endif
gvlc fbvlc: vlc gvlc fbvlc: vlc
rm -f $@ && ln -s vlc $@ rm -f $@ && ln -s vlc $@
plugins: $(PLUGINS)
# #
# Generic rules (see below) # Generic rules (see below)
...@@ -452,90 +457,84 @@ $(ASM_OBJ): %.o: Makefile.dep ...@@ -452,90 +457,84 @@ $(ASM_OBJ): %.o: Makefile.dep
$(ASM_OBJ): %.o: %.S $(ASM_OBJ): %.o: %.S
$(CC) $(CFLAGS) -c -o $@ $< $(CC) $(CFLAGS) -c -o $@ $<
#$(PLUGIN_OBJ): %.so: Makefile.dep $(STD_PLUGIN_OBJ): %.o: Makefile.dep
#$(PLUGIN_OBJ): %.so: .dep/%.d $(STD_PLUGIN_OBJ): %.o: .dep/%.d
$(STD_PLUGIN_OBJ): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
$(PLUGIN_GNOME): %.o: Makefile.dep
$(PLUGIN_GNOME): %.o: %.c
$(CC) $(CFLAGS) `gnome-config --cflags gnomeui` -c -o $@ $<
$(PLUGIN_GLIDE): %.o: Makefile.dep
$(PLUGIN_GLIDE): %.o: %.c
$(CC) $(CFLAGS) -I/usr/include/glide -c -o $@ $<
#
# Real targets
#
vlc: $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
ifeq ($(SYS),beos)
$(CC) $(CFLAGS) $(LCFLAGS) -Xlinker -soname=_APP_ -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
rm -f ./plugins/_APP_
ln -s ../vlc ./plugins/_APP_
else
$(CC) $(CFLAGS) $(LCFLAGS) --export-dynamic -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
endif
lib/beos.so: $(PLUGIN_BEOS) lib/beos.so: $(PLUGIN_BEOS)
$(CC) $(CFLAGS) $(LCFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_ $(CC) $(CFLAGS) $(LCFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
$(PLUGIN_BEOS): %.o: %.cpp
$(CC) $(CFLAGS) -c -o $@ $<
lib/esd.so: $(PLUGIN_ESD) lib/esd.so: $(PLUGIN_ESD)
ifneq (,$(findstring bsd,$(SYS))) ifneq (,$(findstring bsd,$(SYS)))
ld -shared -lesd -o $@ $^ $(CC) -shared -lesd -o $@ $^
else else
ld -shared -laudiofile -lesd -o $@ $^ $(CC) -shared -laudiofile -lesd -o $@ $^
endif endif
$(PLUGIN_ESD): %.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
lib/dsp.so: $(PLUGIN_DSP) lib/dsp.so: $(PLUGIN_DSP)
ld -shared -o $@ $^ $(CC) -shared -o $@ $^
$(PLUGIN_DSP): %.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
lib/alsa.so: $(PLUGIN_ALSA) lib/alsa.so: $(PLUGIN_ALSA)
ld -shared -o $@ $^ $(CC) -shared -o $@ $^
$(PLUGIN_ALSA): %.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
lib/dummy.so: $(PLUGIN_DUMMY) lib/dummy.so: $(PLUGIN_DUMMY)
ld -shared -o $@ $^ $(CC) -shared -o $@ $^
$(PLUGIN_DUMMY): %.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
lib/fb.so: $(PLUGIN_FB) lib/fb.so: $(PLUGIN_FB)
ld -shared -o $@ $^ $(CC) -shared -o $@ $^
$(PLUGIN_FB): %.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
lib/x11.so: $(PLUGIN_X11) lib/x11.so: $(PLUGIN_X11)
ld -shared -L/usr/X11R6/lib -lX11 -lXext -o $@ $^ $(CC) -shared -L/usr/X11R6/lib -lX11 -lXext -o $@ $^
$(PLUGIN_X11): %.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
lib/mga.so: $(PLUGIN_MGA) lib/mga.so: $(PLUGIN_MGA)
ld -shared -L/usr/X11R6/lib -lX11 -lXext -o $@ $^ $(CC) -shared -L/usr/X11R6/lib -lX11 -lXext -o $@ $^
$(PLUGIN_MGA): %.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
lib/gnome.so: $(PLUGIN_GNOME) lib/gnome.so: $(PLUGIN_GNOME)
ld -shared `gnome-config --libs gnomeui | sed 's,-rdynamic,,'` -o $@ $^ $(CC) -shared `gnome-config --libs gnomeui | sed 's,-rdynamic,,'` -o $@ $^
$(PLUGIN_GNOME): %.o: %.c
$(CC) $(CFLAGS) `gnome-config --cflags gnomeui` -c -o $@ $<
lib/glide.so: $(PLUGIN_GLIDE) lib/glide.so: $(PLUGIN_GLIDE)
ld -shared -lglide2x -o $@ $^ $(CC) -shared -lglide2x -o $@ $^
$(PLUGIN_GLIDE): %.o: %.c
$(CC) $(CFLAGS) -I/usr/include/glide -c -o $@ $<
lib/ggi.so: $(PLUGIN_GGI) lib/ggi.so: $(PLUGIN_GGI)
ld -shared -lggi -o $@ $^ $(CC) -shared -lggi -o $@ $^
$(PLUGIN_GGI): %.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
lib/sdl.so: $(PLUGIN_SDL) lib/sdl.so: $(PLUGIN_SDL)
ld -shared -lSDL -o $@ $^ $(CC) -shared -lSDL -o $@ $^
$(PLUGIN_SDL): %.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
lib/yuv.so: $(PLUGIN_YUV) lib/yuv.so: $(PLUGIN_YUV)
ifeq ($(SYS),beos) ifeq ($(SYS),beos)
$(CC) $(CFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_ $(CC) $(CFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
else else
ld -shared -o $@ $^ $(CC) -shared -o $@ $^
endif endif
$(PLUGIN_YUV): %.o: %.c
$(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
lib/yuvmmx.so: $(PLUGIN_YUVMMX) lib/yuvmmx.so: $(PLUGIN_YUVMMX)
ifeq ($(SYS),beos) ifeq ($(SYS),beos)
$(CC) $(CFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_ $(CC) $(CFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
else else
ld -shared -o $@ $^ $(CC) $(LCFLAGS) -shared -o $@ $^
endif endif
$(PLUGIN_YUVMMX): %.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
################################################################################ ################################################################################
# Note on generic rules and dependancies # Note on generic rules and dependancies
......
configure
View file @ 53c2e3ac
...@@ -2605,7 +2605,7 @@ fi ...@@ -2605,7 +2605,7 @@ fi
for ac_hdr in fcntl.h sys/ioctl.h sys/time.h unistd.h for ac_hdr in getopt.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
...@@ -2645,7 +2645,7 @@ else ...@@ -2645,7 +2645,7 @@ else
fi fi
done done
for ac_hdr in sys/soundcard.h machine/soundcard.h for ac_hdr in sys/sockio.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
...@@ -2685,7 +2685,7 @@ else ...@@ -2685,7 +2685,7 @@ else
fi fi
done done
for ac_hdr in dlfcn.h image.h for ac_hdr in fcntl.h sys/ioctl.h sys/time.h unistd.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
...@@ -2725,7 +2725,7 @@ else ...@@ -2725,7 +2725,7 @@ else
fi fi
done done
for ac_hdr in arpa/inet.h net/if.h netinet/in.h sys/socket.h for ac_hdr in sys/soundcard.h machine/soundcard.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
...@@ -2765,22 +2765,102 @@ else ...@@ -2765,22 +2765,102 @@ else
fi fi
done done
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:2773: 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
#line 2778 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2783: \"$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*
eval "ac_cv_header_$ac_safe=yes"
else
echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1
EOF
else
echo "$ac_t""no" 1>&6
fi
done
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:2813: 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
#line 2818 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2823: \"$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*
eval "ac_cv_header_$ac_safe=yes"
else
echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1
EOF
else
echo "$ac_t""no" 1>&6
fi
done
for ac_hdr in cthreads.h pthread.h kernel/scheduler.h kernel/OS.h for ac_hdr in cthreads.h pthread.h kernel/scheduler.h kernel/OS.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2774: checking for $ac_hdr" >&5 echo "configure:2854: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2779 "configure" #line 2859 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2808,12 +2888,12 @@ done ...@@ -2808,12 +2888,12 @@ done
echo $ac_n "checking for working const""... $ac_c" 1>&6 echo $ac_n "checking for working const""... $ac_c" 1>&6
echo "configure:2812: checking for working const" >&5 echo "configure:2892: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2817 "configure" #line 2897 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
...@@ -2862,7 +2942,7 @@ ccp = (char const *const *) p; ...@@ -2862,7 +2942,7 @@ ccp = (char const *const *) p;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_cv_c_const=yes ac_cv_c_const=yes
else else
...@@ -2883,12 +2963,12 @@ EOF ...@@ -2883,12 +2963,12 @@ EOF
fi fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
echo "configure:2887: checking for ANSI C header files" >&5 echo "configure:2967: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2892 "configure" #line 2972 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
...@@ -2896,7 +2976,7 @@ else ...@@ -2896,7 +2976,7 @@ else
#include <float.h> #include <float.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2913,7 +2993,7 @@ rm -f conftest* ...@@ -2913,7 +2993,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI. # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2917 "configure" #line 2997 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <string.h> #include <string.h>
EOF EOF
...@@ -2931,7 +3011,7 @@ fi ...@@ -2931,7 +3011,7 @@ fi
if test $ac_cv_header_stdc = yes; then if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2935 "configure" #line 3015 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
EOF EOF
...@@ -2952,7 +3032,7 @@ if test "$cross_compiling" = yes; then ...@@ -2952,7 +3032,7 @@ if test "$cross_compiling" = yes; then
: :
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2956 "configure" #line 3036 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
...@@ -2963,7 +3043,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); ...@@ -2963,7 +3043,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); } exit (0); }
EOF EOF
if { (eval echo configure:2967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:3047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
: :
else else
...@@ -2987,12 +3067,12 @@ EOF ...@@ -2987,12 +3067,12 @@ EOF
fi fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6 echo $ac_n "checking for size_t""... $ac_c" 1>&6
echo "configure:2991: checking for size_t" >&5 echo "configure:3071: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2996 "configure" #line 3076 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#if STDC_HEADERS #if STDC_HEADERS
...@@ -3020,12 +3100,12 @@ EOF ...@@ -3020,12 +3100,12 @@ EOF
fi fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
echo "configure:3024: checking whether time.h and sys/time.h may both be included" >&5 echo "configure:3104: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3029 "configure" #line 3109 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h> #include <sys/time.h>
...@@ -3034,7 +3114,7 @@ int main() { ...@@ -3034,7 +3114,7 @@ int main() {
struct tm *tp; struct tm *tp;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3038: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_cv_header_time=yes ac_cv_header_time=yes
else else
...@@ -3164,17 +3244,17 @@ if test "${enable_alsa+set}" = set; then ...@@ -3164,17 +3244,17 @@ if test "${enable_alsa+set}" = set; then
enableval="$enable_alsa" enableval="$enable_alsa"
if test x$enable_alsa = xyes; then ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'` if test x$enable_alsa = xyes; then ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6 echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6
echo "configure:3168: checking for sys/asoundlib.h" >&5 echo "configure:3248: checking for sys/asoundlib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3173 "configure" #line 3253 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/asoundlib.h> #include <sys/asoundlib.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3191,7 +3271,7 @@ fi ...@@ -3191,7 +3271,7 @@ fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6 echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
echo "configure:3195: checking for main in -lasound" >&5 echo "configure:3275: checking for main in -lasound" >&5
ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'` ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -3199,14 +3279,14 @@ else ...@@ -3199,14 +3279,14 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lasound $LIBS" LIBS="-lasound $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3203 "configure" #line 3283 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
main() main()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
......
configure.in
View file @ 53c2e3ac
...@@ -49,6 +49,8 @@ dnl check for getopt_long, substitute the distributed versions if not ...@@ -49,6 +49,8 @@ dnl check for getopt_long, substitute the distributed versions if not
AC_CHECK_FUNC(getopt_long,,[LIBOBJS="$LIBOBJS getopt.o getopt1.o"]) AC_CHECK_FUNC(getopt_long,,[LIBOBJS="$LIBOBJS getopt.o getopt1.o"])
AC_SUBST(LIBOBJS) AC_SUBST(LIBOBJS)
AC_CHECK_HEADERS(getopt.h)
AC_CHECK_HEADERS(sys/sockio.h)
AC_CHECK_HEADERS(fcntl.h sys/ioctl.h sys/time.h unistd.h) AC_CHECK_HEADERS(fcntl.h sys/ioctl.h sys/time.h unistd.h)
AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h) AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h)
AC_CHECK_HEADERS(dlfcn.h image.h) AC_CHECK_HEADERS(dlfcn.h image.h)
......
include/defs.h.in
View file @ 53c2e3ac
...@@ -67,6 +67,9 @@ ...@@ -67,6 +67,9 @@
/* Define if you have the <fcntl.h> header file. */ /* Define if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H #undef HAVE_FCNTL_H
/* Define if you have the <getopt.h> header file. */
#undef HAVE_GETOPT_H
/* Define if you have the <image.h> header file. */ /* Define if you have the <image.h> header file. */
#undef HAVE_IMAGE_H #undef HAVE_IMAGE_H
...@@ -94,6 +97,9 @@ ...@@ -94,6 +97,9 @@
/* Define if you have the <sys/socket.h> header file. */ /* Define if you have the <sys/socket.h> header file. */
#undef HAVE_SYS_SOCKET_H #undef HAVE_SYS_SOCKET_H
/* Define if you have the <sys/sockio.h> header file. */
#undef HAVE_SYS_SOCKIO_H
/* Define if you have the <sys/soundcard.h> header file. */ /* Define if you have the <sys/soundcard.h> header file. */
#undef HAVE_SYS_SOUNDCARD_H #undef HAVE_SYS_SOUNDCARD_H
......
src/interface/intf_ctrl.c
View file @ 53c2e3ac
...@@ -458,14 +458,15 @@ static int SelectPID( int i_argc, intf_arg_t *p_argv ) ...@@ -458,14 +458,15 @@ static int SelectPID( int i_argc, intf_arg_t *p_argv )
*****************************************************************************/ *****************************************************************************/
static int SpawnInput( int i_argc, intf_arg_t *p_argv ) static int SpawnInput( int i_argc, intf_arg_t *p_argv )
{ {
/* FIXME */
#if 0
int i_arg; int i_arg;
int i_method = 0; /* method parameter */ int i_method = 0; /* method parameter */
char * p_source = NULL; /* source parameter */ char * p_source = NULL; /* source parameter */
int i_port = 0; /* port parameter */ int i_port = 0; /* port parameter */
int i_vlan = 0; /* vlan parameter */ int i_vlan = 0; /* vlan parameter */
/* FIXME */
#if 0
/* Parse parameters - see command list above */ /* Parse parameters - see command list above */
for ( i_arg = 1; i_arg < i_argc; i_arg++ ) for ( i_arg = 1; i_arg < i_argc; i_arg++ )
{ {
......
src/interface/main.c
View file @ 53c2e3ac
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <signal.h> /* SIGHUP, SIGINT, SIGKILL */ #include <signal.h> /* SIGHUP, SIGINT, SIGKILL */
#include <stdio.h> /* sprintf() */ #include <stdio.h> /* sprintf() */
#ifdef HAVE_LIBGNUGETOPT #ifdef HAVE_GETOPT_H
#include <getopt.h> /* getopt() */ #include <getopt.h> /* getopt() */
#endif #endif
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
#define LONG_HELP 2 #define LONG_HELP 2
/* Long options */ /* Long options */
#ifdef HAVE_LIBGNUGETOPT #ifdef HAVE_GETOPT_H
static const struct option longopts[] = static const struct option longopts[] =
{ {
/* name, has_arg, flag, val */ /* name, has_arg, flag, val */
...@@ -471,7 +471,7 @@ static int GetConfiguration( int i_argc, char *ppsz_argv[], char *ppsz_env[] ) ...@@ -471,7 +471,7 @@ static int GetConfiguration( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
} }
/* Parse command line options */ /* Parse command line options */
#ifdef HAVE_LIBGNUGETOPT #ifdef HAVE_GETOPT_H
opterr = 0; opterr = 0;
while( ( c = getopt_long( i_argc, ppsz_argv, psz_shortopts, longopts, 0 ) ) != EOF ) while( ( c = getopt_long( i_argc, ppsz_argv, psz_shortopts, longopts, 0 ) ) != EOF )
{ {
......
src/misc/netutils.c
View file @ 53c2e3ac
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Benoit Steiner <benny@via.ecp.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -46,9 +47,9 @@ ...@@ -46,9 +47,9 @@
#if defined (HAVE_NET_IF_H) #if defined (HAVE_NET_IF_H)
#include <net/if.h> /* interface (arch-dependent) */ #include <net/if.h> /* interface (arch-dependent) */
#endif #endif
//#ifdef HAVE_SYS_SOCKIO_H #ifdef HAVE_SYS_SOCKIO_H
#include <sys/sockio.h> #include <sys/sockio.h>
//#endif #endif
#include "config.h" #include "config.h"
#include "common.h" #include "common.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment