New --enable-release config option.

Makefile.opts.in

@@ -40,6 +40,7 @@ CPROF = @CPROF@
 GPROF = @GPROF@
 OPTIMS = @OPTIMS@
 TUNING = @TUNING@
+RELEASE = @RELEASE@
 
 # 
 # Build environment
@@ -196,6 +197,10 @@ CFLAGS += -pipe
 CFLAGS += -D_REENTRANT
 CFLAGS += -D_GNU_SOURCE
 
+ifeq ($(RELEASE),1)
+CFLAGS += -DRELEASE
+endif
+
 # flags needed for clean beos compilation
 ifeq ($(SYS),beos)
 CFLAGS += -Wno-multichar -Wno-ctor-dtor-privacy -Woverloaded-virtual

configure.in

@@ -510,6 +510,15 @@ else
     fi
 fi
 
+dnl
+dnl  Enable release-specific flags
+dnl
+AC_ARG_ENABLE(release,
+[  --enable-release        Activate extra optimizations (default disabled)],
+[ if test x$enableval = xyes; then RELEASE=1; fi ],
+[ VLC_VERSION="${VLC_VERSION}_`date +%Y-%m-%d`";
+  LIBDVDCSS_VERSION="${LIBDVDCSS_VERSION}_`date +%Y-%m-%d`"; ])
+
 dnl
 dnl  MMX acceleration
 dnl
@@ -1100,6 +1109,7 @@ AC_SUBST(CPROF)
 AC_SUBST(GPROF)
 AC_SUBST(OPTIMS)
 AC_SUBST(TUNING)
+AC_SUBST(RELEASE)
 AC_SUBST(NEED_GETOPT)
 AC_SUBST(MOC)
 AC_SUBST(WINDRES)
@@ -1154,7 +1164,8 @@ global configuration
 system                : ${SYS}
 architecture          : ${ARCH}
 optimizations         : ${OPTIMS}
-tuning:               : ${TUNING}"
+tuning:               : ${TUNING}
+release:              : ${RELEASE}"
 
 if test x${HAVE_VLC} = x1
 then

debian/rules

@@ -9,7 +9,7 @@
 export DH_COMPAT=3
 
 # Compilation options
-export CONFIG_FLAGS="--prefix=/usr --enable-gnome --enable-gtk --enable-fb --with-ggi --with-sdl --enable-esd --enable-qt"
+export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --with-ggi --with-sdl --enable-esd --enable-qt"
 export LIBDVDCSS_FLAGS="--with-dvdcss=local-shared"
 export VIDDIR="usr/share/videolan"
 export PIXDIR="usr/share/pixmaps"

include/config.h.in

@@ -427,7 +427,11 @@
 
 /* Optimization level, from 0 to 2 - 1 is generally a good compromise. Remember
  * that raising this level dramatically lengthens the compilation time. */
-#define VPAR_OPTIM_LEVEL                1
+#ifdef RELEASE
+#   define VPAR_OPTIM_LEVEL             2
+#else
+#   define VPAR_OPTIM_LEVEL             1
+#endif
 
 /* Maximum number of macroblocks in a picture. */
 #define MAX_MB                          2048

src/input/input.c

@@ -4,7 +4,7 @@
  * decoders.
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input.c,v 1.149 2001/11/02 13:30:38 massiot Exp $
+ * $Id: input.c,v 1.150 2001/11/06 17:12:02 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -779,16 +779,16 @@ static void NetworkOpen( input_thread_t * p_input )
             /* Found a port name or a broadcast addres */
             if( *psz_port )
             {
-		/* That's a port name */
-		if( *psz_port == ':' )
-		{
+                /* That's a port name */
+                if( *psz_port == ':' )
+                {
                     *psz_port = '\0';
                     psz_port++;
                     i_port = atoi( psz_port );
-		}
+                }
 
-		/* Search for '/' just after the port in case
-		 * we also have a broadcast address */
+                /* Search for '/' just after the port in case
+                 * we also have a broadcast address */
                 psz_broadcast = psz_port;
                 while( *psz_broadcast && *psz_broadcast != '/' )
                 {

vlc.spec

@@ -104,7 +104,7 @@ install vlc-ncurses
 
 %build
 export QTDIR=%{_libdir}/qt-2.3.0/
-%configure --with-dvdcss=local-shared \
+%configure --enable-release --with-dvdcss=local-shared \
 	   --enable-gnome --enable-gtk \
 	   --enable-x11 --enable-qt --enable-ncurses \
 	   --enable-esd --disable-alsa \