* Better gtk-config detection.

ChangeLog

@@ -3,7 +3,9 @@
 #===================#
 
 HEAD
-  * Nothing yet.
+  * Better gtk-config detection.
+  * Removed duplicate checks in configure.in.
+  * Fixed a typo in vlc.spec.
 
 0.2.81
 Sat, 28 Jul 2001 04:13:57 +0200

configure.in

@@ -23,9 +23,6 @@ AC_PROG_RANLIB
 dnl AM_PROG_LIBTOOL
 AC_PROG_INSTALL
 
-dnl Check for compiler environment
-AC_C_CONST
-
 dnl Check for endianness if not cross-compiling
 if test x${cross_compiling} != xyes; then
   AC_C_BIGENDIAN
@@ -94,7 +91,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
 
 dnl Check for headers
 AC_CHECK_HEADERS(stddef.h getopt.h strings.h)
-AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/time.h unistd.h)
+AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/time.h)
 AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h)
 AC_CHECK_HEADERS(dlfcn.h image.h)
 AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
@@ -657,14 +654,23 @@ dnl  Gtk+ module
 dnl
 AC_ARG_ENABLE(gtk,
   [  --disable-gtk           Gtk+ support (default enabled)])
-if test x$enable_gtk != xno; then
+if test x$enable_gtk != xno
+then
+  # look for gtk-config
   AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-  if test x${GTK_CONFIG} != xno; then
-    PLUGINS="${PLUGINS} gtk"
-    ALIASES="${ALIASES} gvlc"
+  if test -x ${GTK_CONFIG}
+  then
     CFLAGS_GTK="`${GTK_CONFIG} --cflags gtk`"
     LIB_GTK="`${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`"
   fi
+  # now look for the gtk.h header
+  saved_CPPFLAGS=$CPPFLAGS
+  CPPFLAGS="$CPPFLAGS $CFLAGS_GTK"
+  AC_CHECK_HEADERS(gtk/gtk.h, [
+    PLUGINS="${PLUGINS} gtk"
+    ALIASES="${ALIASES} gvlc"
+  ])
+  CPPFLAGS=$saved_CPPFLAGS
 fi
 
 dnl
@@ -817,6 +823,7 @@ CSS decryption        : ${CSS}"
 fi
 
 echo "
-You may now tune Makefile.opts at your convenience. To build vlc, type
-\`make vlc'. To build libdvdcss only, type \`make libdvdcss'."
+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'."
 

vlc.spec

@@ -1,6 +1,6 @@
 Name: vlc
 Version: 0.2.81
-Release: 2
+Release: 1
 Copyright: GPL
 Url: http://www.videolan.org/
 Group: X11/Applications/Graphics
@@ -13,7 +13,7 @@ Summary: VideoLAN Client.
 Summary(fr): Client VideoLAN.
 
 %changelog
-* Sat, Jul 28 2001 Samuel Hocevar <sam@zoy.org>
+* Sat Jul 28 2001 Samuel Hocevar <sam@zoy.org>
 New upstream release (0.2.81)
 
 * Tue Jun 5 2001 Samuel Hocevar <sam@zoy.org>