Changeset a0c1805bd992c0ae1fa018156358d831fbaf8f93

Timestamp:

03/15/01 02:42:20 (7 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 984620540 +0000

git-parent:

[93ca3031ee75338ae1eb922b74cbfe7ee0dc66b8]

git-author:

Sam Hocevar <sam@videolan.org> 984620540 +0000

Message:

• Bug fixes and enhancements in the Gtk+/Gnome interfaces.
  

o the slider should behave correctly and stop jumping here and

there (this bug is _not_ related to Stef's similar bug)

o added an "open network" menu (useless since the input doesn't

handle it properly yet)

o tried to reorganize gnome_callbacks.c and gtk_callbacks.c
o stream date is now displayed instead of percentage
o renamed gnome_sys.h to intf_gnome.h, and gtk_sys.h to intf_gtk.h

• Changed documentation and package creation files.
  

o added versioned conflicts/replaces to vlc-gtk (Closes Debian bug #88796)
o removed useless or outdated documentation from doc/*
o moved vlc.1 manpage from debian/vlc.1 to doc/vlc.1

• Added basic Qt interface.
  

o working features: slide bar, open file, toolbar, popup menu
o added "qvlc" alias, equivalent to "vlc -I qt"
o known issues : no "open disc" or "open network" menus yet

the IntfWindow? class is never cleaned on destruction
the popup menu always pop at the middle of the screen

• Misc fixes/updates.
  

o renamed netutils.h functions from input_* to network_*
o renamed *plst* files and functions to *playlist* (it was stupid

from me to name them "plst")

o made a few input error messages more meaningful
o added -I, -A and -V short flags, corresponding to --intf, --audio

and --video

I got a lot of conflicts on this commit, lart me if I forgot a

file or made old bugs reappear.

Files:

• INSTALL (modified) (1 diff)
• Makefile.in (modified) (9 diffs)
• configure (modified) (136 diffs)
• configure.in (modified) (3 diffs)
• debian/changelog (modified) (1 diff)
• debian/changelog-css (modified) (1 diff)
• debian/control (modified) (2 diffs)
• debian/control-css (modified) (1 diff)
• debian/rules (modified) (5 diffs)
• debian/vlc.1 (deleted)
• doc/bugs (deleted)
• doc/headers (deleted)
• doc/portage (deleted)
• doc/vlan-server (deleted)
• doc/vlc.1 (added)
• include/intf_playlist.h (added)
• include/intf_plst.h (deleted)
• include/netutils.h (modified) (2 diffs)
• include/tests.h (modified) (1 diff)
• plugins/beos/intf_beos.cpp (modified) (4 diffs)
• plugins/gnome/gnome_callbacks.c (modified) (14 diffs)
• plugins/gnome/gnome_callbacks.h (modified) (2 diffs)
• plugins/gnome/gnome_interface.c (modified) (16 diffs)
• plugins/gnome/gnome_interface.h (modified) (1 diff)
• plugins/gnome/gnome_sys.h (deleted)
• plugins/gnome/intf_gnome.c (modified) (15 diffs)
• plugins/gnome/intf_gnome.glade (modified) (12 diffs)
• plugins/gnome/intf_gnome.h (added)
• plugins/gtk/gtk_callbacks.c (modified) (12 diffs)
• plugins/gtk/gtk_callbacks.h (modified) (2 diffs)
• plugins/gtk/gtk_interface.c (modified) (21 diffs)
• plugins/gtk/gtk_interface.h (modified) (1 diff)
• plugins/gtk/gtk_playlist.c (modified) (14 diffs)
• plugins/gtk/gtk_sys.h (deleted)
• plugins/gtk/intf_gtk.c (modified) (16 diffs)
• plugins/gtk/intf_gtk.glade (modified) (12 diffs)
• plugins/gtk/intf_gtk.h (added)
• plugins/mpeg/input_ps.c (modified) (2 diffs)
• plugins/qt/.cvsignore (added)
• plugins/qt/intf_qt.cpp (added)
• plugins/qt/qt.cpp (added)
• src/input/input.c (modified) (5 diffs)
• src/input/input_ext-intf.c (modified) (1 diff)
• src/input/input_programs.c (modified) (4 diffs)
• src/input/mpeg_system.c (modified) (2 diffs)
• src/interface/interface.c (modified) (2 diffs)
• src/interface/intf_playlist.c (added)
• src/interface/intf_plst.c (deleted)
• src/interface/main.c (modified) (15 diffs)
• src/misc/netutils.c (modified) (5 diffs)

INSTALL

@@ -13 +13 @@
-Then, run `make' to build vlc.
-
-lean
+omplete
-
-   make distclean 2>/dev/null ; ./configure --prefix=/usr --enable-gnome \
-      --enable-fb --with-glide --with-ggi --with-sdl --enable-esd \
-
+
+
+
+
+
+
+
+
-
-

Makefile.in

@@ -191 +191 @@
-        src/interface/intf_cmd.o \
-        src/interface/intf_ctrl.o \
-
+ayli
-        src/interface/intf_channels.o \
-        src/interface/intf_console.o \
@@ -335 +335 @@
-        plugins/gnome/gnome_support.o
-
+PLUGIN_QT = plugins/qt/qt.o \
+        plugins/qt/intf_qt.o
+
-PLUGIN_KDE =    plugins/kde/kde.o \
-
-
+
-
-PLUGIN_IDCT =   plugins/idct/idct.o \
@@ -432 +434 @@
-NONSTD_CPP_PLUGIN_OBJ = \
-        $(PLUGIN_BEOS) \
+        $(PLUGIN_QT) \
-        $(PLUGIN_KDE)
-
@@ -457 +460 @@
-    rm -f $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) $(STD_PLUGIN_OBJ)
-    rm -f plugins/*/*.o src/*/*.o lib/*.so
-kvlc g
+gvlc kvlc q
-
-distclean: clean
@@ -495 +498 @@
-    rm -rf /tmp/vlc-@VLC_VERSION@* /tmp/vlc-@VLC_VERSION@nocss*
-    # copy archive in /tmp
-^
+
-        do mkdir -p /tmp/vlc-@VLC_VERSION@/$$i ; \
-    done
@@ -535 +538 @@
-# the namespace
-#
-
+ qvlc
-    rm -f $@ && ln -s vlc $@
-
@@ -570 +573 @@
-$(PLUGIN_GTK): %.o: .dep/%.d
-$(PLUGIN_GTK): %.o: %.c
-lib-config --cflags glib` `g
+
-
-$(PLUGIN_GNOME): %.o: Makefile.dep
-$(PLUGIN_GNOME): %.o: .dep/%.d
-$(PLUGIN_GNOME): %.o: %.c
-lib-config --cflags glib` `gnome-config --cflags
+nome-config --cflags gtk
-
-$(PLUGIN_GLIDE): %.o: Makefile.dep
@@ -581 +584 @@
-$(PLUGIN_GLIDE): %.o: %.c
-    $(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/glide -c -o $@ $<
+
+$(PLUGIN_QT): %.o: Makefile.dep
+$(PLUGIN_QT): %.o: .dep/%.dpp
+$(PLUGIN_QT): %.o: %.moc
+    $(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/qt -c -o $@ $(<:%.moc=%.cpp)
+$(PLUGIN_QT:%.o=%.moc): %.moc: %.cpp
+    moc -i $< -o $@
-
-$(PLUGIN_KDE): %.o: Makefile.dep
@@ -622 +632 @@
-    $(CC) $(PCFLAGS) -shared -o $@ $^
-
+lib/qt.so: $(PLUGIN_QT)
+    $(CC) $(PCFLAGS) -shared -o $@ $^ -lqt
+
-lib/kde.so: $(PLUGIN_KDE)
-    $(CC) $(PCFLAGS) -shared -o $@ $^ -lkdeui -lkdecore -lqt -ldl

configure

@@ -42 +42 @@
-ac_help="$ac_help
-  --enable-ncurses        ncurses interface support (default disabled)"
+ac_help="$ac_help
+  --enable-qt             Qt interface support (default disabled)"
-ac_help="$ac_help
-  --enable-kde            KDE interface support (default disabled)"
@@ -590 +592 @@
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-3
+5
-
-host_alias=$host
@@ -617 +619 @@
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-0
+2
-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
@@ -647 +649 @@
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-0
+2
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -677 +679 @@
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-0
+2
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -728 +730 @@
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-1
+3
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -760 +762 @@
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-3
+5
-
-ac_ext=c
@@ -771 +773 @@
-cat > conftest.$ac_ext << EOF
-
-4
+6
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-79
+81
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
@@ -802 +804 @@
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-5
+7
-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
-0
+2
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -816 +818 @@
-#endif
-EOF
-19
+21
-  ac_cv_prog_gcc=yes
-else
@@ -835 +837 @@
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-38
+40
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -869 +871 @@
-if test -z "$CPP"; then
-  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-2
+4
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
@@ -884 +886 @@
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-7
+9
-#include "confdefs.h"
-#include <assert.h>
@@ -890 +892 @@
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-3
+5
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -901 +903 @@
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-4
+6
-#include "confdefs.h"
-#include <assert.h>
@@ -907 +909 @@
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-0
+2
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -918 +920 @@
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-1
+3
-#include "confdefs.h"
-#include <assert.h>
@@ -924 +926 @@
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-7
+9
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -962 +964 @@
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-5
+7
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
@@ -1016 +1018 @@
-
-echo $ac_n "checking for working const""... $ac_c" 1>&6
-19
+21
-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
-4
+6
-#include "confdefs.h"
-
@@ -1027 +1029 @@
-
-/* Ultrix mips cc rejects this.  */
- = {0,0}
+
-/* SunOS 4.1.1 cc rejects this.  */
-char const *const *ccp;
@@ -1070 +1072 @@
-; return 0; }
-EOF
-3
+5
-  rm -rf conftest*
-  ac_cv_c_const=yes
@@ -1091 +1093 @@
-
-echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-4
+6
-if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1098 +1100 @@
-# See if sys/param.h defines the BYTE_ORDER macro.
-cat > conftest.$ac_ext <<EOF
-1
+3
-#include "confdefs.h"
-#include <sys/types.h>
@@ -1109 +1111 @@
-; return 0; }
-EOF
-2
+4
-  rm -rf conftest*
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-cat > conftest.$ac_ext <<EOF
-6
+8
-#include "confdefs.h"
-#include <sys/types.h>
@@ -1124 +1126 @@
-; return 0; }
-EOF
-7
+9
-  rm -rf conftest*
-  ac_cv_c_bigendian=yes
@@ -1144 +1146 @@
-else
-  cat > conftest.$ac_ext <<EOF
-7
+9
-#include "confdefs.h"
-main () {
@@ -1157 +1159 @@
-}
-EOF
-0
+2
-then
-  ac_cv_c_bigendian=no
@@ -1182 +1184 @@
-
-echo $ac_n "checking whether compiler accepts bswap x86 instruction""... $ac_c" 1>&6
-5
+7
-cat > conftest.$ac_ext <<EOF
-7
+9
-#include "confdefs.h"
-unsigned int foo( unsigned int x )
@@ -1192 +1194 @@
-; return 0; }
-EOF
-5
+7
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
@@ -1209 +1211 @@
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-2
+4
-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
-7
+9
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
@@ -1237 +1239 @@
-; return 0; }
-EOF
-0
+2
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
@@ -1264 +1266 @@
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-7
+9
-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
-2
+4
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
@@ -1292 +1294 @@
-; return 0; }
-EOF
-5
+7
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
@@ -1317 +1319 @@
-
-echo $ac_n "checking for connect""... $ac_c" 1>&6
-0
+2
-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
-5
+7
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
@@ -1345 +1347 @@
-; return 0; }
-EOF
-48
+50
-  rm -rf conftest*
-  eval "ac_cv_func_connect=yes"
@@ -1363 +1365 @@
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-6
+8
-ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1371 +1373 @@
-LIBS="-lsocket  $LIBS"
-cat > conftest.$ac_ext <<EOF
-4
+6
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -1382 +1384 @@
-; return 0; }
-EOF
-5
+7
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1412 +1414 @@
-
-echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-5
+7
-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
-0
+2
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
@@ -1440 +1442 @@
-; return 0; }
-EOF
-3
+5
-  rm -rf conftest*
-  eval "ac_cv_func_gethostbyname=yes"
@@ -1458 +1460 @@
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-1
+3
-ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1466 +1468 @@
-LIBS="-lnsl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-69
+71
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -1477 +1479 @@
-; return 0; }
-EOF
-0
+2
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1507 +1509 @@
-
-echo $ac_n "checking for nanosleep""... $ac_c" 1>&6
-0
+2
-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
-5
+7
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
@@ -1535 +1537 @@
-; return 0; }
-EOF
-38
+40
-  rm -rf conftest*
-  eval "ac_cv_func_nanosleep=yes"
@@ -1553 +1555 @@
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6
-6
+8
-ac_lib_var=`echo rt'_'nanosleep | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1561 +1563 @@
-LIBS="-lrt  $LIBS"
-cat > conftest.$ac_ext <<EOF
-4
+6
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -1572 +1574 @@
-; return 0; }
-EOF
-5
+7
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1598 +1600 @@
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
-1
+3
-ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1606 +1608 @@
-LIBS="-lposix4  $LIBS"
-cat > conftest.$ac_ext <<EOF
-09
+11
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -1617 +1619 @@
-; return 0; }
-EOF
-0
+2
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1651 +1653 @@
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-4
+6
-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
-59
+61
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
@@ -1679 +1681 @@
-; return 0; }
-EOF
-2
+4
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
@@ -1704 +1706 @@
-
-echo $ac_n "checking for inet_aton""... $ac_c" 1>&6
-7
+9
-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
-2
+4
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
@@ -1732 +1734 @@
-; return 0; }
-EOF
-5
+7
-  rm -rf conftest*
-  eval "ac_cv_func_inet_aton=yes"
@@ -1750 +1752 @@
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
-3
+5
-ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1758 +1760 @@
-LIBS="-lresolv  $LIBS"
-cat > conftest.$ac_ext <<EOF
-1
+3
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -1769 +1771 @@
-; return 0; }
-EOF
-2
+4
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1801 +1803 @@
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-4
+6
-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
-09
+11
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
@@ -1829 +1831 @@
-; return 0; }
-EOF
-2
+4
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
@@ -1857 +1859 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-0
+2
-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
-5
+7
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-0
+2
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -1896 +1898 @@
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-899
+901
-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
-4
+6
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
@@ -1924 +1926 @@
-; return 0; }
-EOF
-7
+9
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
@@ -1949 +1951 @@
-
-echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-2
+4
-if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -1957 +1959 @@
-else
-  cat > conftest.$ac_ext <<EOF
-0
+2
-#include "confdefs.h"
-
@@ -1984 +1986 @@
-#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.  */
@@ -2047 +2046 @@
-     * First, make a file with some known garbage in it.
-     */
-(char*)
+
-    if (!data)
-        exit(1);
@@ -2068 +2067 @@
-    if (fd < 0)
-        exit(1);
-(char*)
+
-    if (!data2)
-        exit(1);
@@ -2086 +2085 @@
-    for (i = 0; i < pagesize; ++i)
-        *(data2 + i) = *(data2 + i) + 1;
-(char*)
+
-    if (!data3)
-        exit(1);
@@ -2100 +2099 @@
-
-EOF
-3
+2
-then
-  ac_cv_func_mmap_fixed_mapped=yes
@@ -2123 +2122 @@
-
-echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-6
+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
-1
+0
-#include "confdefs.h"
-#include <sys/types.h>
@@ -2145 +2144 @@
-; return 0; }
-EOF
-8
+7
-  rm -rf conftest*
-  ac_cv_type_signal=void
@@ -2164 +2163 @@
-
-echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-7
+6
-ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -2172 +2171 @@
-LIBS="-ldl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-5
+4
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -2183 +2182 @@
-; return 0; }
-EOF
-6
+5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -2211 +2210 @@
-
-echo $ac_n "checking for optarg in -lgnugetopt""... $ac_c" 1>&6
-4
+3
-ac_lib_var=`echo gnugetopt'_'optarg | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -2219 +2218 @@
-LIBS="-lgnugetopt  $LIBS"
-cat > conftest.$ac_ext <<EOF
-2
+1
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -2230 +2229 @@
-; return 0; }
-EOF
-3
+2
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -2258 +2257 @@
-
-echo $ac_n "checking for _ in -lbe""... $ac_c" 1>&6
-1
+0
-ac_lib_var=`echo be'_'_ | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -2266 +2265 @@
-LIBS="-lbe  $LIBS"
-cat > conftest.$ac_ext <<EOF
-9
+8
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -2277 +2276 @@
-; return 0; }
-EOF
-80
+79
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -2305 +2304 @@
-
-echo $ac_n "checking for _ in -lgame""... $ac_c" 1>&6
-8
+7
-ac_lib_var=`echo game'_'_ | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -2313 +2312 @@
-LIBS="-lgame  $LIBS"
-cat > conftest.$ac_ext <<EOF
-6
+5
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
@@ -2324 +2323 @@
-; return 0; }
-EOF
-7
+6
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -2352 +2351 @@
-
-echo $ac_n "checking for _ in -lroot""... $ac_c" 1>&6
-5
+4
-ac_lib_var=`echo root'_'_ | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -2360 +2359 @@
-LIBS="-lroot&nbs