Commit 12246fe9 authored by Sam Hocevar's avatar Sam Hocevar

* THANKS: spelling fixes.

  * configure.ac:
    + Added curly braces around variables.
    + Got rid of the "x$foo" constructs.
    + Renamed *_plugin conditionals into *_p.
  * debian/changelog:
    + Fixed a duplicate entry.
    + Added an entry for an old Debian upload that fixed #117180.
  * debian/control:
    + Added a build dependency on libimlib2-dev for skins.
  * debian/rules:
    + Activated support for skins.
parent a0f89f4d
$Id: THANKS,v 1.8 2003/05/24 11:53:12 sam Exp $
$Id: THANKS,v 1.9 2003/06/21 20:45:53 sam Exp $
VLC makes extensive use of the following persons' code:
......@@ -27,7 +27,7 @@ Davor Orel <syntheticamac at yahoo.it> - Mac OS X icons
Emmanuel Blindauer <manu@agat.net> - aRts audio output
Espen Skoglund <esk@ira.uka.de> - FreeBSD autoconf and Makefile patches
Ethan C. Baldridge <BaldridgeE@cadmus.com> - directory browsing code
Felix Khne <fk@aenneburghardt.de> - german translation
Felix Khne <fk@aenneburghardt.de> - German translation
Fumio Nakayama <endymion@ca2.so-net.ne.jp> - Japanese translation
Haakon Meland Eriksen - Norwegian translation
Hans-Peter Jansen <hpj@urpla.net> - patch for module options handling
......@@ -58,9 +58,9 @@ Rudolf Cornelissen <rag.cornelissen@inter.nl.net> - BeOS fixes
Sebastien Chaumat <Sebastien.Chaumat@ens-lyon.fr> - YOPY port tests
Steve Brown <sbrown@cortland.com> - fix for optional PES size bug
Steven M. Schultz <sms@TO.GD-ES.COM> - BSD/OS port
Thomas Graf <tgraf@europe.com> - gettext support, german translation
Thomas Graf <tgraf@europe.com> - gettext support, German translation
Thomas L. Wood <twood@lucent.com> - fixed a bug in QuantMatrixExtension
Valek Filippov <frob@df.ru> - russian translation
Valek Filippov <frob@df.ru> - Russian translation
Vladimir Chernyshov <greengrass@writeme.com> - MMX motion optimizations
Wade Majors <guru@startrek.com> - BeOS icon integration, debugging and fixes
Watanabe Go <go@dsl.gr.jp> - fix for non-ASCII filenames
......
#! /bin/sh
## bootstrap file for the VLC media player
## $Id: bootstrap,v 1.49 2003/06/21 17:04:20 sam Exp $
## $Id: bootstrap,v 1.50 2003/06/21 20:45:53 sam Exp $
##
## Authors: Samuel Hocevar <sam@zoy.org>
......@@ -91,8 +91,8 @@ EOF
NODIST=''; else
NODIST='#'; fi
cat >> m4/vlc.m4 << EOF
AM_CONDITIONAL(${mod}_plugin, test x\$${mod}_plugin = xyes)
AM_CONDITIONAL(${mod}_builtin, test x\$${mod}_builtin = xyes)
AM_CONDITIONAL(${mod}_p, test x\$${mod}_p = xyes)
AM_CONDITIONAL(${mod}_b, test x\$${mod}_b = xyes)
EOF
# Generation of Modules.am
# ~~~~~~~~~~~~~~~~~~~~~~~~
......@@ -104,14 +104,14 @@ EOF
cat >> Modules.am << EOF
# The ${mod} plugin
if ${mod}_plugin
if ${mod}_p
if UNTRUE
L_${mod}_p = ${dir}/lib${mod}_plugin.a
endif
D_${mod}_p = ${dir}/lib${mod}_plugin\$(LIBEXT)
${NODIST}B_${mod}_p = \$(nodist_SOURCES_${mod})
endif
if ${mod}_builtin
if ${mod}_b
L_${mod}_b = ${dir}/lib${mod}.a
F_${mod}_b = \$(LDFLAGS_${mod})
if BUILD_MOZILLA
......
......@@ -72,14 +72,14 @@ LIBEXT=".so"
dnl
dnl Check the operating system
dnl
case "x${target_os}" in
x)
case "${target_os}" in
"")
SYS=unknown
;;
xlinux*)
linux*)
SYS=linux
;;
xbsdi*)
bsdi*)
SYS=bsdi
CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}"
LDFLAGS_dvd="${LDFLAGS_dvd} -ldvd"
......@@ -87,11 +87,11 @@ case "x${target_os}" in
LDFLAGS_vcd="${LDFLAGS_vcd} -ldvd"
LDFLAGS_cdda="${LDFLAGS_cdda} -ldvd"
;;
x*bsd*)
*bsd*)
SYS="${target_os}"
CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}"
;;
xdarwin*)
darwin*)
SYS=darwin
CFLAGS_save="${CFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="${CXXFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}"
......@@ -100,15 +100,15 @@ case "x${target_os}" in
LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -all_load"
LIBEXT=".dylib"
;;
x*mingw32* | x*cygwin*)
*mingw32* | *cygwin*)
AC_CHECK_TOOL(WINDRES, windres, :)
LIBEXT=".dll"
case "x${target_os}" in
x*mingw32*)
case "${target_os}" in
*mingw32*)
SYS=mingw32
;;
x*cygwin*)
*cygwin*)
dnl Check if we are using the mno-cygwin mode in which case we are
dnl actually dealing with a mingw32 compiler.
AC_EGREP_CPP(yes,
......@@ -119,7 +119,7 @@ case "x${target_os}" in
;;
esac
if test "x$SYS" = "xmingw32"; then
if test "${SYS}" = "mingw32"; then
# add ws2_32 for closesocket, select, recv
CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"
CPPFLAGS="${CPPFLAGS_save}"
......@@ -137,19 +137,19 @@ case "x${target_os}" in
LDFLAGS_httpd="${LDFLAGS_httpd} -lws2_32"
fi
;;
x*nto*)
*nto*)
SYS=nto
LDFLAGS_x11="${LDFLAGS_x11} -lsocket"
LDFLAGS_xvideo="${LDFLAGS_xvideo} -lsocket"
;;
xsolaris*)
solaris*)
SYS=solaris
;;
xhpux*)
hpux*)
SYS=hpux
LIBEXT=".sl"
;;
xbeos)
beos)
SYS=beos
CFLAGS_save="${CFLAGS_save} -Wno-multichar"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}"
......@@ -162,13 +162,13 @@ case "x${target_os}" in
LDFLAGS_ipv4="${LDFLAGS_ipv4} -lsocket -lbind"
LDFLAGS_httpd="${LDFLAGS_httpd} -lsocket -lbind" )
;;
x*)
*)
SYS="${target_os}"
;;
esac
AM_CONDITIONAL(HAVE_BEOS, test "x${SYS}" = "xbeos")
AM_CONDITIONAL(HAVE_DARWIN, test "x${SYS}" = "xdarwin")
AM_CONDITIONAL(HAVE_WIN32, test "x${SYS}" = "xmingw32")
AM_CONDITIONAL(HAVE_BEOS, test "${SYS}" = "beos")
AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin")
AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
dnl
dnl Gettext stuff
......@@ -194,7 +194,7 @@ AC_MSG_CHECKING(for suffix of libraries)
AC_MSG_RESULT(${LIBEXT})
dnl Check for the need to include the mingwex lib for mingw32
if test x$SYS = xmingw32
if test "${SYS}" = "mingw32"
then
AC_CHECK_LIB(mingwex,opendir,
AC_CHECK_LIB(mingw32,opendir,LDFLAGS_vlc="${LDFLAGS_vlc}",
......@@ -204,13 +204,13 @@ then
fi
dnl Check for fnative-struct or mms-bitfields support for mingw32
if test x$SYS = xmingw32
if test "${SYS}" = "mingw32"
then
AC_CACHE_CHECK([if \$CC accepts -mms-bitfields],
[ac_cv_c_mms_bitfields],
[CFLAGS="${CFLAGS_save} -mms-bitfields"
AC_TRY_COMPILE([],,ac_cv_c_mms_bitfields=yes, ac_cv_c_mms_bitfields=no)])
if test x"$ac_cv_c_mms_bitfields" != x"no"; then
if test "${ac_cv_c_mms_bitfields}" != "no"; then
CFLAGS_save="${CFLAGS_save} -mms-bitfields";
CXXFLAGS_save="${CXXFLAGS_save} -mms-bitfields";
else
......@@ -218,7 +218,7 @@ then
[ac_cv_c_fnative_struct],
[CFLAGS="${CFLAGS_save} -fnative-struct"
AC_TRY_COMPILE([],,ac_cv_c_fnative_struct=yes, ac_cv_c_fnative_struct=no)])
if test x"$ac_cv_c_fnative_struct" != x"no"; then
if test "${ac_cv_c_fnative_struct}" != "no"; then
CFLAGS_save="${CFLAGS_save} -fnative-struct";
CXXFLAGS_save="${CXXFLAGS_save} -fnative-struct";
fi
......@@ -228,7 +228,7 @@ then
fi
dnl Check for fvtable-thunks support for mingw32
if test x$SYS = xmingw32
if test "${SYS}" = "mingw32"
then
AC_LANG_PUSH(C++)
AC_CACHE_CHECK([if \$CXX accepts -fvtable-thunks],
......@@ -236,7 +236,7 @@ AC_LANG_PUSH(C++)
[CXXFLAGS="${CXXFLAGS_save} -Wall -Werror -fvtable-thunks"
AC_TRY_COMPILE([],,ac_cv_cxx_fvtable_thunks=yes,
ac_cv_cxx_fvtable_thunks=no)])
if test x"$ac_cv_cxx_fvtable_thunks" = x"yes"; then
if test "${ac_cv_cxx_fvtable_thunks}" = "yes"; then
CXXFLAGS_mingw32_special="-fvtable-thunks"
fi
......@@ -246,8 +246,8 @@ AC_LANG_POP(C++)
fi
dnl Flags for plugin compilation
case "x${SYS}" in
xmingw32|xcygwin)
case "${SYS}" in
mingw32|cygwin)
CFLAGS_pics="${CFLAGS_pics} ${CFLAGS_mingw32_special}"
CXXFLAGS_pics="${CXXFLAGS_pics} ${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}"
OBJCFLAGS_pics="${OBJCFLAGS_pics} ${CFLAGS_mingw32_special}"
......@@ -255,7 +255,7 @@ case "x${SYS}" in
CXXFLAGS_plugins="${CXXFLAGS_plugins} ${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}"
OBJCFLAGS_plugins="${OBJCFLAGS_plugins} ${CFLAGS_mingw32_special}"
;;
x*)
*)
CFLAGS_pics="${CFLAGS_pics} -fPIC"
CXXFLAGS_pics="${CXXFLAGS_pics} -fPIC"
OBJCFLAGS_pics="${OBJCFLAGS_pics} -fPIC"
......@@ -309,7 +309,7 @@ AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t,
[socklen_t len = 42; return len;],
ac_cv_type_socklen_t=yes,
ac_cv_type_socklen_t=no)])
if test x$ac_cv_type_socklen_t != xno; then
if test "${ac_cv_type_socklen_t}" != "no"; then
AC_DEFINE(HAVE_SOCKLEN_T, 1, [Define if <sys/socket.h> defines socklen_t.])
fi
......@@ -320,7 +320,7 @@ AC_CACHE_CHECK([for va_copy], ac_cv_c_va_copy,
[va_list ap1, ap2; va_copy(ap1,ap2);],
[ac_cv_c_va_copy="yes"],
[ac_cv_c_va_copy="no"]))
if test "$ac_cv_c_va_copy" = "yes"; then
if test "${ac_cv_c_va_copy}" = "yes"; then
AC_DEFINE(HAVE_VA_COPY, 1, [Define if <stdarg.h> defines va_copy.])
fi
AC_CACHE_CHECK([for __va_copy], ac_cv_c___va_copy,
......@@ -329,7 +329,7 @@ AC_CACHE_CHECK([for __va_copy], ac_cv_c___va_copy,
[va_list ap1, ap2; __va_copy(ap1,ap2);],
[ac_cv_c___va_copy="yes"],
[ac_cv_c___va_copy="no"]))
if test "$ac_cv_c___va_copy" = "yes"; then
if test "${ac_cv_c___va_copy}" = "yes"; then
AC_DEFINE(HAVE___VA_COPY, 1, [Define if <stdarg.h> defines __va_copy.])
fi
......@@ -346,7 +346,7 @@ AC_CHECK_FUNCS(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)],
[need_getopt=:])])
AM_CONDITIONAL(BUILD_GETOPT, ${need_getopt})
if test "x$SYS" != "xmingw32"; then
if test "${SYS}" != "mingw32"; then
AC_TYPE_SIGNAL
AC_CHECK_LIB(dl,dlopen,LDFLAGS_vlc="${LDFLAGS_vlc} -ldl")
AC_CHECK_LIB(m,cos,
......@@ -366,21 +366,21 @@ AC_CHECK_LIB(m,pow,
AC_CHECK_LIB(m,sqrt,
LDFLAGS_headphone_channel_mixer="${LDFLAGS_headphone_channel_mixer} -lm"
)
fi # end "x$SYS" != "xmingw32"
fi # end "${SYS}" != "mingw32"
if test "x$SYS" != "xmingw32"; then
if test "${SYS}" != "mingw32"; then
dnl Check for pthreads - borrowed from XMMS
THREAD_LIB=error
if test "x${THREAD_LIB}" = "xerror"; then
if test "${THREAD_LIB}" = "error"; then
AC_CHECK_LIB(pthread,main,THREAD_LIB="-lpthread")
fi
if test "x${THREAD_LIB}" = "xerror"; then
if test "${THREAD_LIB}" = "error"; then
AC_CHECK_LIB(pthreads,main,THREAD_LIB="-lpthreads")
fi
if test "x${THREAD_LIB}" = "xerror"; then
if test "${THREAD_LIB}" = "error"; then
AC_CHECK_LIB(c_r,main,THREAD_LIB="-lc_r")
fi
if test "x${THREAD_LIB}" = "xerror"; then
if test "${THREAD_LIB}" = "error"; then
AC_CHECK_FUNCS(pthread_mutex_lock)
THREAD_LIB=""
fi
......@@ -393,7 +393,7 @@ dnl GNU portable threads
dnl
AC_ARG_ENABLE(pth,
[ --enable-pth GNU Pth support (default disabled)],
[ if test "x${enable_pth}" = "xyes"; then
[ if test "${enable_pth}" = "yes"; then
AC_CHECK_LIB(pth,pth_init)
AC_MSG_CHECKING(for pth_init in pth.h)
AC_EGREP_HEADER(pth_init,pth.h,[
......@@ -412,7 +412,7 @@ dnl State Threads
dnl
AC_ARG_ENABLE(st,
[ --enable-st State Threads (default disabled)],
[ if test "x${enable_st}" = "xyes"; then
[ if test "${enable_st}" = "yes"; then
AC_CHECK_LIB(st,st_init)
AC_MSG_CHECKING(for st_init in st.h)
AC_EGREP_HEADER(st_init,st.h,[
......@@ -430,7 +430,7 @@ LDFLAGS_vlc="${LDFLAGS_vlc} ${THREAD_LIB}"
LDFLAGS_plugins="${LDFLAGS_plugins} ${THREAD_LIB}"
dnl Don't link with rt when using GNU-pth
if test "x${THREAD_LIB}" != "x-lpth" && test "x${THREAD_LIB}" != "x-lst"; then
if test "${THREAD_LIB}" != "-lpth" && test "${THREAD_LIB}" != "-lst"; then
dnl HP/UX port
AC_CHECK_LIB(rt,sem_init, [LDFLAGS_vlc="${LDFLAGS_vlc} -lrt"])
......@@ -462,7 +462,7 @@ AC_EGREP_HEADER(pthread_once,pthread.h,[
AC_DEFINE(PTHREAD_ONCE_IN_PTHREAD_H, 1,
Define if <pthread.h> defines pthread_once.)],[
AC_MSG_RESULT(no)])
fi # end "x$SYS" != "xmingw32"
fi # end "${SYS}" != "mingw32"
AC_MSG_CHECKING(for strncasecmp in strings.h)
AC_EGREP_HEADER(strncasecmp,strings.h,[
......@@ -476,10 +476,10 @@ AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h getopt.h strings.h inttypes.h
AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h)
AC_CHECK_HEADERS(dlfcn.h image.h)
AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
if test "x$SYS" != "xmingw32"; then
if test "${SYS}" != "mingw32"; then
AC_CHECK_HEADERS(machine/param.h sys/shm.h)
AC_CHECK_HEADERS(linux/version.h)
fi # end "x$SYS" != "xmingw32"
fi # end "${SYS}" != "mingw32"
AC_HEADER_TIME
......@@ -489,7 +489,7 @@ AC_CHECK_HEADERS(dirent.h,,[need_dirent=:])
AM_CONDITIONAL(BUILD_DIRENT, ${need_dirent})
dnl Mac OS X and other OSes don't have declaration for nanosleep
if test "x$SYS" != "xmingw32"; then
if test "${SYS}" != "mingw32"; then
AC_MSG_CHECKING(for nanosleep in time.h)
AC_EGREP_HEADER(nanosleep,time.h,[
AC_MSG_RESULT(yes)
......@@ -498,7 +498,7 @@ AC_EGREP_HEADER(nanosleep,time.h,[
],[
AC_MSG_RESULT(no)
])
fi # end "x$SYS" != "xmingw32"
fi # end "${SYS}" != "mingw32"
dnl Make sure we have timespecs
AC_MSG_CHECKING(for timespec in sys/time.h)
......@@ -511,15 +511,15 @@ AC_EGREP_HEADER(timespec,sys/time.h,[
])
dnl Check for threads library
if test "x$SYS" != "xmingw32"; then
if test "${SYS}" != "mingw32"; then
AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h)
fi # end "x$SYS" != "xmingw32"
fi # end "${SYS}" != "mingw32"
dnl Default X headers and libraries
if test "x${x_includes}" = "xNONE"; then
if test "${x_includes}" = "NONE"; then
x_includes="/usr/X11R6/include"
fi
if test "x${x_libraries}" = "xNONE"; then
if test "${x_libraries}" = "NONE"; then
x_libraries="/usr/X11R6/lib"
fi
......@@ -539,7 +539,7 @@ AC_CACHE_CHECK([for ntohl in sys/param.h],
AC_TRY_COMPILE([#include <sys/param.h>],
[void foo() { int meuh; ntohl(meuh); }],
ac_cv_c_ntohl_sys_param_h=yes, ac_cv_c_ntohl_sys_param_h=no)])
if test "x${ac_cv_c_ntohl_sys_param_h}" != "xno"; then
if test "${ac_cv_c_ntohl_sys_param_h}" != "no"; then
AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if <sys/param.h> defines ntohl.)
fi
......@@ -548,7 +548,7 @@ AC_CACHE_CHECK([if \$CC accepts -finline-limit],
[ac_cv_c_inline_limit],
[CFLAGS="${CFLAGS_save} -finline-limit-30000"
AC_TRY_COMPILE([],,ac_cv_c_inline_limit=yes, ac_cv_c_inline_limit=no)])
if test "x${ac_cv_c_inline_limit}" != "xno"; then
if test "${ac_cv_c_inline_limit}" != "no"; then
CFLAGS_save="${CFLAGS_save} -finline-limit-30000"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="${CXXFLAGS_save} -finline-limit-30000"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="${OBJCFLAGS_save} -finline-limit-30000"; OBJCFLAGS="${OBJCFLAGS_save}"
......@@ -562,7 +562,7 @@ fi
# [ac_cv_c_W${flag}],
# [CFLAGS="-W${flag} ${CFLAGS_save}"
# AC_TRY_COMPILE([],,ac_cv_c_W${flag}=yes, ac_cv_c_W${flag}=no)])
# if test "x${ac_cv_c_W${flag}}" != "xno"; then
# if test "${ac_cv_c_W${flag}}" != "no"; then
# CFLAGS_save="-W${flag} ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
# CXXFLAGS_save="-W${flag} ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
# OBJCFLAGS_save="-W${flag} ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
......@@ -599,43 +599,43 @@ AC_CACHE_CHECK([if \$CC accepts -Winline],
[CFLAGS="-Winline ${CFLAGS_save}"
AC_TRY_COMPILE([],,ac_cv_c_Winline=yes, ac_cv_c_Winline=no)])
if test "x${ac_cv_c_Wall}" != "xno"; then
if test "${ac_cv_c_Wall}" != "no"; then
CFLAGS_save="-Wall ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="-Wall ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="-Wall ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
fi
if test "x${ac_cv_c_Wunreachable_code}" != "xno"; then
if test "${ac_cv_c_Wunreachable_code}" != "no"; then
# CFLAGS_save="-Wunreachable-code ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
# CXXFLAGS_save="-Wunreachable-code ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
# OBJCFLAGS_save="-Wunreachable-code ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
dnl -Wunreachable-code means gcc-3.x, we can use -Wconversion and we can
dnl activate -Winline for C++, it won't choke on system headers.
# if test "x${ac_cv_c_Wconversion}" != "xno"; then
# if test "${ac_cv_c_Wconversion}" != "no"; then
# CFLAGS_save="-Wconversion ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
# CXXFLAGS_save="-Wconversion ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
# OBJCFLAGS_save="-Wconversion ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
# fi
if test "x${ac_cv_c_Winline}" != "xno"; then
if test "${ac_cv_c_Winline}" != "no"; then
CXXFLAGS_save="-Winline ${CXXFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
fi
fi
if test "x${ac_cv_c_Wsign_compare}" != "xno"; then
if test "${ac_cv_c_Wsign_compare}" != "no"; then
CFLAGS_save="-Wsign-compare ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="-Wsign-compare ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="-Wsign-compare ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
fi
if test "x${ac_cv_c_Wdisabled_optimization}" != "xno"; then
if test "${ac_cv_c_Wdisabled_optimization}" != "no"; then
CFLAGS_save="-Wdisabled-optimization ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="-Wdisabled-optimization ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="-Wdisabled-optimization ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
fi
if test "x${ac_cv_c_Winline}" != "xno"; then
if test "${ac_cv_c_Winline}" != "no"; then
CFLAGS_save="-Winline ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
OBJCFLAGS_save="-Winline ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
fi
......@@ -645,7 +645,7 @@ AC_CACHE_CHECK([if \$CC accepts -pipe],
[ac_cv_c_pipe],
[CFLAGS="${CFLAGS_save} -pipe"
AC_TRY_COMPILE([],,ac_cv_c_pipe=yes, ac_cv_c_pipe=no)])
if test "x${ac_cv_c_pipe}" != "xno"; then
if test "${ac_cv_c_pipe}" != "no"; then
CFLAGS_save="${CFLAGS_save} -pipe"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="${CXXFLAGS_save} -pipe"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="${OBJCFLAGS_save} -pipe"; OBJCFLAGS="${OBJCFLAGS_save}"
......@@ -656,7 +656,7 @@ AC_CACHE_CHECK([if \$CC accepts -O3],
[ac_cv_c_o3],
[CFLAGS="${CFLAGS_save} -O3"
AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)])
if test "x${ac_cv_c_o3}" != "xno"; then
if test "${ac_cv_c_o3}" != "no"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3"
fi
......@@ -664,8 +664,8 @@ AC_CACHE_CHECK([if \$CC accepts -O2],
[ac_cv_c_o2],
[CFLAGS="${CFLAGS_save} -O2"
AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)])
if test "x${ac_cv_c_o2}" != "xno"; then
if test "x${ac_cv_c_o3}" = "xno"; then
if test "${ac_cv_c_o2}" != "no"; then
if test "${ac_cv_c_o3}" = "no"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -O2"
fi
CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O2"
......@@ -674,8 +674,8 @@ else
[ac_cv_c_o],
[CFLAGS="${CFLAGS_save} -O"
AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)])
if test "x${ac_cv_c_o}" != "xno"; then
if test "x${ac_cv_c_o3}" = "xno"; then
if test "${ac_cv_c_o}" != "no"; then
if test "${ac_cv_c_o3}" = "no"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -O"
fi
CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O"
......@@ -687,19 +687,19 @@ AC_CACHE_CHECK([if \$CC accepts -ffast-math],
[ac_cv_c_fast_math],
[CFLAGS="${CFLAGS_save} -ffast-math"
AC_TRY_COMPILE([],,ac_cv_c_fast_math=yes, ac_cv_c_fast_math=no)])
if test "x${ac_cv_c_fast_math}" != "xno"; then
if test "${ac_cv_c_fast_math}" != "no"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -ffast-math"
fi
dnl Check for -funroll-loops
dnl Disabled on BeOS because BeOS' gcc is buggy and may crash with it
if test "x${SYS}" != "xbeos"
if test "${SYS}" != "beos"
then
AC_CACHE_CHECK([if \$CC accepts -funroll-loops],
[ac_cv_c_unroll_loops],
[CFLAGS="${CFLAGS_save} -funroll-loops"
AC_TRY_COMPILE([],,ac_cv_c_unroll_loops=yes, ac_cv_c_unroll_loops=no)])
if test "x${ac_cv_c_unroll_loops}" != "xno"; then
if test "${ac_cv_c_unroll_loops}" != "no"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -funroll-loops"
fi
fi
......@@ -709,7 +709,7 @@ AC_CACHE_CHECK([if \$CC accepts -fomit-frame-pointer],
[ac_cv_c_omit_frame_pointer],
[CFLAGS="${CFLAGS_save} -fomit-frame-pointer"
AC_TRY_COMPILE([],,ac_cv_c_omit_frame_pointer=yes, ac_cv_c_omit_frame_pointer=no)])
if test "x${ac_cv_c_omit_frame_pointer}" != "xno"; then
if test "${ac_cv_c_omit_frame_pointer}" != "no"; then
CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fomit-frame-pointer"
# this plugin does not compile without -fomit-frame-pointer, damn gcc!
CFLAGS_i420_yuy2_mmx="${CFLAGS_i420_yuy2_mmx} -fomit-frame-pointer"
......@@ -720,7 +720,7 @@ AC_CACHE_CHECK([if \$CC accepts -mdynamic-no-pic],
[ac_cv_c_dynamic_no_pic],
[CFLAGS="${CFLAGS_save} -mdynamic-no-pic"
AC_TRY_COMPILE([],,ac_cv_c_dynamic_no_pic=yes, ac_cv_c_dynamic_no_pic=no)])
if test "x${ac_cv_c_dynamic_no_pic}" != "xno"; then
if test "${ac_cv_c_dynamic_no_pic}" != "no"; then
CFLAGS_builtins="${CFLAGS_builtins} -mdynamic-no-pic"
CFLAGS_libvlc="${CFLAGS_libvlc} -mdynamic-no-pic"
fi
......@@ -730,20 +730,20 @@ AC_CACHE_CHECK([if \$CC accepts -bundle -undefined error -lcc_dynamic],
[ac_cv_ld_darwin],
[CFLAGS="${CFLAGS_save} -bundle -undefined error -lcc_dynamic"
AC_TRY_COMPILE([],,ac_cv_ld_darwin=yes, ac_cv_ld_darwin=no)])
if test "x${ac_cv_ld_darwin}" != "xno"; then
if test "${ac_cv_ld_darwin}" != "no"; then
LDFLAGS_plugins="${LDFLAGS_plugins} -bundle -undefined error -lcc_dynamic"
fi
dnl Check for standard plugin linking flags
dnl BeOS' gcc needs -nostart instead of -shared, even if -shared isn't harmful (just a warning)
if test "x${SYS}" = "xbeos"; then
if test "${SYS}" = "beos"; then
LDFLAGS_plugins="${LDFLAGS_plugins} -nostart"
else
AC_CACHE_CHECK([if \$CC accepts -shared],
[ac_cv_ld_plugins],
[CFLAGS="${CFLAGS_save} -shared"
AC_TRY_COMPILE([],, ac_cv_ld_plugins=yes, ac_cv_ld_plugins=no)])
if test "x${ac_cv_ld_plugins}" != "xno"; then
if test "${ac_cv_ld_plugins}" != "no"; then
LDFLAGS_plugins="${LDFLAGS_plugins} -shared"
fi
fi
......@@ -758,7 +758,7 @@ AC_CACHE_CHECK([for variadic cpp macros],
[a("foo");a("%s","bar");a("%s%s","baz","quux");],
ac_cv_cpp_variadic_macros=yes,
ac_cv_cpp_variadic_macros=no)])
if test "x${ac_cv_cpp_variadic_macros}" != "xno"; then
if test "${ac_cv_cpp_variadic_macros}" != "no"; then
AC_DEFINE(HAVE_VARIADIC_MACROS, 1, Support for variadic macros)
fi
......@@ -773,7 +773,7 @@ AC_CACHE_CHECK([__attribute__ ((aligned ())) support],
[ac_cv_c_attribute_aligned="${ac_cv_c_attr_align_try}"])
done
CFLAGS="${CFLAGS_save}"])
if test "x${ac_cv_c_attribute_aligned}" != "x0"; then
if test "${ac_cv_c_attribute_aligned}" != "0"; then
AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX],
[${ac_cv_c_attribute_aligned}],[Maximum supported data alignment])
fi
......@@ -787,15 +787,15 @@ AC_CACHE_CHECK([__attribute__ ((format ())) support with function pointers],
[static void (*pf_printf)(const char *, ...) __attribute__ ((format(printf,1,2)));(void)pf_printf;],
[ac_cv_c_attribute_format=yes])
CFLAGS="${CFLAGS_save}"])
if test "x${ac_cv_c_attribute_format}" != "xno"; then
if test "${ac_cv_c_attribute_format}" != "no"; then
AC_DEFINE(HAVE_ATTRIBUTE_FORMAT, 1, Support for __attribute__((format())) with function pointers)
fi
dnl
dnl Check the CPU
dnl
case "x${target_cpu}" in
x)
case "${target_cpu}" in
"")
ARCH=unknown
;;
*)
......@@ -845,7 +845,7 @@ dnl Switch to enable a version of VLC where most modules will be builtin
dnl
AC_ARG_ENABLE(mostly-builtin,
[ --enable-mostly-builtin most modules will be built-in (default disabled)])
if test "x${enable_mostly_builtin}" = "xyes"; then
if test "${enable_mostly_builtin}" = "yes"; then
BUILTINS="${BUILTINS} ${PLUGINS}"
PLUGINS=""
fi
......@@ -853,7 +853,7 @@ fi
dnl
dnl Some plugins aren't useful on some platforms
dnl
if test "x${SYS}" != "xmingw32"; then
if test "${SYS}" != "mingw32"; then
PLUGINS="${PLUGINS} screensaver"
fi
......@@ -879,7 +879,7 @@ AC_CACHE_CHECK([if \$CC groks MMX inline assembly],
[CFLAGS="${CFLAGS_save}"
AC_TRY_COMPILE(,[void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p));],
ac_cv_mmx_inline=yes, ac_cv_mmx_inline=no)])
if test "x${ac_cv_mmx_inline}" != "xno"; then
if test "${ac_cv_mmx_inline}" != "no"; then
ACCEL_MODULES="${ACCEL_MODULES} ${MMX_MODULES}"
fi
......@@ -888,7 +888,7 @@ AC_CACHE_CHECK([if \$CC groks MMX EXT inline assembly],
[CFLAGS="${CFLAGS_save}"
AC_TRY_COMPILE(,[void *p;asm volatile("maskmovq %%mm1,%%mm2"::"r"(p));],
ac_cv_mmxext_inline=yes, ac_cv_mmxext_inline=no)])
if test "x${ac_cv_mmxext_inline}" != "xno"; then
if test "${ac_cv_mmxext_inline}" != "no"; then
ACCEL_MODULES="${ACCEL_MODULES} ${MMXEXT_MODULES}"
fi
......@@ -897,7 +897,7 @@ AC_CACHE_CHECK([if \$CC groks 3D Now! inline assembly],
[CFLAGS="${CFLAGS_save}"
AC_TRY_COMPILE(,[void *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p));],
ac_cv_3dnow_inline=yes, ac_cv_3dnow_inline=no)])
if test "x${ac_cv_3dnow_inline}" != "xno"; then
if test "${ac_cv_3dnow_inline}" != "no"; then
AC_DEFINE(CAN_COMPILE_3DNOW, 1, Define if \$CC groks 3D Now! inline assembly.)
ACCEL_MODULES="${ACCEL_MODULES} ${THREEDNOW_MODULES}"
fi
......@@ -907,12 +907,12 @@ AC_CACHE_CHECK([if \$CC groks SSE inline assembly],
[CFLAGS="${CFLAGS_save}"
AC_TRY_COMPILE(,[void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));],
ac_cv_sse_inline=yes, ac_cv_sse_inline=no)])
if test "x${ac_cv_sse_inline}" != "xno" -a "x${SYS}" != "xmingw32"; then
if test "${ac_cv_sse_inline}" != "no" -a "${SYS}" != "mingw32"; then
AC_DEFINE(CAN_COMPILE_SSE, 1, Define if \$CC groks SSE inline assembly.)
ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}"
fi
if test "x${SYS}" != "xmingw32"; then
if test "${SYS}" != "mingw32"; then
AC_CACHE_CHECK([if \$CC groks AltiVec inline assembly],
[ac_cv_altivec_inline],
[CFLAGS="${CFLAGS_save}"
......@@ -923,9 +923,9 @@ AC_CACHE_CHECK([if \$CC groks AltiVec inline assembly],
[ac_cv_altivec_inline="-Wa,-m7400"],
ac_cv_altivec_inline=no)
])])
if test "x${ac_cv_altivec_inline}" != "xno"; then
if test "${ac_cv_altivec_inline}" != "no"; then
AC_DEFINE(CAN_COMPILE_ALTIVEC, 1, Define if \$CC groks AltiVec inline assembly.)
if test "x${ac_cv_altivec_inline}" != "xyes"; then
if test "${ac_cv_altivec_inline}" != "yes"; then
CFLAGS_idctaltivec="${CFLAGS_idctaltivec} ${ac_cv_altivec_inline}"
CFLAGS_motionaltivec="${CFLAGS_motionaltivec} ${ac_cv_altivec_inline}"
CFLAGS_memcpyaltivec="${CFLAGS_memcpyaltivec} ${ac_cv_altivec_inline}"
......@@ -946,7 +946,7 @@ AC_CACHE_CHECK([if \$CC groks AltiVec C extensions],
[ac_cv_c_altivec="-fvec"], ac_cv_c_altivec=no)
])
CFLAGS="${CFLAGS_save}"])
if test "x${ac_cv_c_altivec}" != "xno"; then
if test "${ac_cv_c_altivec}" != "no"; then
AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C AltiVec extensions.)
CFLAGS_idctaltivec="${CFLAGS_idctaltivec} ${ac_cv_c_altivec}"
CFLAGS_motionaltivec="${CFLAGS_motionaltivec} ${ac_cv_c_altivec}"
......@@ -961,13 +961,13 @@ AC_CACHE_CHECK([if linker needs -framework vecLib],
AC_TRY_LINK([],,ac_cv_ld_altivec=yes,ac_cv_ld_altivec=no)
LDFLAGS="${LDFLAGS_save}"
])
if test "x${ac_cv_ld_altivec}" != "xno"; then
if test "${ac_cv_ld_altivec}" != "no"; then
LDFLAGS_idctaltivec="${LDFLAGS_idctaltivec} -framework vecLib"
LDFLAGS_motionaltivec="${LDFLAGS_motionaltivec} -framework vecLib"
LDFLAGS_memcpyaltivec="${LDFLAGS_memcpyaltivec} -framework vecLib"
LDFLAGS_vlc="${LDFLAGS_vlc} -framework vecLib"
fi
fi # end "x$SYS" != "xmingw32"
fi # end "${SYS}" != "mingw32"
AC_ARG_WITH(,[])
AC_ARG_WITH(,[Optimization options:])
......@@ -978,23 +978,23 @@ dnl
AC_ARG_WITH(tuning,
[ --with-tuning=ARCH enable special tuning for an architecture
(default i686 on IA-32 and 750 on PPC)])
if test "x${with_tuning}" != "x"; then
if test "x${target_cpu}" = "xpowerpc"; then
if test "${with_tuning}" != ""; then
if test "${target_cpu}" = "powerpc"; then
CFLAGS_TUNING="-mtune=${with_tuning}"
else
CFLAGS_TUNING="-mcpu=${with_tuning}"
fi
else
if test "x${target_cpu}" = "xi686" -o "x${target_cpu}" = "xi586" -o "x${target_cpu}" = "xi486" -o "x${target_cpu}" = "xi386"; then CFLAGS_TUNING="-mcpu=pentiumpro"
if test "${target_cpu}" = "i686" -o "${target_cpu}" = "i586" -o "${target_cpu}" = "i486" -o "${target_cpu}" = "i386"; then CFLAGS_TUNING="-mcpu=pentiumpro"
else
if test "x${target_cpu}" = "xpowerpc"; then CFLAGS_TUNING="-mtune=750"; fi
if test "${target_cpu}" = "powerpc"; then CFLAGS_TUNING="-mtune=750"; fi
fi
fi
dnl
dnl x86 accelerations
dnl
if test "x${target_cpu}" = "xi686" -o "x${target_cpu}" = "xi586" -o "x${target_cpu}" = "xx86" -o "x${target_cpu}" = "xi386"
if test "${target_cpu}" = "i686" -o "${target_cpu}" = "i586" -o "${target_cpu}" = "x86" -o "${target_cpu}" = "i386"