* Mandatory step for video output IV and the audio output quality

[vlc] / configure.in

diff --git a/configure.in b/configure.in
index 8b9ca2e2a6e62cc9736352592549f9fb8eaa7580..33fe2a50150e5368a51e3e6e06d1c746ae85ae35 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,11 +4,14 @@ AC_CONFIG_HEADER(include/defs.h)
 
 AC_CANONICAL_HOST
 
-VLC_VERSION=0.2.72
+VLC_VERSION=0.2.73
 AC_SUBST(VLC_VERSION)
 VLC_CODENAME=Ourumov
 AC_SUBST(VLC_CODENAME)
 
+dnl Save CFLAGS
+save_CFLAGS="${CFLAGS}"
+
 dnl Check for tools
 AC_PROG_MAKE_SET
 AC_PROG_CC
@@ -45,6 +48,7 @@ AC_CHECK_FUNC(inet_aton,,[
   AC_CHECK_LIB(resolv,inet_aton,LIB="${LIB} -lresolv")
 ])
 AC_CHECK_FUNCS(vasprintf)
+AC_CHECK_FUNCS(swab)
 
 AC_CHECK_FUNC(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)],
 [ # FreeBSD has a gnugetopt library for this:
@@ -91,9 +95,6 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
             Define if <strings.h> defines strncasecmp.)
 ])
 
-dnl Do a series of bizarre compilation tests
-save_CFLAGS=$CFLAGS
-
 dnl Check for ntohl, etc.
 CFLAGS="${CFLAGS} -Wall -Werror"
 AC_MSG_CHECKING([for ntohl in sys/param.h])
@@ -110,7 +111,7 @@ AC_TRY_COMPILE([],,
  AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
 
 dnl End of the bizarre compilation tests
-CFLAGS=$save_CFLAGS
+CFLAGS="${save_CFLAGS}"
 
 dnl Check for boolean_t
 AC_MSG_CHECKING([for boolean_t in sys/types.h])
@@ -343,7 +344,7 @@ AC_ARG_WITH(sdl,
       PLUGINS="${PLUGINS} sdl";
       if test "x$withval" != "xyes";
       then
-        LIB_SDL="${LIB_SDL} -L/usr/X11R6/lib -L"$withval"/lib -l"$withval
+        LIB_SDL="${LIB_SDL} -L/usr/X11R6/lib -L"$withval"/lib -lSDL"
         INCLUDE="${INCLUDE} -I"$withval"/include"
       else
         AC_CHECK_HEADERS(SDL/SDL.h, , [echo "Cannot find SDL headers !"; exit])
@@ -392,6 +393,12 @@ AC_ARG_ENABLE(qt,
      PLUGINS="${PLUGINS} qt"
      ALIASES="${ALIASES} qvlc"
      LIB_QT="-lqt -L${QTDIR}/lib"
+     if test -x ${QTDIR}/bin/moc ;
+     then
+       MOC=${QTDIR}/bin/moc
+     else
+       MOC=moc
+     fi
    fi])
 
 dnl 
@@ -499,6 +506,7 @@ AC_SUBST(STATS)
 AC_SUBST(TRACE)
 AC_SUBST(OPTIMS)
 AC_SUBST(CSS)
+AC_SUBST(MOC)
 
 AC_SUBST(LCFLAGS)
 AC_SUBST(LIB)
@@ -521,6 +529,7 @@ AC_SUBST(LIB_X11)
 AC_SUBST(LIB_XVIDEO)
 AC_SUBST(LIB_YUV)
 
+AC_SUBST(CFLAGS_VLC)
 AC_SUBST(CFLAGS_GTK)
 AC_SUBST(CFLAGS_X11)
 
@@ -538,8 +547,8 @@ trace mode            : ${TRACE}
 optimizations         : ${OPTIMS}
 CSS decryption        : ${CSS}
 need builtin getopt   : ${GETOPT}
-plugin modules        :${PLUGINS}
 built-in modules      :${BUILTINS}
+plugin modules        :${PLUGINS}
 vlc aliases           :${ALIASES}
 
 You may now tune Makefile.opts at your convenience."