Commit 460360a8 authored by Sam Hocevar's avatar Sam Hocevar

  * Added a dummy libdvdcss so that the DVD plugin can be used without
    libdvdcss. It will try to dlopen() libdvdcss at runtime, though,
    and will use the dummy functions only if it couldn't find a valid
    libdvdcss. This is probably only useful to package maintainers.

  * Tidied the snapshot-* Makefile rules.
  * Tidied the modules Makefiles.
  * Removed useless stuff in the debian/ directory.
  * Removed the "make all" kludge in the Makefile.opts rule. I hope this
    patch is harmless on all systems.
parent f82f7f25
......@@ -125,6 +125,7 @@ D: Bug fixes
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
......
......@@ -87,6 +87,13 @@ ifneq (,$(BUILTINS))
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
......@@ -97,21 +104,37 @@ 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 \
......@@ -133,6 +156,9 @@ distclean: clean
rm -Rf .dep
rm -f .gdb_history
#
# Install/uninstall rules
#
install: libdvdcss-install vlc-install plugins-install
uninstall: libdvdcss-uninstall vlc-uninstall plugins-uninstall
......@@ -164,94 +190,98 @@ ifneq (,$(PLUGINS))
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:#' \
......@@ -259,32 +289,22 @@ libdvdcss-snapshot: clean Makefile.opts
-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
......@@ -305,13 +325,6 @@ endif
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)
#
......@@ -329,16 +342,14 @@ ifneq (,$(BUILTINS))
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
......@@ -359,7 +370,7 @@ endif
#
# 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
......@@ -371,14 +382,14 @@ endif
#
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
......
......@@ -3,6 +3,8 @@
# (c)1998 VideoLAN
###############################################################################
HAVE_MAKEFILE_OPTS = 1
###############################################################################
# Configuration
###############################################################################
......@@ -96,6 +98,7 @@ CFLAGS_X11 = @CFLAGS_X11@
#
# Other special cases
#
OBJ_DVD = @OBJ_DVD@
LOCAL_LIBDVDCSS = @LOCAL_LIBDVDCSS@
###############################################################################
......
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.
......@@ -30,9 +30,7 @@ ac_help="$ac_help
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
......@@ -515,7 +513,7 @@ echo > confdefs.h
# 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
......@@ -613,7 +611,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
echo "configure:617: checking host system type" >&5
echo "configure:615: checking host system type" >&5
host_alias=$host
case "$host_alias" in
......@@ -634,17 +632,26 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
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
......@@ -673,7 +680,7 @@ fi
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure: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
......@@ -703,7 +710,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure: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
......@@ -754,7 +761,7 @@ fi
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure: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
......@@ -786,7 +793,7 @@ fi
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.
......@@ -797,12 +804,12 @@ cross_compiling=$ac_cv_prog_cc_cross
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
......@@ -828,12 +835,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
echo "configure: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
......@@ -842,7 +849,7 @@ 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
......@@ -861,7 +868,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
echo "configure: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
......@@ -893,7 +900,7 @@ 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=
......@@ -908,13 +915,13 @@ else
# 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
:
......@@ -925,13 +932,13 @@ else
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
:
......@@ -942,13 +949,13 @@ else
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
:
......@@ -975,7 +982,7 @@ echo "$ac_t""$CPP" 1>&6
# 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
......@@ -1015,7 +1022,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.