N: Jon Lech Johansen
E: jon-vl@nanocrew.net
+C: jlj
D: PS input fixes
D: Win32 DVD input port
D: QNX RTOS plug-in
BUILTIN_OBJ := $(shell for i in $(BUILTINS) ; do echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.*/\('$$i'\) .*@plugins/\1.a@' -e 's@^ .*@@' ; done)
endif
+#
+# Misc variables
+#
+VLC_QUICKVERSION := $(shell grep 'VLC_VERSION=' configure.in | cut -f2 -d=)
+LIBDVDCSS_QUICKVERSION := $(shell grep 'LIBDVDCSS_VERSION=' configure.in | cut -f2 -d=)
+
+
# All symbols must be exported
export
#
# Virtual targets
#
-all: Makefile.opts vlc ${ALIASES} plugins vlc.app
+all: Makefile.opts vlc ${ALIASES} vlc.app
Makefile.opts:
@echo "**** No configuration found, running ./configure..."
./configure
- $(MAKE) all
- exit
+# Include Makefile.opts again in case we just generated it
+ifneq (1,$(HAVE_MAKEFILE_OPTS))
+ -include Makefile.opts
+endif
+
+show:
+ @echo CC: $(CC)
+ @echo CFLAGS: $(CFLAGS)
+ @echo DCFLAGS: $(DCFLAGS)
+ @echo LCFLAGS: $(LCFLAGS)
+ @echo C_OBJ: $(C_OBJ)
+ @echo CPP_OBJ: $(CPP_OBJ)
+ @echo PLUGIN_OBJ: $(PLUGIN_OBJ)
+ @echo BUILTIN_OBJ: $(BUILTIN_OBJ)
+
+#
+# Cleaning rules
+#
clean: libdvdcss-clean plugins-clean vlc-clean
rm -f src/*/*.o extras/*/*.o
- rm -f lib/*.so lib/*.so.* lib/*.a
- rm -f plugins/*.so plugins/*.so.* plugins/*.a
+ rm -f lib/*.so* lib/*.a
+ rm -f plugins/*.so plugins/*.a
libdvdcss-clean:
- cd extras/libdvdcss && $(MAKE) clean
+ -cd extras/libdvdcss && $(MAKE) clean
plugins-clean:
for dir in $(PLUGINS_DIR) ; do \
rm -Rf .dep
rm -f .gdb_history
+#
+# Install/uninstall rules
+#
install: libdvdcss-install vlc-install plugins-install
uninstall: libdvdcss-uninstall vlc-uninstall plugins-uninstall
endif
plugins-uninstall:
-ifneq (,$(PLUGINS))
rm -f $(DESTDIR)$(libdir)/videolan/vlc/*.so
-endif
libdvdcss-install:
- cd extras/libdvdcss && $(MAKE) install
+ -cd extras/libdvdcss && $(MAKE) install
libdvdcss-uninstall:
- cd extras/libdvdcss && $(MAKE) uninstall
+ -cd extras/libdvdcss && $(MAKE) uninstall
-show:
- @echo CC: $(CC)
- @echo CFLAGS: $(CFLAGS)
- @echo DCFLAGS: $(DCFLAGS)
- @echo LCFLAGS: $(LCFLAGS)
- @echo C_OBJ: $(C_OBJ)
- @echo CPP_OBJ: $(CPP_OBJ)
- @echo objects: $(objects)
- @echo cppobjects: $(cppobjects)
- @echo PLUGIN_OBJ: $(PLUGIN_OBJ)
- @echo BUILTIN_OBJ: $(BUILTIN_OBJ)
-
-
-# ugliest of all, but I have no time to do it -- sam
-snapshot: clean Makefile.opts
- rm -Rf /tmp/vlc-${PROGRAM_VERSION}* /tmp/vlc-${PROGRAM_VERSION}nocss*
- # copy archive in /tmp
+#
+# Package generation rules
+#
+snapshot-common: clean
+ rm -Rf /tmp/vlc
+ # Copy directory structure in /tmp
find -type d | grep -v CVS | grep -v '\.dep' | while read i ; \
- do mkdir -p /tmp/vlc-${PROGRAM_VERSION}/$$i ; \
+ do mkdir -p /tmp/vlc/$$i ; \
done
find debian -mindepth 1 -maxdepth 1 -type d | \
- while read i ; do rm -Rf /tmp/vlc-${PROGRAM_VERSION}/$$i ; done
- # .c .h .in .cpp .glade
+ while read i ; do rm -Rf /tmp/vlc/$$i ; done
+ # Copy .c .h .in .cpp and .glade files
find include src plugins -type f -name '*.[chig]*' | while read i ; \
- do cp $$i /tmp/vlc-${PROGRAM_VERSION}/$$i ; done
- # Makefiles
- find . plugins -type f -name Makefile | while read i ; \
- do cp $$i /tmp/vlc-${PROGRAM_VERSION}/$$i ; done
- # extra files
- cp -a extras/* /tmp/vlc-${PROGRAM_VERSION}/extras
- cp -a doc/* /tmp/vlc-${PROGRAM_VERSION}/doc
- find /tmp/vlc-${PROGRAM_VERSION}/extras \
- /tmp/vlc-${PROGRAM_VERSION}/doc \
- -type d -name CVS | while read i ; \
- do rm -Rf $$i ; \
- done
- # copy misc files
- cp vlc.spec AUTHORS COPYING ChangeLog INSTALL INSTALL.libdvdcss \
- INSTALL-win32.txt README TODO todo.pl \
- Makefile.opts.in Makefile.dep Makefile.modules \
+ do cp $$i /tmp/vlc/$$i ; done
+ # Copy plugin Makefiles
+ find plugins -type f -name Makefile | while read i ; \
+ do cp $$i /tmp/vlc/$$i ; done
+ # Copy extra programs and documentation
+ cp -a extras/* /tmp/vlc/extras
+ cp -a doc/* /tmp/vlc/doc
+ find /tmp/vlc/extras /tmp/vlc/doc \
+ -type d -name CVS -o -type f -name '.*' | while read i ; \
+ do rm -Rf $$i ; done
+ # Copy misc files
+ cp vlc.spec AUTHORS COPYING TODO todo.pl ChangeLog README* INSTALL* \
+ Makefile Makefile.opts.in Makefile.dep Makefile.modules \
configure configure.in install-sh config.sub config.guess \
- /tmp/vlc-${PROGRAM_VERSION}/
- for file in control control-css vlc-gtk.menu vlc.copyright vlc.docs \
- changelog changelog-css rules rules-css vlc.dirs vlc.desktop \
- gvlc.desktop gnome-vlc.desktop vlc.menu ; do \
- cp debian/$$file /tmp/vlc-${PROGRAM_VERSION}/debian/ ; \
- done
- for file in default8x16.psf default8x9.psf vlc_beos.rsrc vlc.icns \
- gvlc_win32.ico vlc_win32_rc.rc ; do \
- cp share/$$file /tmp/vlc-${PROGRAM_VERSION}/share/ ; \
- done
- for icon in vlc gvlc qvlc gnome-vlc kvlc ; do \
- cp share/$$icon.xpm share/$$icon.png \
- /tmp/vlc-${PROGRAM_VERSION}/share/ ; done
-
- # build css-enabled archives
- (cd /tmp ; tar cf vlc-${PROGRAM_VERSION}.tar vlc-${PROGRAM_VERSION} ; \
- bzip2 -f -9 < vlc-${PROGRAM_VERSION}.tar \
- > vlc-${PROGRAM_VERSION}.tar.bz2 ; \
- gzip -f -9 vlc-${PROGRAM_VERSION}.tar )
- mv /tmp/vlc-${PROGRAM_VERSION}.tar.gz \
- /tmp/vlc-${PROGRAM_VERSION}.tar.bz2 ..
-
- # clean up
- rm -Rf /tmp/vlc-${PROGRAM_VERSION}*
-
-libdvdcss-snapshot: clean Makefile.opts
- rm -Rf /tmp/libdvdcss-${LIBDVDCSS_VERSION}* \
- /tmp/libdvdcss-${LIBDVDCSS_VERSION}nocss*
- # copy archive in /tmp
- find include extras doc lib -type d | grep -v CVS | grep -v '\.dep' | \
- while read i ; do \
- mkdir -p /tmp/libdvdcss-${LIBDVDCSS_VERSION}/$$i ; \
- done
- # .c .h .in .cpp .glade
- find include extras -type f -name '*.[chig]*' | while read i ; \
- do cp $$i /tmp/libdvdcss-${LIBDVDCSS_VERSION}/$$i ; done
- # Makefiles
+ /tmp/vlc/
+ # Copy Debian control files
+ for file in debian/*dirs debian/*menu debian/*desktop ; do \
+ cp $$file /tmp/vlc/debian ; done
+ for file in control changelog rules vlc.copyright vlc.docs ; do \
+ cp debian/$$file /tmp/vlc/debian/ ; done
+ # Copy fonts and icons
+ for file in share/*png share/*xpm share/*psf ; do \
+ cp $$file /tmp/vlc/share ; done
+ for file in vlc_beos.rsrc vlc.icns gvlc_win32.ico vlc_win32_rc.rc ; do \
+ cp share/$$file /tmp/vlc/share/ ; done
+
+snapshot: snapshot-common
+ # Build archives and clean up
+ F=vlc-${VLC_QUICKVERSION}; \
+ rm -Rf /tmp/$$F ; mv /tmp/vlc /tmp/$$F; \
+ (cd /tmp ; tar cf $$F.tar $$F ; bzip2 -f -9 < $$F.tar > $$F.tar.bz2; \
+ gzip -f -9 $$F.tar ); mv /tmp/$$F.tar.gz /tmp/$$F.tar.bz2 ..; \
+ rm -Rf /tmp/$$F
+
+snapshot-nocss: snapshot-common
+ # Remove libdvdcss
+ rm -Rf /tmp/vlc/extras/libdvdcss
+ rm -f /tmp/vlc/*.libdvdcss
+ # Fix debian information
+ rm -f /tmp/vlc/debian/libdvdcss*
+ rm -f /tmp/vlc/debian/control
+ sed -e 's#^ DVDs# unencrypted DVDs#' < debian/control \
+ | awk '{if(gsub("Package: libdvdcss",$$0))a=1;if(a==0)print $$0;if(a==1&&$$0=="")a=0}' \
+ > /tmp/vlc/debian/control
+ rm -f /tmp/vlc/debian/rules
+ sed -e 's#^\(export LIBDVDCSS_FLAGS=\).*#\1"--without-dvdcss"#' < debian/rules \
+ | awk '{if($$0=="# libdvdcss start")a=1;if(a==0)print $$0;if($$0=="# libdvdcss stop")a=0}' \
+ > /tmp/vlc/debian/rules
+ chmod +x /tmp/vlc/debian/rules
+ # Build css-disabled archives and clean up
+ F=vlc-${VLC_QUICKVERSION}; G=vlc-${VLC_QUICKVERSION}-nocss; \
+ rm -Rf /tmp/$$F ; mv /tmp/vlc /tmp/$$F; \
+ (cd /tmp ; tar cf $$G.tar $$F ; bzip2 -f -9 < $$G.tar > $$G.tar.bz2; \
+ gzip -f -9 $$G.tar ); mv /tmp/$$G.tar.gz /tmp/$$G.tar.bz2 ..; \
+ rm -Rf /tmp/$$F
+
+libdvdcss-snapshot: snapshot-common
+ # Remove vlc sources and icons, doc, debian directory...
+ rm -Rf /tmp/vlc/src /tmp/vlc/share /tmp/vlc/plugins /tmp/vlc/doc
+ rm -Rf /tmp/vlc/extras/GNUgetopt /tmp/vlc/extras/MacOSX_app
+ rm -Rf /tmp/vlc/debian
+ # Remove useless headers
+ rm -f /tmp/vlc/include/*
+ for file in defs.h.in config.h.in common.h int_types.h ; \
+ do cp include/$$file /tmp/vlc/include/ ; done
+ # Remove misc files (??? - maybe not really needed)
+ rm -f /tmp/vlc/vlc.spec /tmp/vlc/INSTALL-win32.txt
+ mv /tmp/vlc/INSTALL.libdvdcss /tmp/vlc/INSTALL
+ mv /tmp/vlc/README.libdvdcss /tmp/vlc/README
+ # Fix Makefile
+ rm -f /tmp/vlc/Makefile
sed -e 's#^install:#install-unused:#' \
-e 's#^uninstall:#uninstall-unused:#' \
-e 's#^clean:#clean-unused:#' \
-e 's#^libdvdcss-install:#install:#' \
-e 's#^libdvdcss-uninstall:#uninstall:#' \
-e 's#^libdvdcss-clean:#clean:#' \
- < Makefile > /tmp/libdvdcss-${LIBDVDCSS_VERSION}/Makefile
- # extra files
- cp -a extras/* /tmp/libdvdcss-${LIBDVDCSS_VERSION}/extras
- cp -a doc/* /tmp/libdvdcss-${LIBDVDCSS_VERSION}/doc
- find /tmp/libdvdcss-${LIBDVDCSS_VERSION}/extras \
- /tmp/libdvdcss-${LIBDVDCSS_VERSION}/doc \
- -type d -name CVS | while read i ; \
- do rm -Rf $$i ; \
- done
- # copy misc files
- cp AUTHORS COPYING ChangeLog INSTALL INSTALL.libdvdcss README \
- TODO todo.pl Makefile.opts.in Makefile.dep Makefile.modules \
- configure configure.in install-sh config.sub config.guess \
- /tmp/libdvdcss-${LIBDVDCSS_VERSION}/
+ < Makefile > /tmp/vlc/Makefile
+ # Build archives and clean up
+ F=libdvdcss-${LIBDVDCSS_QUICKVERSION}; \
+ rm -Rf /tmp/$$F ; mv /tmp/vlc /tmp/$$F; \
+ (cd /tmp ; tar cf $$F.tar $$F ; bzip2 -f -9 < $$F.tar > $$F.tar.bz2; \
+ gzip -f -9 $$F.tar ); mv /tmp/$$F.tar.gz /tmp/$$F.tar.bz2 ..; \
+ rm -Rf /tmp/$$F
- # build css-enabled archives
- (cd /tmp ; tar cf libdvdcss-${LIBDVDCSS_VERSION}.tar \
- libdvdcss-${LIBDVDCSS_VERSION} ; \
- bzip2 -f -9 < libdvdcss-${LIBDVDCSS_VERSION}.tar \
- > libdvdcss-${LIBDVDCSS_VERSION}.tar.bz2 ; \
- gzip -f -9 libdvdcss-${LIBDVDCSS_VERSION}.tar )
- mv /tmp/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz \
- /tmp/libdvdcss-${LIBDVDCSS_VERSION}.tar.bz2 ..
+deb:
+ dpkg-buildpackage -rfakeroot -us -uc
- # clean up
- rm -Rf /tmp/libdvdcss-${LIBDVDCSS_VERSION}*
+#
+# Gtk/Gnome/* aliases and OS X application
+#
+gnome-vlc gvlc kvlc qvlc: vlc
+ rm -f $@ && ln -s vlc $@
.PHONY: vlc.app
vlc.app: Makefile.opts
FORCE:
-#
-# GTK/Gnome aliases - don't add too many aliases which could bloat
-# the namespace
-#
-gnome-vlc gvlc kvlc qvlc: vlc
- rm -f $@ && ln -s vlc $@
-
#
# Generic rules (see below)
#
echo "int module_"$$i"_ActivateModule( module_t* );" >> $@ ; \
echo "int module_"$$i"_DeactivateModule( module_t* );" >> $@ ; \
done
-endif
-ifneq (,$(BUILTINS))
echo "" >> $@ ;
printf "#define ALLOCATE_ALL_BUILTINS() do { " >> $@ ;
for i in $(BUILTINS) ; do \
printf "ALLOCATE_BUILTIN("$$i"); " >> $@ ; \
done
echo "} while( 0 );" >> $@ ;
-endif
echo "" >> $@ ;
+endif
$(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile
$(C_OBJ): %.o: .dep/%.d
#
# Main application target
#
-vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ)
+vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ) plugins
$(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ) $(LCFLAGS)
ifeq ($(SYS),beos)
xres -o $@ ./share/vlc_beos.rsrc
#
plugins: Makefile.modules Makefile.opts Makefile.dep Makefile $(PLUGIN_OBJ)
$(PLUGIN_OBJ): FORCE
- cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.so=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:%=../../%)
+ cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.so=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:plugins/%=../%)
#
# Built-in modules target
#
builtins: Makefile.modules Makefile.opts Makefile.dep Makefile $(BUILTIN_OBJ)
$(BUILTIN_OBJ): FORCE
- cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:%=../../%)
+ cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:plugins/%=../%)
#
# libdvdcss target
# (c)1998 VideoLAN
###############################################################################
+HAVE_MAKEFILE_OPTS = 1
+
###############################################################################
# Configuration
###############################################################################
#
# Other special cases
#
+OBJ_DVD = @OBJ_DVD@
LOCAL_LIBDVDCSS = @LOCAL_LIBDVDCSS@
###############################################################################
--- /dev/null
+README for libdvdcss, a portable abstraction library for DVD decryption
+
+
+Introduction
+============
+
+libdvdcss is part of the VideoLAN project, a full MPEG2 client/server
+solution. The VideoLAN Client can also be used as a standalone program
+to play MPEG2 streams from a hard disk or a DVD.
+
+
+Building, Installing and Running libdvdcss
+==========================================
+
+See the INSTALL or INSTALL.libdvdcss file for this.
+
+
+Troubleshooting
+===============
+
+A mailing-list has been set up for support and discussion about vlc and
+libdvdcss. Its address is :
+
+ <vlc@videolan.org>
+
+To subscribe, send a mail to <listar@videolan.org> with the following
+words in the mail body :
+
+ subscribe vlc
+
+To unsubscribe, do the same with the words :
+
+ unsubscribe vlc
+
+
+When reporting bugs, try to be as precise as possible (which OS, which
+distribution, what plugins you were trying, and so on).
+
+
+Resources
+=========
+
+The VideoLAN web site at http://www.videolan.org/ is a good start for
+information about MPEG and DVD playing. Have a look at the documentation
+section, as well as the bookmarks.
+
ac_help="$ac_help
--enable-pth Enable GNU Pth support (default disabled)"
ac_help="$ac_help
- --with-dvdcss[=name] way to use libdvdcss, either local-static, local-shared or a path to another libdvdcss such as /usr/local (default local-static)"
-ac_help="$ac_help
- --disable-css Disable DVD CSS decryption (default enabled)"
+ --with-dvdcss[=name] way to use libdvdcss, either 'yes' or 'no', or 'local-static', 'local-shared', or a path to another libdvdcss such as '/usr/local' (default 'local-static')"
ac_help="$ac_help
--disable-dummy dummy module (default enabled)"
ac_help="$ac_help
# A filename unique to this package, relative to the directory that
# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=include/main.h
+ac_unique_file=include/common.h
# Find the source files, if location was not specified.
if test -z "$srcdir"; then
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:617: checking host system type" >&5
+echo "configure:615: checking host system type" >&5
host_alias=$host
case "$host_alias" in
echo "$ac_t""$host" 1>&6
-VLC_VERSION=0.2.81
-
-LIBDVDCSS_VERSION=0.0.2
-
-VLC_CODENAME=Ourumov
+HAVE_VLC=0
+if test -r src/interface/main.c; then
+ HAVE_VLC=1
+ VLC_VERSION=0.2.81
+
+ VLC_CODENAME=Ourumov
+
+fi
+HAVE_LIBDVDCSS=0
+if test -r extras/libdvdcss/libdvdcss.c; then
+ HAVE_LIBDVDCSS=1
+ LIBDVDCSS_VERSION=0.0.2
+
+fi
save_CFLAGS="${CFLAGS}"
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:648: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:655: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:677: checking for $ac_word" >&5
+echo "configure:684: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:707: checking for $ac_word" >&5
+echo "configure:714: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:758: checking for $ac_word" >&5
+echo "configure:765: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:790: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:797: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
cat > conftest.$ac_ext << EOF
-#line 801 "configure"
+#line 808 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:832: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:839: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:837: checking whether we are using GNU C" >&5
+echo "configure:844: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:865: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:872: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:897: checking how to run the C preprocessor" >&5
+echo "configure:904: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 912 "configure"
+#line 919 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:925: \"$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*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 929 "configure"
+#line 936 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:942: \"$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*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 946 "configure"
+#line 953 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:952: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:959: \"$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
:
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:979: checking for $ac_word" >&5
+echo "configure:986: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1019: checking for a BSD compatible install" >&5
+echo "configure:1026: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
if test x${cross_compiling} != xyes; then
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:1074: checking whether byte ordering is bigendian" >&5
+echo "configure:1081: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
-#line 1081 "configure"
+#line 1088 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:1092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
-#line 1096 "configure"
+#line 1103 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:1107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 1127 "configure"
+#line 1134 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
-if { (eval echo configure:1140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian=no
else
for ac_func in gettimeofday select strerror strtod strtol
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1168: checking for $ac_func" >&5
+echo "configure:1175: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1173 "configure"
+#line 1180 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:1196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
for ac_func in setenv putenv
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1223: checking for $ac_func" >&5
+echo "configure:1230: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1228 "configure"
+#line 1235 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:1251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
done
echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:1276: checking for connect" >&5
+echo "configure:1283: checking for connect" >&5
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1281 "configure"
+#line 1288 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
; return 0; }
EOF
-if { (eval echo configure:1304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:1323: checking for connect in -lsocket" >&5
+echo "configure:1330: checking for connect in -lsocket" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1331 "configure"
+#line 1338 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
connect()
; return 0; }
EOF
-if { (eval echo configure:1342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:1366: checking for gethostbyname" >&5
+echo "configure:1373: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1371 "configure"
+#line 1378 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
; return 0; }
EOF
-if { (eval echo configure:1394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:1413: checking for gethostbyname in -lnsl" >&5
+echo "configure:1420: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1421 "configure"
+#line 1428 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:1432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
echo $ac_n "checking for nanosleep""... $ac_c" 1>&6
-echo "configure:1456: checking for nanosleep" >&5
+echo "configure:1463: checking for nanosleep" >&5
if eval "test \"`echo '$''{'ac_cv_func_nanosleep'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1461 "configure"
+#line 1468 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char nanosleep(); below. */
; return 0; }
EOF
-if { (eval echo configure:1484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_nanosleep=yes"
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6
-echo "configure:1503: checking for nanosleep in -lrt" >&5
+echo "configure:1510: checking for nanosleep in -lrt" >&5
ac_lib_var=`echo rt'_'nanosleep | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lrt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1511 "configure"
+#line 1518 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
nanosleep()
; return 0; }
EOF
-if { (eval echo configure:1522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
-echo "configure:1542: checking for nanosleep in -lposix4" >&5
+echo "configure:1549: checking for nanosleep in -lposix4" >&5
ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lposix4 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1550 "configure"
+#line 1557 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
nanosleep()
; return 0; }
EOF
-if { (eval echo configure:1561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
for ac_func in usleep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1590: checking for $ac_func" >&5
+echo "configure:1597: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1595 "configure"
+#line 1602 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:1618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
done
echo $ac_n "checking for inet_aton""... $ac_c" 1>&6
-echo "configure:1643: checking for inet_aton" >&5
+echo "configure:1650: checking for inet_aton" >&5
if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1648 "configure"
+#line 1655 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char inet_aton(); below. */
; return 0; }
EOF
-if { (eval echo configure:1671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_inet_aton=yes"
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
-echo "configure:1690: checking for inet_aton in -lresolv" >&5
+echo "configure:1697: checking for inet_aton in -lresolv" >&5
ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1698 "configure"
+#line 1705 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
inet_aton()
; return 0; }
EOF
-if { (eval echo configure:1709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
for ac_func in vasprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1735: checking for $ac_func" >&5
+echo "configure:1742: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1740 "configure"
+#line 1747 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:1763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
for ac_func in swab
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1790: checking for $ac_func" >&5
+echo "configure:1797: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1795 "configure"
+#line 1802 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:1818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
for ac_func in sigrelse
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1846: checking for $ac_func" >&5
+echo "configure:1853: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1851 "configure"
+#line 1858 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:1874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
GETOPT=0
echo $ac_n "checking for getopt_long""... $ac_c" 1>&6
-echo "configure:1901: checking for getopt_long" >&5
+echo "configure:1908: checking for getopt_long" >&5
if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1906 "configure"
+#line 1913 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char getopt_long(); below. */
; return 0; }
EOF
-if { (eval echo configure:1929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_getopt_long=yes"
else
echo "$ac_t""no" 1>&6
# FreeBSD has a gnugetopt library for this:
echo $ac_n "checking for getopt_long in -lgnugetopt""... $ac_c" 1>&6
-echo "configure:1951: checking for getopt_long in -lgnugetopt" >&5
+echo "configure:1958: checking for getopt_long in -lgnugetopt" >&5
ac_lib_var=`echo gnugetopt'_'getopt_long | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lgnugetopt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1959 "configure"
+#line 1966 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
getopt_long()
; return 0; }
EOF
-if { (eval echo configure:1970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2001: checking for $ac_hdr" >&5
+echo "configure:2008: 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 2006 "configure"
+#line 2013 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2011: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2018: \"$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*
for ac_func in getpagesize
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2040: checking for $ac_func" >&5
+echo "configure:2047: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2045 "configure"
+#line 2052 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:2068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
done
echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2093: checking for working mmap" >&5
+echo "configure:2100: checking for working mmap" >&5
if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_func_mmap_fixed_mapped=no
else
cat > conftest.$ac_ext <<EOF
-#line 2101 "configure"
+#line 2108 "configure"
#include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test.
#include <sys/types.h>
#include <fcntl.h>
#include <sys/mman.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
/* This mess was copied from the GNU getpagesize.h. */
#ifndef HAVE_GETPAGESIZE
+# ifdef HAVE_UNISTD_H
+# include <unistd.h>
+# endif
/* Assume that all systems that can run configure have sys/param.h. */
# ifndef HAVE_SYS_PARAM_H
/*
* First, make a file with some known garbage in it.
*/
- data = (char*)malloc(pagesize);
+ data = malloc(pagesize);
if (!data)
exit(1);
for (i = 0; i < pagesize; ++i)
fd = open("conftestmmap", O_RDWR);
if (fd < 0)
exit(1);
- data2 = (char*)malloc(2 * pagesize);
+ data2 = malloc(2 * pagesize);
if (!data2)
exit(1);
data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
*/
for (i = 0; i < pagesize; ++i)
*(data2 + i) = *(data2 + i) + 1;
- data3 = (char*)malloc(pagesize);
+ data3 = malloc(pagesize);
if (!data3)
exit(1);
if (read(fd, data3, pagesize) != pagesize)
}
EOF
-if { (eval echo configure:2244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_mmap_fixed_mapped=yes
else
fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2267: checking return type of signal handlers" >&5
+echo "configure:2271: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2272 "configure"
+#line 2276 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
int i;
; return 0; }
EOF
-if { (eval echo configure:2289: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:2308: checking for dlopen in -ldl" >&5
+echo "configure:2312: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2316 "configure"
+#line 2320 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dlopen()
; return 0; }
EOF
-if { (eval echo configure:2327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6
-echo "configure:2348: checking for pow in -lm" >&5
+echo "configure:2352: checking for pow in -lm" >&5
ac_lib_var=`echo m'_'pow | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2356 "configure"
+#line 2360 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pow()
; return 0; }
EOF
-if { (eval echo configure:2367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
PTHREAD_LIBS=error
echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
-echo "configure:2393: checking for pthread_attr_init in -lpthread" >&5
+echo "configure:2397: checking for pthread_attr_init in -lpthread" >&5
ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2401 "configure"
+#line 2405 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_attr_init()
; return 0; }
EOF
-if { (eval echo configure:2412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "x${THREAD_LIB}" = xerror; then
echo $ac_n "checking for pthread_attr_init in -lpthreads""... $ac_c" 1>&6
-echo "configure:2434: checking for pthread_attr_init in -lpthreads" >&5
+echo "configure:2438: checking for pthread_attr_init in -lpthreads" >&5
ac_lib_var=`echo pthreads'_'pthread_attr_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lpthreads $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2442 "configure"
+#line 2446 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_attr_init()
; return 0; }
EOF
-if { (eval echo configure:2453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
if test "x${THREAD_LIB}" = xerror; then
echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6
-echo "configure:2476: checking for pthread_attr_init in -lc_r" >&5
+echo "configure:2480: checking for pthread_attr_init in -lc_r" >&5
ac_lib_var=`echo c_r'_'pthread_attr_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lc_r $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2484 "configure"
+#line 2488 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_attr_init()
; return 0; }
EOF
-if { (eval echo configure:2495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "x${THREAD_LIB}" = xerror; then
THREAD_LIBS=""
echo $ac_n "checking for pthread_attr_init""... $ac_c" 1>&6
-echo "configure:2519: checking for pthread_attr_init" >&5
+echo "configure:2523: checking for pthread_attr_init" >&5
if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_init'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2524 "configure"
+#line 2528 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char pthread_attr_init(); below. */
; return 0; }
EOF
-if { (eval echo configure:2547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_pthread_attr_init=yes"
else
fi
cat > conftest.$ac_ext <<EOF
-#line 2569 "configure"
+#line 2573 "configure"
#include "confdefs.h"
#include <pthread.h>
EOF
rm -f conftest*
cat > conftest.$ac_ext <<EOF
-#line 2585 "configure"
+#line 2589 "configure"
#include "confdefs.h"
#include <strings.h>
EOF
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2605: checking for $ac_hdr" >&5
+echo "configure:2609: 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 2610 "configure"
+#line 2614 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2619: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2645: checking for $ac_hdr" >&5
+echo "configure:2649: 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 2650 "configure"
+#line 2654 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2659: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2685: checking for $ac_hdr" >&5
+echo "configure:2689: 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 2690 "configure"
+#line 2694 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2699: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2725: checking for $ac_hdr" >&5
+echo "configure:2729: 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 2730 "configure"
+#line 2734 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2739: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2765: checking for $ac_hdr" >&5
+echo "configure:2769: 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 2770 "configure"
+#line 2774 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2779: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2805: checking for $ac_hdr" >&5
+echo "configure:2809: 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 2810 "configure"
+#line 2814 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2819: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2846: checking for $ac_hdr" >&5
+echo "configure:2850: 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 2851 "configure"
+#line 2855 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2860: \"$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*
CFLAGS="${save_CFLAGS} -Wall -Werror"
echo $ac_n "checking for ntohl in sys/param.h""... $ac_c" 1>&6
-echo "configure:2885: checking for ntohl in sys/param.h" >&5
+echo "configure:2889: checking for ntohl in sys/param.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 2887 "configure"
+#line 2891 "configure"
#include "confdefs.h"
#include <sys/param.h>
void foo() { int meuh; ntohl(meuh); }
; return 0; }
EOF
-if { (eval echo configure:2895: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define NTOHL_IN_SYS_PARAM_H 1
fi
rm -f conftest*
-CFLAGS="${save_CFLAGS} -finline-limit=12"
+CFLAGS="${save_CFLAGS} -finline-limit=31337"
echo $ac_n "checking if \$CC accepts -finline-limit""... $ac_c" 1>&6
-echo "configure:2912: checking if \$CC accepts -finline-limit" >&5
+echo "configure:2916: checking if \$CC accepts -finline-limit" >&5
cat > conftest.$ac_ext <<EOF
-#line 2914 "configure"
+#line 2918 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:2921: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
save_CFLAGS="${save_CFLAGS} -finline-limit=31337"; echo "$ac_t""yes" 1>&6
else
CFLAGS="${save_CFLAGS} -bundle -undefined suppress"
echo $ac_n "checking if \$CC compiles plugins with -bundle -undefined suppress""... $ac_c" 1>&6
-echo "configure:2934: checking if \$CC compiles plugins with -bundle -undefined suppress" >&5
+echo "configure:2938: checking if \$CC compiles plugins with -bundle -undefined suppress" >&5
cat > conftest.$ac_ext <<EOF
-#line 2936 "configure"
+#line 2940 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:2943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2947: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
PLCFLAGS="${PLCFLAGS} -bundle -undefined suppress"; echo "$ac_t""yes" 1>&6
else
CFLAGS="${save_CFLAGS} -shared"
echo $ac_n "checking if \$CC compiles plugins with -shared""... $ac_c" 1>&6
-echo "configure:2956: checking if \$CC compiles plugins with -shared" >&5
+echo "configure:2960: checking if \$CC compiles plugins with -shared" >&5
cat > conftest.$ac_ext <<EOF
-#line 2958 "configure"
+#line 2962 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:2965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
PLCFLAGS="${PLCFLAGS} -shared"; echo "$ac_t""yes" 1>&6
else
CFLAGS="${save_CFLAGS}"
echo $ac_n "checking for boolean_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:2979: checking for boolean_t in sys/types.h" >&5
+echo "configure:2983: checking for boolean_t in sys/types.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 2981 "configure"
+#line 2985 "configure"
#include "confdefs.h"
#include <sys/types.h>
void quux() { boolean_t foo; }
; return 0; }
EOF
-if { (eval echo configure:2989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define BOOLEAN_T_IN_SYS_TYPES_H 1
fi
rm -f conftest*
echo $ac_n "checking for boolean_t in pthread.h""... $ac_c" 1>&6
-echo "configure:3004: checking for boolean_t in pthread.h" >&5
+echo "configure:3008: checking for boolean_t in pthread.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 3006 "configure"
+#line 3010 "configure"
#include "confdefs.h"
#include <pthread.h>
void quux() { boolean_t foo; }
; return 0; }
EOF
-if { (eval echo configure:3014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define BOOLEAN_T_IN_PTHREAD_H 1
rm -f conftest*
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3030: checking for working const" >&5
+echo "configure:3034: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3035 "configure"
+#line 3039 "configure"
#include "confdefs.h"
int main() {
/* Ultrix mips cc rejects this. */
-typedef int charset[2]; const charset x = {0,0};
+typedef int charset[2]; const charset x;
/* SunOS 4.1.1 cc rejects this. */
char const *const *ccp;
char **p;
; return 0; }
EOF
-if { (eval echo configure:3084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3088: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3105: checking for ANSI C header files" >&5
+echo "configure:3109: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3110 "configure"
+#line 3114 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3122: \"$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*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 3135 "configure"
+#line 3139 "configure"
#include "confdefs.h"
#include <string.h>
EOF
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 3153 "configure"
+#line 3157 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
:
else
cat > conftest.$ac_ext <<EOF
-#line 3174 "configure"
+#line 3178 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
exit (0); }
EOF
-if { (eval echo configure:3185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3209: checking for size_t" >&5
+echo "configure:3213: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3214 "configure"
+#line 3218 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3242: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3246: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3247 "configure"
+#line 3251 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:3256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
MMXEXT_MODULES="idctmmxext motionmmxext imdct3dn imdctsse downmix3dn downmixsse"
echo $ac_n "checking if \$CC groks MMX inline assembly""... $ac_c" 1>&6
-echo "configure:3286: checking if \$CC groks MMX inline assembly" >&5
+echo "configure:3290: checking if \$CC groks MMX inline assembly" >&5
cat > conftest.$ac_ext <<EOF
-#line 3288 "configure"
+#line 3292 "configure"
#include "confdefs.h"
void quux(){void *p;asm("packuswb %%mm1,%%mm2"::"r"(p));}
int main() {
; return 0; }
EOF
-if { (eval echo configure:3295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ACCEL_MODULES="${ACCEL_MODULES} ${MMX_MODULES}"
echo "$ac_t""yes" 1>&6
rm -f conftest*
echo $ac_n "checking if \$CC groks MMX EXT or SSE inline assembly""... $ac_c" 1>&6
-echo "configure:3308: checking if \$CC groks MMX EXT or SSE inline assembly" >&5
+echo "configure:3312: checking if \$CC groks MMX EXT or SSE inline assembly" >&5
cat > conftest.$ac_ext <<EOF
-#line 3310 "configure"
+#line 3314 "configure"
#include "confdefs.h"
void quux(){void *p;asm("maskmovq %%mm1,%%mm2"::"r"(p));}
int main() {
; return 0; }
EOF
-if { (eval echo configure:3317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ACCEL_MODULES="${ACCEL_MODULES} ${MMXEXT_MODULES}"
echo "$ac_t""yes" 1>&6
rm -f conftest*
+CAN_BUILD_LIBDVDCSS=0
+
for ac_hdr in winioctl.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3334: checking for $ac_hdr" >&5
+echo "configure:3340: 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 3339 "configure"
+#line 3345 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3350: \"$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*
#define $ac_tr_hdr 1
EOF
- CAN_BUILD_LIBDVDCSS=1
+ CAN_BUILD_LIBDVDCSS="${HAVE_LIBDVDCSS}"
else
echo "$ac_t""no" 1>&6
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3377: checking for $ac_hdr" >&5
+echo "configure:3383: 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 3382 "configure"
+#line 3388 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3393: \"$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*
#define $ac_tr_hdr 1
EOF
- CAN_BUILD_LIBDVDCSS=1
+ CAN_BUILD_LIBDVDCSS="${HAVE_LIBDVDCSS}"
for ac_hdr in sys/cdio.h sys/dvdio.h linux/cdrom.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3413: checking for $ac_hdr" >&5
+echo "configure:3419: 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 3418 "configure"
+#line 3424 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3429: \"$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*
BSD_DVD_STRUCT=0
cat > conftest.$ac_ext <<EOF
-#line 3451 "configure"
+#line 3457 "configure"
#include "confdefs.h"
#include <sys/dvdio.h>
EOF
rm -f conftest*
cat > conftest.$ac_ext <<EOF
-#line 3469 "configure"
+#line 3475 "configure"
#include "confdefs.h"
#include <sys/cdio.h>
EOF
fi
cat > conftest.$ac_ext <<EOF
-#line 3493 "configure"
+#line 3499 "configure"
#include "confdefs.h"
#include <linux/cdrom.h>
EOF
done
+
case ${host_os} in
darwin*)
SYS=darwin
enableval="$enable_pth"
if test x$enableval = xyes; then
echo $ac_n "checking for pth_init in -lpth""... $ac_c" 1>&6
-echo "configure:3602: checking for pth_init in -lpth" >&5
+echo "configure:3609: checking for pth_init in -lpth" >&5
ac_lib_var=`echo pth'_'pth_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lpth $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3610 "configure"
+#line 3617 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pth_init()
; return 0; }
EOF
-if { (eval echo configure:3621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
cat > conftest.$ac_ext <<EOF
-#line 3649 "configure"
+#line 3656 "configure"
#include "confdefs.h"
#include <pth.h>
EOF
LOCAL_LIBDVDCSS=0
STATIC_LIBDVDCSS=0
+DUMMY_LIBDVDCSS=0
# Check whether --with-dvdcss or --without-dvdcss was given.
if test "${with_dvdcss+set}" = set; then
withval="$with_dvdcss"
LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -L../../lib -ldvdcss"
fi
;;
+ xno)
+ # don't use libdvdcss at all, build a DVD module that can dlopen() it
+ DUMMY_LIBDVDCSS=1
+ BUILTINS="${BUILTINS} dvd"
+ OBJ_DVD="${OBJ_DVD} dummy_dvdcss.o"
+ CFLAGS_DVD="${CFLAGS_DVD} -DGOD_DAMN_DMCA"
+ LIB_DVD="${LIB_DVD} -ldl"
+ LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldl"
+ ;;
*)
# existing libdvdcss
BUILTINS="${BUILTINS} dvd"
esac
else
# user didn't decide, we choose to use local libdvdcss and link statically
+ # if libdvdcss is in the archive, or to use the dummy replacement otherwise.
if test x${CAN_BUILD_LIBDVDCSS} = x1
then
LOCAL_LIBDVDCSS=1
CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
LIB_DVD="${LIB_DVD} lib/libdvdcss.a"
LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} ../../lib/libdvdcss.a"
+ else
+ # XXX: no check for libdl is done, don't try this at home !
+ DUMMY_LIBDVDCSS=1
+ BUILTINS="${BUILTINS} dvd"
+ OBJ_DVD="${OBJ_DVD} dummy_dvdcss.o"
+ CFLAGS_DVD="${CFLAGS_DVD} -DGOD_DAMN_DMCA"
+ LIB_DVD="${LIB_DVD} -ldl"
+ LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldl"
fi
fi
-CSS=0
-# Check whether --enable-css or --disable-css was given.
-if test "${enable_css+set}" = set; then
- enableval="$enable_css"
- if test x$enableval = xyes
- then
- CSS=1
- fi
-else
- CSS=1;
-fi
-
-
-if test x${CSS} = x1
-then
- cat >> confdefs.h <<\EOF
-#define HAVE_CSS 1
-EOF
-
-fi
-
# Check whether --enable-dummy or --disable-dummy was given.
if test "${enable_dummy+set}" = set; then
enableval="$enable_dummy"
# Extract the first word of "esd-config", so it can be a program name with args.
set dummy esd-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3814: checking for $ac_word" >&5
+echo "configure:3819: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3881: checking for $ac_hdr" >&5
+echo "configure:3886: 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 3886 "configure"
+#line 3891 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3896: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3936: checking for $ac_hdr" >&5
+echo "configure:3941: 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 3941 "configure"
+#line 3946 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3951: \"$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*
# Check whether --enable-fb or --disable-fb was given.
if test "${enable_fb+set}" = set; then
enableval="$enable_fb"
- if test x$enable_fb = xyes; then PLUGINS="${PLUGINS} fb"; fi
+ if test x$enable_fb = xyes
+ then
+ PLUGINS="${PLUGINS} fb"
+ fi
fi
# Extract the first word of "sdl12-config", so it can be a program name with args.
set dummy sdl12-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4011: checking for $ac_word" >&5
+echo "configure:4019: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SDL12_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "sdl11-config", so it can be a program name with args.
set dummy sdl11-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4051: checking for $ac_word" >&5
+echo "configure:4059: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SDL11_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "sdl-config", so it can be a program name with args.
set dummy sdl-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4092: checking for $ac_word" >&5
+echo "configure:4100: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4138: checking for $ac_hdr" >&5
+echo "configure:4146: 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 4143 "configure"
+#line 4151 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4156: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4211: checking for $ac_hdr" >&5
+echo "configure:4219: 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 4216 "configure"
+#line 4224 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4229: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4259: checking for $ac_hdr" >&5
+echo "configure:4267: 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 4264 "configure"
+#line 4272 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4277: \"$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*
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4381: checking for $ac_word" >&5
+echo "configure:4389: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4426: checking for $ac_hdr" >&5
+echo "configure:4434: 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 4431 "configure"
+#line 4439 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4444: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4487: checking for $ac_hdr" >&5
+echo "configure:4495: 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 4492 "configure"
+#line 4500 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4505: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4549: checking for $ac_hdr" >&5
+echo "configure:4557: 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 4554 "configure"
+#line 4562 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4559: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4567: \"$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*
then
ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6
-echo "configure:4599: checking for sys/asoundlib.h" >&5
+echo "configure:4607: checking for sys/asoundlib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4604 "configure"
+#line 4612 "configure"
#include "confdefs.h"
#include <sys/asoundlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4609: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4617: \"$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*
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
-echo "configure:4626: checking for main in -lasound" >&5
+echo "configure:4634: checking for main in -lasound" >&5
ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lasound $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4634 "configure"
+#line 4642 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:4641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
+
trap '' 1 2 15
s%@host_vendor@%$host_vendor%g
s%@host_os@%$host_os%g
s%@VLC_VERSION@%$VLC_VERSION%g
-s%@LIBDVDCSS_VERSION@%$LIBDVDCSS_VERSION%g
s%@VLC_CODENAME@%$VLC_CODENAME%g
+s%@LIBDVDCSS_VERSION@%$LIBDVDCSS_VERSION%g
s%@SET_MAKE@%$SET_MAKE%g
s%@CC@%$CC%g
s%@CPP@%$CPP%g
s%@PROFILING@%$PROFILING%g
s%@OPTIMS@%$OPTIMS%g
s%@GETOPT@%$GETOPT%g
-s%@CSS@%$CSS%g
s%@MOC@%$MOC%g
s%@WINDRES@%$WINDRES%g
s%@LCFLAGS@%$LCFLAGS%g
s%@CFLAGS_GTK@%$CFLAGS_GTK%g
s%@CFLAGS_SDL@%$CFLAGS_SDL%g
s%@CFLAGS_X11@%$CFLAGS_X11%g
+s%@OBJ_DVD@%$OBJ_DVD%g
s%@LOCAL_LIBDVDCSS@%$LOCAL_LIBDVDCSS%g
CEOF
--------------------
system : ${SYS}
architecture : ${ARCH}
-optimizations : ${OPTIMS}
+optimizations : ${OPTIMS}"
+if test x${HAVE_VLC} = x1
+then
+ echo "
vlc configuration
-----------------
vlc version : ${VLC_VERSION}
need builtin getopt : ${GETOPT}
built-in modules :${BUILTINS}
plugin modules :${PLUGINS}
-vlc aliases :${ALIASES}
+vlc aliases :${ALIASES}"
+fi
+echo "
libdvdcss configuration
-----------------------
-need to be built : ${LOCAL_LIBDVDCSS}"
-
+can be built : ${CAN_BUILD_LIBDVDCSS}
+will be built : ${LOCAL_LIBDVDCSS}"
if test x${LOCAL_LIBDVDCSS} = x1
then
- echo "link statically : ${STATIC_LIBDVDCSS}
-CSS decryption : ${CSS}"
+ echo "link statically : ${STATIC_LIBDVDCSS}"
+else
+ echo "use dummy replacement : ${DUMMY_LIBDVDCSS}"
fi
echo "
-You may now tune Makefile.opts at your convenience. To build vlc and its
-plugins, type \`make vlc plugins'. If you want to build libdvdcss only,
-type \`make libdvdcss'."
+You may now tune Makefile.opts at your convenience, for instance to choose
+which modules get compiled as plugins.
+"
+if test x${HAVE_VLC} = x1
+then
+ echo "To build vlc and its plugins, type \`make vlc'."
+fi
+if test x${HAVE_LIBDVDCSS} = x1
+then
+ echo "To build libdvdcss only, type \`make libdvdcss'."
+fi
+echo ""
dnl Autoconf settings for vlc and libdvdcss
-AC_INIT(include/main.h)
+AC_INIT(include/common.h)
AC_CONFIG_HEADER(include/defs.h)
AC_CANONICAL_HOST
-VLC_VERSION=0.2.81
-AC_SUBST(VLC_VERSION)
-LIBDVDCSS_VERSION=0.0.2
-AC_SUBST(LIBDVDCSS_VERSION)
-VLC_CODENAME=Ourumov
-AC_SUBST(VLC_CODENAME)
+HAVE_VLC=0
+if test -r src/interface/main.c; then
+ HAVE_VLC=1
+ VLC_VERSION=0.2.81
+ AC_SUBST(VLC_VERSION)
+ VLC_CODENAME=Ourumov
+ AC_SUBST(VLC_CODENAME)
+fi
+
+HAVE_LIBDVDCSS=0
+if test -r extras/libdvdcss/libdvdcss.c; then
+ HAVE_LIBDVDCSS=1
+ LIBDVDCSS_VERSION=0.0.2
+ AC_SUBST(LIBDVDCSS_VERSION)
+fi
dnl Save CFLAGS
save_CFLAGS="${CFLAGS}"
AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
dnl Check for inline function size limit
-CFLAGS="${save_CFLAGS} -finline-limit=12"
+CFLAGS="${save_CFLAGS} -finline-limit=31337"
AC_MSG_CHECKING([if \$CC accepts -finline-limit])
AC_TRY_COMPILE([],,
save_CFLAGS="${save_CFLAGS} -finline-limit=31337"; AC_MSG_RESULT(yes),
dnl libdvdcss: check for DVD ioctls
dnl
+dnl default is no
+CAN_BUILD_LIBDVDCSS=0
+
dnl for windoze
AC_CHECK_HEADERS(winioctl.h,[
- CAN_BUILD_LIBDVDCSS=1
+ CAN_BUILD_LIBDVDCSS="${HAVE_LIBDVDCSS}"
])
-dnl for Un*x
+dnl for Un*x and BeOS
AC_CHECK_HEADERS(sys/ioctl.h,[
- CAN_BUILD_LIBDVDCSS=1
+ CAN_BUILD_LIBDVDCSS="${HAVE_LIBDVDCSS}"
AC_CHECK_HEADERS(sys/cdio.h sys/dvdio.h linux/cdrom.h)
BSD_DVD_STRUCT=0
dnl
])
])
+
dnl
dnl Check the operating system
dnl
dnl
LOCAL_LIBDVDCSS=0
STATIC_LIBDVDCSS=0
+DUMMY_LIBDVDCSS=0
AC_ARG_WITH(dvdcss,
- [ --with-dvdcss[=name] way to use libdvdcss, either local-static, local-shared or a path to another libdvdcss such as /usr/local (default local-static)],
+ [ --with-dvdcss[=name] way to use libdvdcss, either 'yes' or 'no', or 'local-static', 'local-shared', or a path to another libdvdcss such as '/usr/local' (default 'local-static')],
[ case "x${withval}" in
xlocal-static|xyes)
# local libdvdcss, statically linked
LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -L../../lib -ldvdcss"
fi
;;
+ xno)
+ # don't use libdvdcss at all, build a DVD module that can dlopen() it
+ DUMMY_LIBDVDCSS=1
+ BUILTINS="${BUILTINS} dvd"
+ OBJ_DVD="${OBJ_DVD} dummy_dvdcss.o"
+ CFLAGS_DVD="${CFLAGS_DVD} -DGOD_DAMN_DMCA"
+ LIB_DVD="${LIB_DVD} -ldl"
+ LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldl"
+ ;;
*)
# existing libdvdcss
BUILTINS="${BUILTINS} dvd"
LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldvdcss"
esac ],
# user didn't decide, we choose to use local libdvdcss and link statically
+ # if libdvdcss is in the archive, or to use the dummy replacement otherwise.
[ if test x${CAN_BUILD_LIBDVDCSS} = x1
then
LOCAL_LIBDVDCSS=1
CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
LIB_DVD="${LIB_DVD} lib/libdvdcss.a"
LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} ../../lib/libdvdcss.a"
+ else
+ # XXX: no check for libdl is done, don't try this at home !
+ DUMMY_LIBDVDCSS=1
+ BUILTINS="${BUILTINS} dvd"
+ OBJ_DVD="${OBJ_DVD} dummy_dvdcss.o"
+ CFLAGS_DVD="${CFLAGS_DVD} -DGOD_DAMN_DMCA"
+ LIB_DVD="${LIB_DVD} -ldl"
+ LIB_DVD_PLUGIN="${LIB_DVD_PLUGIN} -ldl"
fi ])
-dnl
-dnl CSS DVD decryption (for libdvdcss)
-dnl
-CSS=0
-AC_ARG_ENABLE(css,
- [ --disable-css Disable DVD CSS decryption (default enabled)],
- [ if test x$enableval = xyes
- then
- CSS=1
- fi ],
- [ CSS=1; ])
-
-if test x${CSS} = x1
-then
- AC_DEFINE(HAVE_CSS, 1, Define if you want DVD CSS decryption.)
-fi
-
dnl
dnl dummy plugin
dnl
dnl
AC_ARG_ENABLE(fb,
[ --enable-fb Linux framebuffer support (default disabled)],
- [if test x$enable_fb = xyes; then PLUGINS="${PLUGINS} fb"; fi])
+ [ if test x$enable_fb = xyes
+ then
+ PLUGINS="${PLUGINS} fb"
+ fi ])
dnl
dnl GGI module
AC_SUBST(PROFILING)
AC_SUBST(OPTIMS)
AC_SUBST(GETOPT)
-AC_SUBST(CSS)
AC_SUBST(MOC)
AC_SUBST(WINDRES)
AC_SUBST(CFLAGS_SDL)
AC_SUBST(CFLAGS_X11)
+AC_SUBST(OBJ_DVD)
+
AC_SUBST(LOCAL_LIBDVDCSS)
AC_OUTPUT([Makefile.opts include/config.h])
--------------------
system : ${SYS}
architecture : ${ARCH}
-optimizations : ${OPTIMS}
+optimizations : ${OPTIMS}"
+if test x${HAVE_VLC} = x1
+then
+ echo "
vlc configuration
-----------------
vlc version : ${VLC_VERSION}
need builtin getopt : ${GETOPT}
built-in modules :${BUILTINS}
plugin modules :${PLUGINS}
-vlc aliases :${ALIASES}
+vlc aliases :${ALIASES}"
+fi
+echo "
libdvdcss configuration
-----------------------
-need to be built : ${LOCAL_LIBDVDCSS}"
-
+can be built : ${CAN_BUILD_LIBDVDCSS}
+will be built : ${LOCAL_LIBDVDCSS}"
if test x${LOCAL_LIBDVDCSS} = x1
then
- echo "link statically : ${STATIC_LIBDVDCSS}
-CSS decryption : ${CSS}"
+ echo "link statically : ${STATIC_LIBDVDCSS}"
+else
+ echo "use dummy replacement : ${DUMMY_LIBDVDCSS}"
fi
echo "
-You may now tune Makefile.opts at your convenience. To build vlc and its
-plugins, type \`make vlc plugins'. If you want to build libdvdcss only,
-type \`make libdvdcss'."
+You may now tune Makefile.opts at your convenience, for instance to choose
+which modules get compiled as plugins.
+"
+if test x${HAVE_VLC} = x1
+then
+ echo "To build vlc and its plugins, type \`make vlc'."
+fi
+if test x${HAVE_LIBDVDCSS} = x1
+then
+ echo "To build libdvdcss only, type \`make libdvdcss'."
+fi
+echo ""
+++ /dev/null
-vlc-css (0.2.81-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Samuel Hocevar <sam@zoy.org> Sat, 28 Jul 2001 04:13:57 +0200
-
-vlc-css (0.2.80-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Samuel Hocevar <sam@zoy.org> Tue, 5 Jun 2001 04:41:06 +0200
-
-vlc-css (0.2.73-2) unstable; urgency=low
-
- * We now build without MMX in the main application (Closes: #96036).
-
- -- Samuel Hocevar <sam@zoy.org> Fri, 4 May 2001 07:13:04 +0200
-
-vlc-css (0.2.73-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Samuel Hocevar <sam@zoy.org> Sat, 28 Apr 2001 07:02:35 +0200
-
-vlc-css (0.2.72-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Samuel Hocevar <sam@zoy.org> Mon, 16 Apr 2001 14:33:53 +0200
-
-vlc-css (0.2.71-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Samuel Hocevar <sam@zoy.org> Fri, 13 Apr 2001 08:13:26 +0200
-
-vlc-css (0.2.70-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Samuel Hocevar <sam@zoy.org> Sat, 7 Apr 2001 05:52:00 +0200
-
-vlc-css (0.2.63-3) unstable; urgency=low
-
- * New vlc package.
-
- -- Samuel Hocevar <sam@zoy.org> Wed, 7 Mar 2001 20:47:48 +0100
-
-vlc-css (0.2.63-2) unstable; urgency=low
-
- * Fixed versioned dependencies against vlc.
-
- -- Samuel Hocevar <sam@zoy.org> Mon, 5 Mar 2001 21:37:19 +0100
-
-vlc-css (0.2.63-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Samuel Hocevar <sam@zoy.org> Mon, 5 Mar 2001 00:41:16 +0100
-
-vlc-css (0.2.62-2) unstable; urgency=low
-
- * Removed a few lintian warnings.
-
- -- Samuel Hocevar <sam@zoy.org> Sat, 3 Mar 2001 10:29:31 +0100
-
-vlc-css (0.2.62-1) unstable; urgency=low
-
- * Initial Release.
-
- -- Samuel Hocevar <sam@zoy.org> Fri, 2 Mar 2001 17:58:26 +0100
-
-Local variables:
-mode: debian-changelog
-End:
Section: graphics
Priority: optional
Maintainer: Samuel Hocevar <sam@zoy.org>
-Build-Depends: debhelper (>=2.2.0), xlibs-dev, libgnome-dev, libggi2-dev, libglide3-dev [i386], libesd0-dev, libsdl1.2-dev, libqt-dev, libasound1-dev
+Build-Depends: debhelper (>=2.2.0), xlibs-dev, libgnome-dev, libggi2-dev, libglide3-dev [i386], libesd0-dev, libsdl1.2-dev, libqt-dev, libasound2-dev
Standards-Version: 3.0.1
Package: vlc
Description: a free MPEG and DVD player
VideoLAN is a free MPEG, MPEG2 and DVD software solution.
.
- This is vlc, the VideoLAN Client. It plays MPEG and MPEG2 files, unencrypted
+ This is vlc, the VideoLAN Client. It plays MPEG and MPEG2 files,
DVDs, or MPEG streams from a network source.
+Package: libdvdcss0.0.2
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: a portable abstraction library for DVD decryption
+ libdvdcss is a portable abstraction library for DVD decryption, it
+ provides a simple API to access a DVD device as a block device.
+ .
+ This package contains the libdvdcss0 runtime library.
+
+Package: libdvdcss0.0.2-dev
+Architecture: any
+Depends: libdvdcss0.0.2 (= ${Source-Version}), libc6-dev
+Description: development files for libdvdcss0
+ libdvdcss is a portable abstraction library for DVD decryption, it
+ provides a simple API to access a DVD device as a block device.
+ .
+ This package contains the header files and static library needed to
+ compile applications that use libdvdcss0.
+
Package: vlc-gnome
Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
This plugin adds support for the Enlightened Sound Daemon to
vlc, the VideoLAN Client.
+Package: vlc-alsa
+Architecture: any
+Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Description: ALSA plugin for vlc
+ VideoLAN is a free MPEG, MPEG2 and DVD software solution.
+ .
+ This plugin adds support for the Advanced Linux Sound Architecture to
+ vlc, the VideoLAN Client.
+
Package: vlc-sdl
Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+++ /dev/null
-Source: vlc-css
-Section: non-US/main
-Priority: optional
-Maintainer: Samuel Hocevar <sam@zoy.org>
-Build-Depends: debhelper (>=2.2.0)
-Standards-Version: 3.0.1
-
-Package: vlc-css
-Architecture: any
-Depends: ${shlibs:Depends}, vlc (= ${Source-Version})
-Description: CSS plugin for vlc
- VideoLAN is a free MPEG, MPEG2 and DVD software solution.
- .
- This plugin adds DVD support with CSS decryption to vlc, the VideoLAN Client.
-
--- /dev/null
+usr/include/videolan
+usr/lib
+usr/share/doc
--- /dev/null
+usr/lib
+usr/share/doc/libdvdcss0
--- /dev/null
+AUTHORS
+README.libdvdcss
+TODO
# This is the debhelper compatability version to use.
export DH_COMPAT=3
+# Compilation options
+export CONFIG_FLAGS="--prefix=/usr --enable-gnome --enable-gtk --enable-fb --with-ggi --with-sdl --enable-esd --enable-alsa --enable-qt"
+export LIBDVDCSS_FLAGS="--with-dvdcss=local-shared"
+export VIDDIR="usr/share/videolan"
+export PIXDIR="usr/share/pixmaps"
+export GNOMEDIR="usr/share/gnome/apps/Multimedia"
+
build: build-stamp
build-stamp:
dh_testdir
if [ $(DEB_BUILD_ARCH) = i386 ]; then \
- ./configure --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --enable-gnome --enable-gtk --enable-fb --with-glide \
- --with-ggi --with-sdl --enable-esd \
- --enable-qt --disable-ppro ; \
+ ./configure --mandir=$${prefix}/share/man \
+ --infodir=$${prefix}/share/info \
+ $(shell echo $(CONFIG_FLAGS)) \
+ $(shell echo $(LIBDVDCSS_FLAGS)) \
+ --with-glide --disable-ppro ; \
else \
- ./configure --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --enable-gnome --enable-gtk --enable-fb \
- --with-ggi --with-sdl --enable-esd \
- --enable-qt ; \
+ ./configure --mandir=$${prefix}/share/man \
+ --infodir=$${prefix}/share/info \
+ $(shell echo $(CONFIG_FLAGS)) \
+ $(shell echo $(LIBDVDCSS_FLAGS)) ; \
fi
$(MAKE)
DESTDIR=`pwd`/debian/vlc/ $(MAKE) install prefix=/usr
- # get rid of libdvdcss for the moment
- rm -f debian/vlc/usr/lib/libdvdcss*
- rm -Rf debian/vlc/usr/include
-
- # make symlinks for packages
- aliases="ggi gtk gnome esd sdl qt" ; \
- if [ $(DEB_BUILD_ARCH) = i386 ]; then aliases=$$aliases" glide" ; fi ; \
- for alias in `echo $$aliases` ; do \
- mkdir -p debian/vlc-$$alias/usr/share/doc/ ; \
+ # make symlinks for packages and install plugins
+ for alias in ggi gtk gnome esd sdl qt alsa `if [ $(DEB_BUILD_ARCH) = i386 ]; then echo glide ; fi` ; do \
ln -s vlc debian/vlc-$$alias/usr/share/doc/vlc-$$alias ; \
- mkdir -p debian/vlc-$$alias/usr/lib/videolan/vlc/ ; \
mv debian/vlc/usr/lib/videolan/vlc/$$alias.so \
debian/vlc-$$alias/usr/lib/videolan/vlc/ ; done
- mkdir -p debian/vlc-gtk/usr/bin/
mv debian/vlc/usr/bin/gvlc debian/vlc-gtk/usr/bin/
- mkdir -p debian/vlc-gnome/usr/bin/
mv debian/vlc/usr/bin/gnome-vlc debian/vlc-gnome/usr/bin/
- mkdir -p debian/vlc-qt/usr/bin/
mv debian/vlc/usr/bin/qvlc debian/vlc-qt/usr/bin/
- mkdir -p debian/vlc/usr/share/pixmaps/
- mv debian/vlc/usr/share/videolan/vlc.png \
- debian/vlc/usr/share/pixmaps/
- mkdir -p debian/vlc/usr/share/gnome/apps/Multimedia/
- cp debian/vlc.desktop debian/vlc/usr/share/gnome/apps/Multimedia/
-
- mkdir -p debian/vlc-gtk/usr/share/videolan/ \
- debian/vlc-gtk/usr/share/pixmaps/
- mv debian/vlc/usr/share/videolan/gvlc.xpm \
- debian/vlc-gtk/usr/share/videolan/
- mv debian/vlc/usr/share/videolan/gvlc.png \
- debian/vlc-gtk/usr/share/pixmaps/
- mkdir -p debian/vlc-gtk/usr/share/gnome/apps/Multimedia/
- cp debian/gvlc.desktop debian/vlc-gtk/usr/share/gnome/apps/Multimedia/
-
- mkdir -p debian/vlc-gnome/usr/share/videolan/ \
- debian/vlc-gnome/usr/share/pixmaps/
- mv debian/vlc/usr/share/videolan/gnome-vlc.xpm \
- debian/vlc-gnome/usr/share/videolan/
- mv debian/vlc/usr/share/videolan/gnome-vlc.png \
- debian/vlc-gnome/usr/share/pixmaps/
- mkdir -p debian/vlc-gnome/usr/share/gnome/apps/Multimedia/
- cp debian/gnome-vlc.desktop debian/vlc-gnome/usr/share/gnome/apps/Multimedia/
-
- mkdir -p debian/vlc-qt/usr/share/videolan/ \
- debian/vlc-qt/usr/share/pixmaps/
- mv debian/vlc/usr/share/videolan/qvlc.xpm \
- debian/vlc-qt/usr/share/videolan/
- mv debian/vlc/usr/share/videolan/qvlc.png \
- debian/vlc-qt/usr/share/pixmaps/
-
- mkdir -p debian/vlc/usr/share/man/man1/
- gzip -9 < doc/vlc.1 >| debian/vlc/usr/share/man/man1/vlc.1.gz
- mkdir -p debian/vlc-gtk/usr/share/man/man1/
+ mv debian/vlc/$(VIDDIR)/vlc.png debian/vlc/$(PIXDIR)
+ mv debian/vlc/$(VIDDIR)/gvlc.xpm debian/vlc-gtk/$(VIDDIR)
+ mv debian/vlc/$(VIDDIR)/gvlc.png debian/vlc-gtk/$(PIXDIR)
+ mv debian/vlc/$(VIDDIR)/gnome-vlc.xpm debian/vlc-gnome/$(VIDDIR)
+ mv debian/vlc/$(VIDDIR)/gnome-vlc.png debian/vlc-gnome/$(PIXDIR)
+ mv debian/vlc/$(VIDDIR)/qvlc.xpm debian/vlc-qt/$(VIDDIR)
+ mv debian/vlc/$(VIDDIR)/qvlc.png debian/vlc-qt/$(PIXDIR)
+
+ cp debian/vlc.desktop debian/vlc/$(GNOMEDIR)
+ cp debian/gvlc.desktop debian/vlc-gtk/$(GNOMEDIR)
+ cp debian/gnome-vlc.desktop debian/vlc-gnome/$(GNOMEDIR)
+
+ #gzip -9 < doc/vlc.1 >| debian/vlc/usr/share/man/man1/vlc.1.gz
ln -s vlc.1.gz debian/vlc-gtk/usr/share/man/man1/gvlc.1.gz
- mkdir -p debian/vlc-gnome/usr/share/man/man1/
ln -s vlc.1.gz debian/vlc-gnome/usr/share/man/man1/gnome-vlc.1.gz
- mkdir -p debian/vlc-qt/usr/share/man/man1/
ln -s vlc.1.gz debian/vlc-qt/usr/share/man/man1/qvlc.1.gz
+# libdvdcss start
+ mv debian/vlc/usr/include/videolan/dvdcss.h \
+ debian/libdvdcss0.0.2-dev/usr/include/videolan
+ rmdir debian/vlc/usr/include/videolan
+ rmdir debian/vlc/usr/include
+ mv debian/vlc/usr/lib/*.a debian/libdvdcss0.0.2-dev/usr/lib
+ mv debian/vlc/usr/lib/*.so debian/libdvdcss0.0.2-dev/usr/lib
+ mv debian/vlc/usr/lib/*.so.* debian/libdvdcss0.0.2/usr/lib
+ ln -s libdvdcss0.0.2 debian/libdvdcss0.0.2-dev/usr/share/doc/libdvdcss0.0.2-dev
+# libdvdcss stop
+
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
dh_testroot
# dh_installdebconf
dh_installdocs
- dh_installexamples
+# dh_installexamples
dh_installmenu
# dh_installemacsen
# dh_installpam
# dh_installinit
- #dh_installcron
-# dh_installmanpages -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-qt doc/vlc.1
- #dh_installinfo
+# dh_installcron
+# dh_installmanpages -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt doc/vlc.1
+ dh_installman doc/vlc.1
+# dh_installinfo
# dh_undocumented
- dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-qt
+ dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt ChangeLog
dh_link
dh_strip
dh_compress
+++ /dev/null
-#!/usr/bin/make -f
-# debian/rules for the VideoLAN Client - uses debhelper.
-# based on Joey Hess's one.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
-
-build: build-stamp
-build-stamp:
- dh_testdir
-
- if [ $(DEB_BUILD_ARCH) = i386 ]; then \
- ./configure --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --disable-gnome --disable-gtk --enable-fb --without-glide \
- --without-ggi --without-sdl --disable-esd --disable-alsa \
- --disable-ppro ; \
- else \
- ./configure --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --disable-gnome --disable-gtk --enable-fb --without-ggi \
- --without-sdl --disable-esd --disable-alsa; \
- fi
-
- $(MAKE) lib/dvd.so
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- -$(MAKE) distclean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # make symlinks for packages
- mkdir -p debian/vlc-css/usr/share/doc/
- ln -s vlc debian/vlc-css/usr/share/doc/vlc-css
- mkdir -p debian/vlc-css/usr/lib/videolan/vlc/
- cp lib/dvd.so debian/vlc-css/usr/lib/videolan/vlc/dvd-css.so
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# dh_testversion
- dh_testdir
- dh_testroot
-# dh_installdebconf
- dh_installdocs
- dh_installexamples
-# dh_installmenu
-# dh_installemacsen
-# dh_installpam
-# dh_installinit
- dh_installcron
-# dh_installmanpages
- dh_installinfo
-# dh_undocumented
- dh_installchangelogs
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_makeshlibs
- dh_installdeb
-# dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
usr/bin
usr/lib/videolan/vlc
-usr/share/videolan
usr/share/doc/vlc
+usr/share/gnome/apps/Multimedia
+usr/share/pixmaps
+usr/share/videolan
usr/share/man/man1
-include ../../Makefile.opts
-LIBDVDCSS_VERSION = 0.0.1
-LIBDVDCSS_MAJOR = 0
+BASE_A := libdvdcss.a
+BASE_SO := libdvdcss.so
+MAJOR_SO := libdvdcss.so.$(shell echo $(LIBDVDCSS_VERSION) | cut -f1 -d.)
+FULL_SO := libdvdcss.so.$(LIBDVDCSS_VERSION)
#
# Objects
$(LIBDVDCSS_O): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
-../../lib/libdvdcss.so.$(LIBDVDCSS_VERSION): $(LIBDVDCSS_O)
- $(CC) $(PCFLAGS) -Wl,-soname -Wl,libdvdcss.so.$(LIBDVDCSS_MAJOR) -o $@ $^ $(PLCFLAGS)
- rm -f ../../lib/libdvdcss.so && ln -s libdvdcss.so.$(LIBDVDCSS_VERSION) ../../lib/libdvdcss.so
- rm -f ../../lib/libdvdcss.so.$(LIBDVDCSS_MAJOR) && ln -s libdvdcss.so.$(LIBDVDCSS_VERSION) ../../lib/libdvdcss.so.$(LIBDVDCSS_MAJOR)
+../../lib/$(FULL_SO): $(LIBDVDCSS_O)
+ $(CC) $(PCFLAGS) -Wl,-soname -Wl,$(MAJOR_SO) -o $@ $^ $(PLCFLAGS)
+ rm -f ../../lib/$(BASE_SO) && ln -s $(FULL_SO) ../../lib/$(BASE_SO)
+ rm -f ../../lib/$(MAJOR_SO) && ln -s $(FULL_SO) ../../lib/$(MAJOR_SO)
-../../lib/libdvdcss.a: $(LIBDVDCSS_O)
+../../lib/$(BASE_A): $(LIBDVDCSS_O)
ar r $@ $^
$(RANLIB) $@
-all: ../../lib/libdvdcss.so.$(LIBDVDCSS_VERSION) ../../lib/libdvdcss.a
+all: ../../lib/$(FULL_SO) ../../lib/$(BASE_A)
install:
mkdir -p $(DESTDIR)$(includedir)/videolan
$(INSTALL) -m 644 videolan/dvdcss.h $(DESTDIR)$(includedir)/videolan
mkdir -p $(DESTDIR)$(libdir)
- $(INSTALL) -m 644 ../../lib/libdvdcss.a $(DESTDIR)$(libdir)
- $(INSTALL) -m 644 ../../lib/libdvdcss.so.$(LIBDVDCSS_VERSION) $(DESTDIR)$(libdir)
- rm -f $(DESTDIR)$(libdir)/libdvdcss.so && ln -s libdvdcss.so.$(LIBDVDCSS_VERSION) $(DESTDIR)$(libdir)/libdvdcss.so
- rm -f $(DESTDIR)$(libdir)/libdvdcss.so.$(LIBDVDCSS_MAJOR) && ln -s libdvdcss.so.$(LIBDVDCSS_VERSION) $(DESTDIR)$(libdir)/libdvdcss.so.$(LIBDVDCSS_MAJOR)
+ $(INSTALL) -m 644 ../../lib/$(BASE_A) $(DESTDIR)$(libdir)
+ $(INSTALL) -m 644 ../../lib/$(FULL_SO) $(DESTDIR)$(libdir)
+ rm -f $(DESTDIR)$(libdir)/$(BASE_SO) && ln -s $(FULL_SO) $(DESTDIR)$(libdir)/$(BASE_SO)
+ rm -f $(DESTDIR)$(libdir)/$(MAJOR_SO) && ln -s $(FULL_SO) $(DESTDIR)$(libdir)/$(MAJOR_SO)
uninstall:
rm -f $(DESTDIR)$(includedir)/videolan/dvdcss.h
- rm -f $(DESTDIR)$(libdir)/libdvdcss.a
- rm -f $(DESTDIR)$(libdir)/libdvdcss.so
- rm -f $(DESTDIR)$(libdir)/libdvdcss.so.$(LIBDVDCSS_MAJOR)
- rm -f $(DESTDIR)$(libdir)/libdvdcss.so.$(LIBDVDCSS_VERSION)
+ rm -f $(DESTDIR)$(libdir)/$(BASE_A)
+ rm -f $(DESTDIR)$(libdir)/$(BASE_SO)
+ rm -f $(DESTDIR)$(libdir)/$(MAJOR_SO)
+ rm -f $(DESTDIR)$(libdir)/$(FULL_SO)
* css.c: Functions for DVD authentification and unscrambling
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: css.c,v 1.7 2001/07/27 01:05:17 sam Exp $
+ * $Id: css.c,v 1.8 2001/08/06 13:27:59 sam Exp $
*
* Author: Stéphane Borel <stef@via.ecp.fr>
*
#include "videolan/dvdcss.h"
#include "libdvdcss.h"
-#ifdef HAVE_CSS
-# include "csstables.h"
-#endif /* HAVE_CSS */
+#include "csstables.h"
#include "ioctl.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-#ifdef HAVE_CSS
static int CSSGetASF ( dvdcss_handle dvdcss );
static void CSSCryptKey ( int i_key_type, int i_varient,
u8 const * p_challenge, u8* p_key );
static int CSSCracker ( int i_start, unsigned char * p_crypted,
unsigned char * p_decrypted,
dvd_key_t * p_sector_key, dvd_key_t * p_key );
-#endif /* HAVE_CSS */
/*****************************************************************************
* CSSTest : check if the disc is encrypted or not
*****************************************************************************/
int CSSInit( dvdcss_handle dvdcss )
{
-#ifdef HAVE_CSS
/* structures defined in cdrom.h or dvdio.h */
unsigned char p_buffer[2048 + 4 + 1];
char psz_warning[32];
return -1;
}
-#else /* HAVE_CSS */
- _dvdcss_error( dvdcss, "CSS decryption is disabled in this library" );
-
-#endif /* HAVE_CSS */
return -1;
-
}
/*****************************************************************************
*****************************************************************************/
int CSSGetKey( dvdcss_handle dvdcss, int i_pos, dvd_key_t p_titlekey )
{
-#ifdef HAVE_CSS
/*
* Title key cracking method from Ethan Hawke,
* with Frank A. Stevenson algorithm.
}
return -1;
-
-#else /* HAVE_CSS */
- _dvdcss_error( dvdcss, "css decryption unavailable" );
- return -1;
-
-#endif /* HAVE_CSS */
}
/*****************************************************************************
*****************************************************************************/
int CSSDescrambleSector( dvd_key_t p_key, u8* p_sec )
{
-#ifdef HAVE_CSS
unsigned int i_t1, i_t2, i_t3, i_t4, i_t5, i_t6;
u8* p_end = p_sec + 0x800;
}
return 0;
-
-#else /* HAVE_CSS */
- return 1;
-
-#endif /* HAVE_CSS */
}
-#ifdef HAVE_CSS
-
/* Following functions are local */
/*****************************************************************************
return i_exit;
}
-#endif /* HAVE_CSS */
-
* ioctl.c: DVD ioctl replacement function
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: ioctl.c,v 1.5 2001/07/25 00:23:40 sam Exp $
+ * $Id: ioctl.c,v 1.6 2001/08/06 13:28:00 sam Exp $
*
* Authors: Markus Kuespert <ltlBeBoy@beosmail.com>
* Samuel Hocevar <sam@zoy.org>
return p_ssc->SRB_Status == SS_COMP ? 0 : -1;
}
#endif
+
* libdvdcss.c: DVD reading library.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: libdvdcss.c,v 1.13 2001/07/30 18:56:35 gbazin Exp $
+ * $Id: libdvdcss.c,v 1.14 2001/08/06 13:28:00 sam Exp $
*
* Authors: Stéphane Borel <stef@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-/* include/defs.h.in. Generated automatically from configure.in by autoheader. */
+/* include/defs.h.in. Generated automatically from configure.in by autoheader 2.13. */
/* Define to empty if the keyword does not work. */
#undef const
/* Define if <pth.h> defines pth_init */
#undef PTH_INIT_IN_PTH_H
-/* Define if you want DVD CSS decryption. */
-#undef HAVE_CSS
-
/* Indicate whether we should use SDL/SDL.h or SDL11/SDL.h */
#undef SDL_INCLUDE_FILE
# Real targets
#
-../../plugins/alsa.so: $(PLUGIN_C)
+../alsa.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_ALSA)
-../../plugins/alsa.a: $(BUILTIN_C)
+../alsa.a: $(BUILTIN_C)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/beos.so: $(PLUGIN_CPP)
+../beos.so: $(PLUGIN_CPP)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_BEOS)
-../../plugins/beos.a: $(BUILTIN_CPP)
+../beos.a: $(BUILTIN_CPP)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/darwin.so: $(PLUGIN_C)
+../darwin.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_DARWIN)
-../../plugins/darwin.a: $(BUILTIN_C)
+../darwin.a: $(BUILTIN_C)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/directx.so: $(PLUGIN_C)
+../directx.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_DIRECTX)
-../../plugins/directx.a: $(BUILTIN_C)
+../directx.a: $(BUILTIN_C)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/downmix.so: $(PLUGIN_DOWNMIX)
+../downmix.so: $(PLUGIN_DOWNMIX)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/downmix.a: $(BUILTIN_DOWNMIX)
+../downmix.a: $(BUILTIN_DOWNMIX)
ar r $@ $^
$(RANLIB) $@
-../../plugins/downmixsse.so: $(PLUGIN_DOWNMIXSSE)
+../downmixsse.so: $(PLUGIN_DOWNMIXSSE)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/downmixsse.a: $(BUILTIN_DOWNMIXSSE)
+../downmixsse.a: $(BUILTIN_DOWNMIXSSE)
ar r $@ $^
$(RANLIB) $@
-../../plugins/downmix3dn.so: $(PLUGIN_DOWNMIX3DN)
+../downmix3dn.so: $(PLUGIN_DOWNMIX3DN)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/downmix3dn.a: $(BUILTIN_DOWNMIX3DN)
+../downmix3dn.a: $(BUILTIN_DOWNMIX3DN)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/dsp.so: $(PLUGIN_C)
+../dsp.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/dsp.a: $(BUILTIN_C)
+../dsp.a: $(BUILTIN_C)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/null.so: $(PLUGIN_NULL)
+../null.so: $(PLUGIN_NULL)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/null.a: $(BUILTIN_NULL)
+../null.a: $(BUILTIN_NULL)
ar r $@ $^
$(RANLIB) $@
-../../plugins/dummy.so: $(PLUGIN_DUMMY)
+../dummy.so: $(PLUGIN_DUMMY)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/dummy.a: $(BUILTIN_DUMMY)
+../dummy.a: $(BUILTIN_DUMMY)
ar r $@ $^
$(RANLIB) $@
# Objects
#
-PLUGIN_DVD = dvd.o input_dvd.o dvd_netlist.o dvd_ifo.o dvd_udf.o dvd_summary.o
+PLUGIN_DVD = dvd.o input_dvd.o dvd_netlist.o dvd_ifo.o dvd_udf.o dvd_summary.o $(OBJ_DVD)
BUILTIN_DVD = $(PLUGIN_DVD:%.o=BUILTIN_%.o)
ALL_OBJ = $(PLUGIN_DVD) $(BUILTIN_DVD)
#
ifeq (1,$(LOCAL_LIBDVDCSS))
-../../plugins/dvd.so: libdvdcss $(PLUGIN_DVD)
+../dvd.so: libdvdcss $(PLUGIN_DVD)
$(CC) $(PCFLAGS) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN)
-../../plugins/dvd.a: libdvdcss $(BUILTIN_DVD)
+../dvd.a: libdvdcss $(BUILTIN_DVD)
ar r $@ $(BUILTIN_DVD)
$(RANLIB) $@
else
-../../plugins/dvd.so: $(PLUGIN_DVD)
+../dvd.so: $(PLUGIN_DVD)
$(CC) $(PCFLAGS) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN)
-../../plugins/dvd.a: $(BUILTIN_DVD)
+../dvd.a: $(BUILTIN_DVD)
ar r $@ $(BUILTIN_DVD)
$(RANLIB) $@
endif
--- /dev/null
+/*****************************************************************************
+ * dummy_dvdcss.c: Dummy libdvdcss with minimal DVD access.
+ *****************************************************************************
+ * Copyright (C) 2001 VideoLAN
+ * $Id: dummy_dvdcss.c,v 1.1 2001/08/06 13:28:00 sam Exp $
+ *
+ * Authors: Samuel Hocevar <sam@zoy.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#include "defs.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/uio.h> /* struct iovec */
+#include <sys/ioctl.h>
+
+#ifdef DVD_STRUCT_IN_LINUX_CDROM_H
+# include <netinet/in.h>
+# include <linux/cdrom.h>
+#else
+# error "building dummy libdvdcss on this system does not make sense !"
+#endif
+
+#include "config.h"
+#include "common.h"
+
+#include "dummy_dvdcss.h"
+
+/*****************************************************************************
+ * Local structure
+ *****************************************************************************/
+struct dvdcss_s
+{
+ /* File descriptor */
+ int i_fd;
+};
+
+/*****************************************************************************
+ * dvdcss_open: initialize library, open a DVD device, crack CSS key
+ *****************************************************************************/
+extern dvdcss_handle dummy_dvdcss_open ( char *psz_target, int i_flags )
+{
+ dvdcss_handle dvdcss;
+ dvd_struct dvd;
+
+ /* Allocate the library structure */
+ dvdcss = malloc( sizeof( struct dvdcss_s ) );
+ if( dvdcss == NULL )
+ {
+ fprintf( stderr, "dvd error: "
+ "dummy libdvdcss could not allocate memory\n" );
+ return NULL;
+ }
+
+ /* Open the device */
+ dvdcss->i_fd = open( psz_target, 0 );
+ if( dvdcss->i_fd < 0 )
+ {
+ fprintf( stderr, "dvd error: "
+ "dummy libdvdcss could not open device\n" );
+ free( dvdcss );
+ return NULL;
+ }
+
+ /* Check for encryption or ioctl failure */
+ dvd.type = DVD_STRUCT_COPYRIGHT;
+ dvd.copyright.layer_num = 0;
+ if( ioctl( dvdcss->i_fd, DVD_READ_STRUCT, &dvd ) != 0
+ || dvd.copyright.cpst )
+ {
+ fprintf( stderr, "dvd error: "
+ "dummy libdvdcss could not decrypt disc\n" );
+ close( dvdcss->i_fd );
+ free( dvdcss );
+ return NULL;
+ }
+
+ return dvdcss;
+}
+
+/*****************************************************************************
+ * dvdcss_error: return the last libdvdcss error message
+ *****************************************************************************/
+extern char * dummy_dvdcss_error ( dvdcss_handle dvdcss )
+{
+ return "unknown error";
+}
+
+/*****************************************************************************
+ * dvdcss_seek: seek into the device
+ *****************************************************************************/
+extern int dummy_dvdcss_seek ( dvdcss_handle dvdcss, int i_blocks )
+{
+ off_t i_read;
+
+ i_read = lseek( dvdcss->i_fd,
+ (off_t)i_blocks * (off_t)DVDCSS_BLOCK_SIZE, SEEK_SET );
+
+ return i_read / DVDCSS_BLOCK_SIZE;
+}
+
+/*****************************************************************************
+ * dvdcss_title: crack the current title key if needed
+ *****************************************************************************/
+extern int dummy_dvdcss_title ( dvdcss_handle dvdcss, int i_block )
+{
+ return 0;
+}
+
+/*****************************************************************************
+ * dvdcss_read: read data from the device, decrypt if requested
+ *****************************************************************************/
+extern int dummy_dvdcss_read ( dvdcss_handle dvdcss, void *p_buffer,
+ int i_blocks,
+ int i_flags )
+{
+ int i_bytes;
+
+ i_bytes = read( dvdcss->i_fd, p_buffer,
+ (size_t)i_blocks * DVDCSS_BLOCK_SIZE );
+
+ return i_bytes / DVDCSS_BLOCK_SIZE;
+}
+
+/*****************************************************************************
+ * dvdcss_readv: read data to an iovec structure, decrypt if reaquested
+ *****************************************************************************/
+extern int dummy_dvdcss_readv ( dvdcss_handle dvdcss, void *p_iovec,
+ int i_blocks,
+ int i_flags )
+{
+ int i_read;
+
+ i_read = readv( dvdcss->i_fd, (struct iovec*)p_iovec, i_blocks );
+
+ return i_read / DVDCSS_BLOCK_SIZE;
+}
+
+/*****************************************************************************
+ * dvdcss_close: close the DVD device and clean up the library
+ *****************************************************************************/
+extern int dummy_dvdcss_close ( dvdcss_handle dvdcss )
+{
+ int i_ret;
+
+ i_ret = close( dvdcss->i_fd );
+
+ if( i_ret < 0 )
+ {
+ return i_ret;
+ }
+
+ free( dvdcss );
+
+ return 0;
+}
+
--- /dev/null
+/*****************************************************************************
+ * dummy_dvdcss.h: Dummy libdvdcss header.
+ *****************************************************************************
+ * Copyright (C) 2001 VideoLAN
+ * $Id: dummy_dvdcss.h,v 1.1 2001/08/06 13:28:00 sam Exp $
+ *
+ * Authors: Samuel Hocevar <sam@zoy.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * The libdvdcss structure
+ *****************************************************************************/
+typedef struct dvdcss_s* dvdcss_handle;
+
+/*****************************************************************************
+ * Flags
+ *****************************************************************************/
+#define DVDCSS_NOFLAGS 0
+
+#define DVDCSS_INIT_QUIET (1 << 0)
+#define DVDCSS_INIT_DEBUG (1 << 1)
+
+#define DVDCSS_READ_DECRYPT (1 << 0)
+
+#define DVDCSS_BLOCK_SIZE 2048
+
+/*****************************************************************************
+ * Exported prototypes
+ *****************************************************************************/
+dvdcss_handle dummy_dvdcss_open ( char *, int i_flags );
+int dummy_dvdcss_close ( dvdcss_handle );
+int dummy_dvdcss_title ( dvdcss_handle, int );
+int dummy_dvdcss_seek ( dvdcss_handle, int );
+int dummy_dvdcss_read ( dvdcss_handle, void *, int, int );
+int dummy_dvdcss_readv ( dvdcss_handle, void *, int, int );
+char * dummy_dvdcss_error ( dvdcss_handle );
+
+/*****************************************************************************
+ * Pointers which will be filled either with dummy_dvdcss functions or
+ * with the dlopen()ed ones.
+ *****************************************************************************/
+dvdcss_handle (* dvdcss_open ) ( char *, int i_flags );
+int (* dvdcss_close ) ( dvdcss_handle );
+int (* dvdcss_title ) ( dvdcss_handle, int );
+int (* dvdcss_seek ) ( dvdcss_handle, int );
+int (* dvdcss_read ) ( dvdcss_handle, void *, int, int );
+int (* dvdcss_readv ) ( dvdcss_handle, void *, int, int );
+char * (* dvdcss_error ) ( dvdcss_handle );
+
* dvd.c : DVD input module for vlc
*****************************************************************************
* Copyright (C) 2000 VideoLAN
- * $Id: dvd.c,v 1.11 2001/07/27 01:05:17 sam Exp $
+ * $Id: dvd.c,v 1.12 2001/08/06 13:28:00 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
#include <stdlib.h> /* malloc(), free() */
#include <string.h> /* strdup() */
+#ifdef GOD_DAMN_DMCA
+# include <dlfcn.h>
+# include "dummy_dvdcss.h"
+#endif
+
#include "config.h"
#include "common.h" /* boolean_t, byte_t */
#include "threads.h"
#include "mtime.h"
+#include "intf_msg.h"
+
#include "modules.h"
#include "modules_export.h"
*****************************************************************************/
void _M( input_getfunctions )( function_list_t * p_function_list );
+/*****************************************************************************
+ * Local prototypes.
+ *****************************************************************************/
+#ifdef GOD_DAMN_DMCA
+static void *p_libdvdcss;
+static void ProbeLibDVDCSS ( void );
+static void UnprobeLibDVDCSS( void );
+#endif
+
/*****************************************************************************
* Build configuration tree.
*****************************************************************************/
MODULE_INIT_START
p_module->i_capabilities = MODULE_CAPABILITY_NULL
| MODULE_CAPABILITY_INPUT;
- p_module->psz_longname = "DVD input module, uses libdvdcss";
+#ifdef GOD_DAMN_DMCA
+ p_module->psz_longname = "DVD input module, uses libdvdcss if present";
+#else
+ p_module->psz_longname = "DVD input module, linked with libdvdcss";
+#endif
MODULE_INIT_STOP
MODULE_ACTIVATE_START
_M( input_getfunctions )( &p_module->p_functions->input );
+#ifdef GOD_DAMN_DMCA
+ ProbeLibDVDCSS();
+#endif
MODULE_ACTIVATE_STOP
MODULE_DEACTIVATE_START
+#ifdef GOD_DAMN_DMCA
+ UnprobeLibDVDCSS();
+#endif
MODULE_DEACTIVATE_STOP
+
+/* Following functions are local */
+
+#ifdef GOD_DAMN_DMCA
+/*****************************************************************************
+ * ProbeLibDVDCSS: look for a libdvdcss object.
+ *****************************************************************************
+ * This functions looks for libdvdcss, using dlopen(), and fills function
+ * pointers with what it finds. On failure, uses the dummy libdvdcss
+ * replacement provided by vlc.
+ *****************************************************************************/
+static void ProbeLibDVDCSS( void )
+{
+ char *pp_filelist[4] = { "libdvdcss.so.0",
+ "./libdvdcss.so.0",
+ "./lib/libdvdcss.so.0",
+ NULL };
+ char **pp_file = pp_filelist;
+
+ /* Try to open the dynamic object */
+ do
+ {
+ p_libdvdcss = dlopen( *pp_file, RTLD_LAZY );
+ if( p_libdvdcss != NULL )
+ {
+ intf_WarnMsg( 2, "module: builtin module `dvd' found libdvdcss "
+ "in `%s'", *pp_file );
+ break;
+ }
+ pp_file++;
+
+ } while( *pp_file != NULL );
+
+ /* If libdvdcss.so was found, check that it's valid */
+ if( p_libdvdcss == NULL )
+ {
+ intf_ErrMsg( "dvd warning: libdvdcss.so.0 not present" );
+ }
+ else
+ {
+ /* Check for libdvdcss 0.0.1 */
+ if( dlsym( p_libdvdcss, "dvdcss_crack" ) != NULL )
+ {
+ intf_ErrMsg( "dvd warning: libdvdcss.so.0 has deprecated symbol "
+ "dvdcss_crack(), please upgrade" );
+ dlclose( p_libdvdcss );
+ p_libdvdcss = NULL;
+ }
+ else
+ {
+ dvdcss_open = dlsym( p_libdvdcss, "dvdcss_open" );
+ dvdcss_close = dlsym( p_libdvdcss, "dvdcss_close" );
+ dvdcss_title = dlsym( p_libdvdcss, "dvdcss_title" );
+ dvdcss_seek = dlsym( p_libdvdcss, "dvdcss_seek" );
+ dvdcss_read = dlsym( p_libdvdcss, "dvdcss_read" );
+ dvdcss_readv = dlsym( p_libdvdcss, "dvdcss_readv" );
+ dvdcss_error = dlsym( p_libdvdcss, "dvdcss_error" );
+
+ if( dvdcss_open == NULL || dvdcss_close == NULL
+ || dvdcss_title == NULL || dvdcss_seek == NULL
+ || dvdcss_read == NULL || dvdcss_readv == NULL
+ || dvdcss_error == NULL )
+ {
+ intf_ErrMsg( "dvd warning: missing symbols in libdvdcss.so.0, "
+ "please upgrade libdvdcss or vlc" );
+ dlclose( p_libdvdcss );
+ p_libdvdcss = NULL;
+ }
+ }
+ }
+
+ /* If libdvdcss was not found or was not valid, use the dummy
+ * replacement functions. */
+ if( p_libdvdcss == NULL )
+ {
+ intf_ErrMsg( "dvd warning: no valid libdvdcss found, "
+ "I will only play unencrypted DVDs" );
+
+ dvdcss_open = dummy_dvdcss_open;
+ dvdcss_close = dummy_dvdcss_close;
+ dvdcss_title = dummy_dvdcss_title;
+ dvdcss_seek = dummy_dvdcss_seek;
+ dvdcss_read = dummy_dvdcss_read;
+ dvdcss_readv = dummy_dvdcss_readv;
+ dvdcss_error = dummy_dvdcss_error;
+ }
+}
+
+/*****************************************************************************
+ * UnprobeLibDVDCSS: free resources allocated by ProbeLibDVDCSS, if any.
+ *****************************************************************************/
+static void UnprobeLibDVDCSS( void )
+{
+ if( p_libdvdcss != NULL )
+ {
+ dlclose( p_libdvdcss );
+ p_libdvdcss = NULL;
+ }
+}
+#endif
+
* dvd_ifo.c: Functions for ifo parsing
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: dvd_ifo.c,v 1.35 2001/07/25 08:41:21 gbazin Exp $
+ * $Id: dvd_ifo.c,v 1.36 2001/08/06 13:28:00 sam Exp $
*
* Authors: Stéphane Borel <stef@via.ecp.fr>
* German Tischler <tanis@gaspode.franken.de>
#include <string.h>
#include <fcntl.h>
-#include <videolan/dvdcss.h>
+#ifdef GOD_DAMN_DMCA
+# include "dummy_dvdcss.h"
+#else
+# include <videolan/dvdcss.h>
+#endif
#include "config.h"
#include "common.h"
* sizeof(parental_mask_t) );
if( PARINF.p_parental_mask == NULL )
{
- intf_ErrMsg( "ifo erro: out of memory in IfoInit" );
+ intf_ErrMsg( "ifo error: out of memory in IfoInit" );
return -1;
}
VTSINF.p_vts_attr = malloc( VTSINF.i_vts_nb * sizeof(vts_attr_t) );
if( VTSINF.p_vts_attr == NULL )
{
- intf_ErrMsg( "ifo erro: out of memory in IfoInit" );
+ intf_ErrMsg( "ifo error: out of memory in IfoInit" );
return -1;
}
* found in .ifo.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: dvd_summary.c,v 1.7 2001/07/27 01:05:17 sam Exp $
+ * $Id: dvd_summary.c,v 1.8 2001/08/06 13:28:00 sam Exp $
*
* Author: Stéphane Borel <stef@via.ecp.fr>
*
#endif
#include <errno.h>
-#include <videolan/dvdcss.h>
+#ifdef GOD_DAMN_DMCA
+# include "dummy_dvdcss.h"
+#else
+# include <videolan/dvdcss.h>
+#endif
#include "config.h"
#include "common.h"
* contains the basic udf handling functions
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: dvd_udf.c,v 1.12 2001/07/27 01:05:17 sam Exp $
+ * $Id: dvd_udf.c,v 1.13 2001/08/06 13:28:00 sam Exp $
*
* Author: Stéphane Borel <stef@via.ecp.fr>
*
# include <strings.h>
#endif
-#include <videolan/dvdcss.h>
+#ifdef GOD_DAMN_DMCA
+# include "dummy_dvdcss.h"
+#else
+# include <videolan/dvdcss.h>
+#endif
#include "config.h"
#include "common.h"
* -dvd_udf to find files
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: input_dvd.c,v 1.83 2001/07/30 18:56:35 gbazin Exp $
+ * $Id: input_dvd.c,v 1.84 2001/08/06 13:28:00 sam Exp $
*
* Author: Stéphane Borel <stef@via.ecp.fr>
*
# include <sys/uio.h> /* struct iovec */
#endif
-#include <videolan/dvdcss.h>
+#ifdef GOD_DAMN_DMCA
+# include "dummy_dvdcss.h"
+#else
+# include <videolan/dvdcss.h>
+#endif
#include "config.h"
#include "common.h"
# Real targets
#
-../../plugins/esd.so: $(PLUGIN_C)
+../esd.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_ESD)
-../../plugins/esd.a: $(BUILTIN_C)
+../esd.a: $(BUILTIN_C)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/fb.so: $(PLUGIN_C)
+../fb.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/fb.a: $(BUILTIN_C)
+../fb.a: $(BUILTIN_C)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/ggi.so: $(PLUGIN_C)
+../ggi.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GGI)
-../../plugins/ggi.a: $(BUILTIN_C)
+../ggi.a: $(BUILTIN_C)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/glide.so: $(PLUGIN_GLIDE)
+../glide.so: $(PLUGIN_GLIDE)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GLIDE)
-../../plugins/glide.a: $(BUILTIN_GLIDE)
+../glide.a: $(BUILTIN_GLIDE)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/gtk.so: $(PLUGIN_GTK) $(PLUGIN_GTK_SPECIFIC)
+../gtk.so: $(PLUGIN_GTK) $(PLUGIN_GTK_SPECIFIC)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GTK)
-../../plugins/gtk.a: $(BUILTIN_GTK)
+../gtk.a: $(BUILTIN_GTK)
ar r $@ $^
$(RANLIB) $@
-../../plugins/gnome.so: $(PLUGIN_GNOME) $(PLUGIN_GNOME_SPECIFIC)
+../gnome.so: $(PLUGIN_GNOME) $(PLUGIN_GNOME_SPECIFIC)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GNOME)
-../../plugins/gnome.a: $(BUILTIN_GNOME)
+../gnome.a: $(BUILTIN_GNOME)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/idct.so: $(PLUGIN_IDCT) $(PLUGIN_IDCTCOMMON) $(PLUGIN_VDECBLOCK_C)
+../idct.so: $(PLUGIN_IDCT) $(PLUGIN_IDCTCOMMON) $(PLUGIN_VDECBLOCK_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/idct.a: $(BUILTIN_IDCT)
+../idct.a: $(BUILTIN_IDCT)
ar r $@ $^
$(RANLIB) $@
-../../plugins/idctclassic.so: $(PLUGIN_IDCTCLASSIC) $(PLUGIN_IDCTCOMMON) $(PLUGIN_VDECBLOCK_C)
+../idctclassic.so: $(PLUGIN_IDCTCLASSIC) $(PLUGIN_IDCTCOMMON) $(PLUGIN_VDECBLOCK_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/idctclassic.a: $(BUILTIN_IDCTCLASSIC)
+../idctclassic.a: $(BUILTIN_IDCTCLASSIC)
ar r $@ $^
$(RANLIB) $@
-../../plugins/idctmmx.so: $(PLUGIN_IDCTMMX) $(PLUGIN_IDCTCOMMON) $(PLUGIN_VDECBLOCK_MMX)
+../idctmmx.so: $(PLUGIN_IDCTMMX) $(PLUGIN_IDCTCOMMON) $(PLUGIN_VDECBLOCK_MMX)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/idctmmx.a: $(BUILTIN_IDCTMMX)
+../idctmmx.a: $(BUILTIN_IDCTMMX)
ar r $@ $^
$(RANLIB) $@
-../../plugins/idctmmxext.so: $(PLUGIN_IDCTMMXEXT) $(PLUGIN_IDCTCOMMON) $(PLUGIN_VDECBLOCK_MMX)
+../idctmmxext.so: $(PLUGIN_IDCTMMXEXT) $(PLUGIN_IDCTCOMMON) $(PLUGIN_VDECBLOCK_MMX)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/idctmmxext.a: $(BUILTIN_IDCTMMXEXT)
+../idctmmxext.a: $(BUILTIN_IDCTMMXEXT)
ar r $@ $^
$(RANLIB) $@
-../../plugins/idctaltivec.so: $(PLUGIN_IDCTALTIVEC) $(PLUGIN_IDCTCOMMON) $(PLUGIN_VDECBLOCK_C)
+../idctaltivec.so: $(PLUGIN_IDCTALTIVEC) $(PLUGIN_IDCTCOMMON) $(PLUGIN_VDECBLOCK_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_IDCTALTIVEC)
-../../plugins/idctaltivec.a: $(BUILTIN_IDCTALTIVEC)
+../idctaltivec.a: $(BUILTIN_IDCTALTIVEC)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/imdct.so: $(PLUGIN_IMDCT) $(PLUGIN_IMDCTCOMMON)
+../imdct.so: $(PLUGIN_IMDCT) $(PLUGIN_IMDCTCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/imdct.a: $(BUILTIN_IMDCT)
+../imdct.a: $(BUILTIN_IMDCT)
ar r $@ $^
$(RANLIB) $@
-../../plugins/imdctsse.so: $(PLUGIN_IMDCTSSE) $(PLUGIN_IMDCTCOMMON)
+../imdctsse.so: $(PLUGIN_IMDCTSSE) $(PLUGIN_IMDCTCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/imdctsse.a: $(BUILTIN_IMDCTSSE)
+../imdctsse.a: $(BUILTIN_IMDCTSSE)
ar r $@ $^
$(RANLIB) $@
-../../plugins/imdct3dn.so: $(PLUGIN_IMDCT3DN) $(PLUGIN_IMDCTCOMMON)
+../imdct3dn.so: $(PLUGIN_IMDCT3DN) $(PLUGIN_IMDCTCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/imdct3dn.a: $(BUILTIN_IMDCT3DN)
+../imdct3dn.a: $(BUILTIN_IMDCT3DN)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/kde.so: $(PLUGIN_KDE) $(PLUGIN_KDE_MOC)
+../kde.so: $(PLUGIN_KDE) $(PLUGIN_KDE_MOC)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_KDE)
-../../plugins/kde.a: $(BUILTIN_KDE) $(BUILTIN_KDE_MOC)
+../kde.a: $(BUILTIN_KDE) $(BUILTIN_KDE_MOC)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/macosx.so: $(PLUGIN_MACOSX)
+../macosx.so: $(PLUGIN_MACOSX)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_MACOSX)
-../../plugins/macosx.a: $(BUILTIN_MACOSX)
+../macosx.a: $(BUILTIN_MACOSX)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/mga.so: $(PLUGIN_C)
+../mga.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/mga.a: $(BUILTIN_C)
+../mga.a: $(BUILTIN_C)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/motion.so: $(PLUGIN_MOTION) $(PLUGIN_MOTIONCOMMON)
+../motion.so: $(PLUGIN_MOTION) $(PLUGIN_MOTIONCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/motion.a: $(BUILTIN_MOTION)
+../motion.a: $(BUILTIN_MOTION)
ar r $@ $^
$(RANLIB) $@
-../../plugins/motionclassic.so: $(PLUGIN_MOTIONCLASSIC) $(PLUGIN_MOTIONCOMMON)
+../motionclassic.so: $(PLUGIN_MOTIONCLASSIC) $(PLUGIN_MOTIONCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/motionclassic.a: $(BUILTIN_MOTIONCLASSIC)
+../motionclassic.a: $(BUILTIN_MOTIONCLASSIC)
ar r $@ $^
$(RANLIB) $@
-../../plugins/motionmmx.so: $(PLUGIN_MOTIONMMX) $(PLUGIN_MOTIONCOMMON)
+../motionmmx.so: $(PLUGIN_MOTIONMMX) $(PLUGIN_MOTIONCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/motionmmx.a: $(BUILTIN_MOTIONMMX)
+../motionmmx.a: $(BUILTIN_MOTIONMMX)
ar r $@ $^
$(RANLIB) $@
-../../plugins/motionmmxext.so: $(PLUGIN_MOTIONMMXEXT) $(PLUGIN_MOTIONCOMMON)
+../motionmmxext.so: $(PLUGIN_MOTIONMMXEXT) $(PLUGIN_MOTIONCOMMON)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/motionmmxext.a: $(BUILTIN_MOTIONMMXEXT)
+../motionmmxext.a: $(BUILTIN_MOTIONMMXEXT)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/es.so: $(PLUGIN_ES)
+../es.so: $(PLUGIN_ES)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/es.a: $(BUILTIN_ES)
+../es.a: $(BUILTIN_ES)
ar r $@ $^
$(RANLIB) $@
-../../plugins/ps.so: $(PLUGIN_PS)
+../ps.so: $(PLUGIN_PS)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/ps.a: $(BUILTIN_PS)
+../ps.a: $(BUILTIN_PS)
ar r $@ $^
$(RANLIB) $@
-../../plugins/ts.so: $(PLUGIN_TS)
+../ts.so: $(PLUGIN_TS)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_TS)
-../../plugins/ts.a: $(BUILTIN_TS)
+../ts.a: $(BUILTIN_TS)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/qnx.so: $(PLUGIN_C)
+../qnx.so: $(PLUGIN_C)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_QNX)
-../../plugins/qnx.a: $(BUILTIN_C)
+../qnx.a: $(BUILTIN_C)
ar r $@ $^
# Real targets
#
-../../plugins/qt.so: $(PLUGIN_QT)
+../qt.so: $(PLUGIN_QT)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_QT)
-../../plugins/qt.a: $(BUILTIN_QT)
+../qt.a: $(BUILTIN_QT)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/sdl.so: $(PLUGIN_SDL)
+../sdl.so: $(PLUGIN_SDL)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_SDL)
-../../plugins/sdl.a: $(BUILTIN_SDL)
+../sdl.a: $(BUILTIN_SDL)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/ncurses.so: $(PLUGIN_NCURSES)
+../ncurses.so: $(PLUGIN_NCURSES)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_NCURSES)
-../../plugins/ncurses.a: $(BUILTIN_NCURSES)
+../ncurses.a: $(BUILTIN_NCURSES)
ar r $@ $^
$(RANLIB) $@
-../../plugins/rc.so: $(PLUGIN_RC)
+../rc.so: $(PLUGIN_RC)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/rc.a: $(BUILTIN_RC)
+../rc.a: $(BUILTIN_RC)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/x11.so: $(PLUGIN_X11)
+../x11.so: $(PLUGIN_X11)
ifeq ($(SYS),nto-qnx)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_X11) -lsocket
else
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_X11)
endif
-../../plugins/x11.a: $(BUILTIN_X11)
+../x11.a: $(BUILTIN_X11)
ar r $@ $^
$(RANLIB) $@
-../../plugins/xvideo.so: $(PLUGIN_XVIDEO)
+../xvideo.so: $(PLUGIN_XVIDEO)
ifeq ($(SYS),nto-qnx)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_XVIDEO) -lsocket
else
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_XVIDEO)
endif
-../../plugins/xvideo.a: $(BUILTIN_XVIDEO)
+../xvideo.a: $(BUILTIN_XVIDEO)
ar r $@ $^
$(RANLIB) $@
# Real targets
#
-../../plugins/yuv.so: $(PLUGIN_YUV)
+../yuv.so: $(PLUGIN_YUV)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_YUV)
-../../plugins/yuv.a: $(BUILTIN_YUV)
+../yuv.a: $(BUILTIN_YUV)
ar r $@ $^
$(RANLIB) $@
-../../plugins/yuvmmx.so: $(PLUGIN_YUVMMX)
+../yuvmmx.so: $(PLUGIN_YUVMMX)
$(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS)
-../../plugins/yuvmmx.a: $(BUILTIN_YUVMMX)
+../yuvmmx.a: $(BUILTIN_YUVMMX)
ar r $@ $^
$(RANLIB) $@
Name: vlc
Version: 0.2.81
Release: 1
-Copyright: GPL
+License: GPL
Url: http://www.videolan.org/
Group: X11/Applications/Graphics
Source0: http://www.videolan.org/packages/0.2.81/vlc-0.2.81.tar.gz
projects / vlc / commitdiff