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: VLC makes extensive use of the following persons' code:
...@@ -27,7 +27,7 @@ Davor Orel <syntheticamac at yahoo.it> - Mac OS X icons ...@@ -27,7 +27,7 @@ Davor Orel <syntheticamac at yahoo.it> - Mac OS X icons
Emmanuel Blindauer <manu@agat.net> - aRts audio output Emmanuel Blindauer <manu@agat.net> - aRts audio output
Espen Skoglund <esk@ira.uka.de> - FreeBSD autoconf and Makefile patches Espen Skoglund <esk@ira.uka.de> - FreeBSD autoconf and Makefile patches
Ethan C. Baldridge <BaldridgeE@cadmus.com> - directory browsing code 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 Fumio Nakayama <endymion@ca2.so-net.ne.jp> - Japanese translation
Haakon Meland Eriksen - Norwegian translation Haakon Meland Eriksen - Norwegian translation
Hans-Peter Jansen <hpj@urpla.net> - patch for module options handling Hans-Peter Jansen <hpj@urpla.net> - patch for module options handling
...@@ -58,9 +58,9 @@ Rudolf Cornelissen <rag.cornelissen@inter.nl.net> - BeOS fixes ...@@ -58,9 +58,9 @@ Rudolf Cornelissen <rag.cornelissen@inter.nl.net> - BeOS fixes
Sebastien Chaumat <Sebastien.Chaumat@ens-lyon.fr> - YOPY port tests Sebastien Chaumat <Sebastien.Chaumat@ens-lyon.fr> - YOPY port tests
Steve Brown <sbrown@cortland.com> - fix for optional PES size bug Steve Brown <sbrown@cortland.com> - fix for optional PES size bug
Steven M. Schultz <sms@TO.GD-ES.COM> - BSD/OS port 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 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 Vladimir Chernyshov <greengrass@writeme.com> - MMX motion optimizations
Wade Majors <guru@startrek.com> - BeOS icon integration, debugging and fixes Wade Majors <guru@startrek.com> - BeOS icon integration, debugging and fixes
Watanabe Go <go@dsl.gr.jp> - fix for non-ASCII filenames Watanabe Go <go@dsl.gr.jp> - fix for non-ASCII filenames
......
#! /bin/sh #! /bin/sh
## bootstrap file for the VLC media player ## 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> ## Authors: Samuel Hocevar <sam@zoy.org>
...@@ -91,8 +91,8 @@ EOF ...@@ -91,8 +91,8 @@ EOF
NODIST=''; else NODIST=''; else
NODIST='#'; fi NODIST='#'; fi
cat >> m4/vlc.m4 << EOF cat >> m4/vlc.m4 << EOF
AM_CONDITIONAL(${mod}_plugin, test x\$${mod}_plugin = xyes) AM_CONDITIONAL(${mod}_p, test x\$${mod}_p = xyes)
AM_CONDITIONAL(${mod}_builtin, test x\$${mod}_builtin = xyes) AM_CONDITIONAL(${mod}_b, test x\$${mod}_b = xyes)
EOF EOF
# Generation of Modules.am # Generation of Modules.am
# ~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~
...@@ -104,14 +104,14 @@ EOF ...@@ -104,14 +104,14 @@ EOF
cat >> Modules.am << EOF cat >> Modules.am << EOF
# The ${mod} plugin # The ${mod} plugin
if ${mod}_plugin if ${mod}_p
if UNTRUE if UNTRUE
L_${mod}_p = ${dir}/lib${mod}_plugin.a L_${mod}_p = ${dir}/lib${mod}_plugin.a
endif endif
D_${mod}_p = ${dir}/lib${mod}_plugin\$(LIBEXT) D_${mod}_p = ${dir}/lib${mod}_plugin\$(LIBEXT)
${NODIST}B_${mod}_p = \$(nodist_SOURCES_${mod}) ${NODIST}B_${mod}_p = \$(nodist_SOURCES_${mod})
endif endif
if ${mod}_builtin if ${mod}_b
L_${mod}_b = ${dir}/lib${mod}.a L_${mod}_b = ${dir}/lib${mod}.a
F_${mod}_b = \$(LDFLAGS_${mod}) F_${mod}_b = \$(LDFLAGS_${mod})
if BUILD_MOZILLA if BUILD_MOZILLA
......
...@@ -72,14 +72,14 @@ LIBEXT=".so" ...@@ -72,14 +72,14 @@ LIBEXT=".so"
dnl dnl
dnl Check the operating system dnl Check the operating system
dnl dnl
case "x${target_os}" in case "${target_os}" in
x) "")
SYS=unknown SYS=unknown
;; ;;
xlinux*) linux*)
SYS=linux SYS=linux
;; ;;
xbsdi*) bsdi*)
SYS=bsdi SYS=bsdi
CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}" CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}"
LDFLAGS_dvd="${LDFLAGS_dvd} -ldvd" LDFLAGS_dvd="${LDFLAGS_dvd} -ldvd"
...@@ -87,11 +87,11 @@ case "x${target_os}" in ...@@ -87,11 +87,11 @@ case "x${target_os}" in
LDFLAGS_vcd="${LDFLAGS_vcd} -ldvd" LDFLAGS_vcd="${LDFLAGS_vcd} -ldvd"
LDFLAGS_cdda="${LDFLAGS_cdda} -ldvd" LDFLAGS_cdda="${LDFLAGS_cdda} -ldvd"
;; ;;
x*bsd*) *bsd*)
SYS="${target_os}" SYS="${target_os}"
CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}" CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}"
;; ;;
xdarwin*) darwin*)
SYS=darwin SYS=darwin
CFLAGS_save="${CFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CFLAGS="${CFLAGS_save}" 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}" CXXFLAGS_save="${CXXFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}"
...@@ -100,15 +100,15 @@ case "x${target_os}" in ...@@ -100,15 +100,15 @@ case "x${target_os}" in
LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -all_load" LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -all_load"
LIBEXT=".dylib" LIBEXT=".dylib"
;; ;;
x*mingw32* | x*cygwin*) *mingw32* | *cygwin*)
AC_CHECK_TOOL(WINDRES, windres, :) AC_CHECK_TOOL(WINDRES, windres, :)
LIBEXT=".dll" LIBEXT=".dll"
case "x${target_os}" in case "${target_os}" in
x*mingw32*) *mingw32*)
SYS=mingw32 SYS=mingw32
;; ;;
x*cygwin*) *cygwin*)
dnl Check if we are using the mno-cygwin mode in which case we are dnl Check if we are using the mno-cygwin mode in which case we are
dnl actually dealing with a mingw32 compiler. dnl actually dealing with a mingw32 compiler.
AC_EGREP_CPP(yes, AC_EGREP_CPP(yes,
...@@ -119,7 +119,7 @@ case "x${target_os}" in ...@@ -119,7 +119,7 @@ case "x${target_os}" in
;; ;;
esac esac
if test "x$SYS" = "xmingw32"; then if test "${SYS}" = "mingw32"; then
# add ws2_32 for closesocket, select, recv # add ws2_32 for closesocket, select, recv
CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long" CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"
CPPFLAGS="${CPPFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}"
...@@ -137,19 +137,19 @@ case "x${target_os}" in ...@@ -137,19 +137,19 @@ case "x${target_os}" in
LDFLAGS_httpd="${LDFLAGS_httpd} -lws2_32" LDFLAGS_httpd="${LDFLAGS_httpd} -lws2_32"
fi fi
;; ;;
x*nto*) *nto*)
SYS=nto SYS=nto
LDFLAGS_x11="${LDFLAGS_x11} -lsocket" LDFLAGS_x11="${LDFLAGS_x11} -lsocket"
LDFLAGS_xvideo="${LDFLAGS_xvideo} -lsocket" LDFLAGS_xvideo="${LDFLAGS_xvideo} -lsocket"
;; ;;
xsolaris*) solaris*)
SYS=solaris SYS=solaris
;; ;;
xhpux*) hpux*)
SYS=hpux SYS=hpux
LIBEXT=".sl" LIBEXT=".sl"
;; ;;
xbeos) beos)
SYS=beos SYS=beos
CFLAGS_save="${CFLAGS_save} -Wno-multichar"; CFLAGS="${CFLAGS_save}" CFLAGS_save="${CFLAGS_save} -Wno-multichar"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}" CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}"
...@@ -162,13 +162,13 @@ case "x${target_os}" in ...@@ -162,13 +162,13 @@ case "x${target_os}" in
LDFLAGS_ipv4="${LDFLAGS_ipv4} -lsocket -lbind" LDFLAGS_ipv4="${LDFLAGS_ipv4} -lsocket -lbind"
LDFLAGS_httpd="${LDFLAGS_httpd} -lsocket -lbind" ) LDFLAGS_httpd="${LDFLAGS_httpd} -lsocket -lbind" )
;; ;;
x*) *)
SYS="${target_os}" SYS="${target_os}"
;; ;;
esac esac
AM_CONDITIONAL(HAVE_BEOS, test "x${SYS}" = "xbeos") AM_CONDITIONAL(HAVE_BEOS, test "${SYS}" = "beos")
AM_CONDITIONAL(HAVE_DARWIN, test "x${SYS}" = "xdarwin") AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin")
AM_CONDITIONAL(HAVE_WIN32, test "x${SYS}" = "xmingw32") AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
dnl dnl
dnl Gettext stuff dnl Gettext stuff
...@@ -194,7 +194,7 @@ AC_MSG_CHECKING(for suffix of libraries) ...@@ -194,7 +194,7 @@ AC_MSG_CHECKING(for suffix of libraries)
AC_MSG_RESULT(${LIBEXT}) AC_MSG_RESULT(${LIBEXT})
dnl Check for the need to include the mingwex lib for mingw32 dnl Check for the need to include the mingwex lib for mingw32
if test x$SYS = xmingw32 if test "${SYS}" = "mingw32"
then then
AC_CHECK_LIB(mingwex,opendir, AC_CHECK_LIB(mingwex,opendir,
AC_CHECK_LIB(mingw32,opendir,LDFLAGS_vlc="${LDFLAGS_vlc}", AC_CHECK_LIB(mingw32,opendir,LDFLAGS_vlc="${LDFLAGS_vlc}",
...@@ -204,13 +204,13 @@ then ...@@ -204,13 +204,13 @@ then
fi fi
dnl Check for fnative-struct or mms-bitfields support for mingw32 dnl Check for fnative-struct or mms-bitfields support for mingw32
if test x$SYS = xmingw32 if test "${SYS}" = "mingw32"
then then
AC_CACHE_CHECK([if \$CC accepts -mms-bitfields], AC_CACHE_CHECK([if \$CC accepts -mms-bitfields],
[ac_cv_c_mms_bitfields], [ac_cv_c_mms_bitfields],
[CFLAGS="${CFLAGS_save} -mms-bitfields" [CFLAGS="${CFLAGS_save} -mms-bitfields"
AC_TRY_COMPILE([],,ac_cv_c_mms_bitfields=yes, ac_cv_c_mms_bitfields=no)]) 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"; CFLAGS_save="${CFLAGS_save} -mms-bitfields";
CXXFLAGS_save="${CXXFLAGS_save} -mms-bitfields"; CXXFLAGS_save="${CXXFLAGS_save} -mms-bitfields";
else else
...@@ -218,7 +218,7 @@ then ...@@ -218,7 +218,7 @@ then
[ac_cv_c_fnative_struct], [ac_cv_c_fnative_struct],
[CFLAGS="${CFLAGS_save} -fnative-struct" [CFLAGS="${CFLAGS_save} -fnative-struct"
AC_TRY_COMPILE([],,ac_cv_c_fnative_struct=yes, ac_cv_c_fnative_struct=no)]) 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"; CFLAGS_save="${CFLAGS_save} -fnative-struct";
CXXFLAGS_save="${CXXFLAGS_save} -fnative-struct"; CXXFLAGS_save="${CXXFLAGS_save} -fnative-struct";
fi fi
...@@ -228,7 +228,7 @@ then ...@@ -228,7 +228,7 @@ then
fi fi
dnl Check for fvtable-thunks support for mingw32 dnl Check for fvtable-thunks support for mingw32
if test x$SYS = xmingw32 if test "${SYS}" = "mingw32"
then then
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_CACHE_CHECK([if \$CXX accepts -fvtable-thunks], AC_CACHE_CHECK([if \$CXX accepts -fvtable-thunks],
...@@ -236,7 +236,7 @@ AC_LANG_PUSH(C++) ...@@ -236,7 +236,7 @@ AC_LANG_PUSH(C++)
[CXXFLAGS="${CXXFLAGS_save} -Wall -Werror -fvtable-thunks" [CXXFLAGS="${CXXFLAGS_save} -Wall -Werror -fvtable-thunks"
AC_TRY_COMPILE([],,ac_cv_cxx_fvtable_thunks=yes, AC_TRY_COMPILE([],,ac_cv_cxx_fvtable_thunks=yes,
ac_cv_cxx_fvtable_thunks=no)]) 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" CXXFLAGS_mingw32_special="-fvtable-thunks"
fi fi
...@@ -246,8 +246,8 @@ AC_LANG_POP(C++) ...@@ -246,8 +246,8 @@ AC_LANG_POP(C++)
fi fi
dnl Flags for plugin compilation dnl Flags for plugin compilation
case "x${SYS}" in case "${SYS}" in
xmingw32|xcygwin) mingw32|cygwin)
CFLAGS_pics="${CFLAGS_pics} ${CFLAGS_mingw32_special}" CFLAGS_pics="${CFLAGS_pics} ${CFLAGS_mingw32_special}"
CXXFLAGS_pics="${CXXFLAGS_pics} ${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}" CXXFLAGS_pics="${CXXFLAGS_pics} ${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}"
OBJCFLAGS_pics="${OBJCFLAGS_pics} ${CFLAGS_mingw32_special}" OBJCFLAGS_pics="${OBJCFLAGS_pics} ${CFLAGS_mingw32_special}"
...@@ -255,7 +255,7 @@ case "x${SYS}" in ...@@ -255,7 +255,7 @@ case "x${SYS}" in
CXXFLAGS_plugins="${CXXFLAGS_plugins} ${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}" CXXFLAGS_plugins="${CXXFLAGS_plugins} ${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}"
OBJCFLAGS_plugins="${OBJCFLAGS_plugins} ${CFLAGS_mingw32_special}" OBJCFLAGS_plugins="${OBJCFLAGS_plugins} ${CFLAGS_mingw32_special}"
;; ;;
x*) *)
CFLAGS_pics="${CFLAGS_pics} -fPIC" CFLAGS_pics="${CFLAGS_pics} -fPIC"
CXXFLAGS_pics="${CXXFLAGS_pics} -fPIC" CXXFLAGS_pics="${CXXFLAGS_pics} -fPIC"
OBJCFLAGS_pics="${OBJCFLAGS_pics} -fPIC" OBJCFLAGS_pics="${OBJCFLAGS_pics} -fPIC"
...@@ -309,7 +309,7 @@ AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t, ...@@ -309,7 +309,7 @@ AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t,
[socklen_t len = 42; return len;], [socklen_t len = 42; return len;],
ac_cv_type_socklen_t=yes, ac_cv_type_socklen_t=yes,
ac_cv_type_socklen_t=no)]) 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.]) AC_DEFINE(HAVE_SOCKLEN_T, 1, [Define if <sys/socket.h> defines socklen_t.])
fi fi
...@@ -320,7 +320,7 @@ AC_CACHE_CHECK([for va_copy], ac_cv_c_va_copy, ...@@ -320,7 +320,7 @@ AC_CACHE_CHECK([for va_copy], ac_cv_c_va_copy,
[va_list ap1, ap2; va_copy(ap1,ap2);], [va_list ap1, ap2; va_copy(ap1,ap2);],
[ac_cv_c_va_copy="yes"], [ac_cv_c_va_copy="yes"],
[ac_cv_c_va_copy="no"])) [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.]) AC_DEFINE(HAVE_VA_COPY, 1, [Define if <stdarg.h> defines va_copy.])
fi fi
AC_CACHE_CHECK([for __va_copy], ac_cv_c___va_copy, 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, ...@@ -329,7 +329,7 @@ AC_CACHE_CHECK([for __va_copy], ac_cv_c___va_copy,
[va_list ap1, ap2; __va_copy(ap1,ap2);], [va_list ap1, ap2; __va_copy(ap1,ap2);],
[ac_cv_c___va_copy="yes"], [ac_cv_c___va_copy="yes"],
[ac_cv_c___va_copy="no"])) [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.]) AC_DEFINE(HAVE___VA_COPY, 1, [Define if <stdarg.h> defines __va_copy.])
fi fi
...@@ -346,7 +346,7 @@ AC_CHECK_FUNCS(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)], ...@@ -346,7 +346,7 @@ AC_CHECK_FUNCS(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)],
[need_getopt=:])]) [need_getopt=:])])
AM_CONDITIONAL(BUILD_GETOPT, ${need_getopt}) AM_CONDITIONAL(BUILD_GETOPT, ${need_getopt})
if test "x$SYS" != "xmingw32"; then if test "${SYS}" != "mingw32"; then
AC_TYPE_SIGNAL AC_TYPE_SIGNAL
AC_CHECK_LIB(dl,dlopen,LDFLAGS_vlc="${LDFLAGS_vlc} -ldl") AC_CHECK_LIB(dl,dlopen,LDFLAGS_vlc="${LDFLAGS_vlc} -ldl")
AC_CHECK_LIB(m,cos, AC_CHECK_LIB(m,cos,
...@@ -366,21 +366,21 @@ AC_CHECK_LIB(m,pow, ...@@ -366,21 +366,21 @@ AC_CHECK_LIB(m,pow,
AC_CHECK_LIB(m,sqrt, AC_CHECK_LIB(m,sqrt,
LDFLAGS_headphone_channel_mixer="${LDFLAGS_headphone_channel_mixer} -lm" 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 dnl Check for pthreads - borrowed from XMMS
THREAD_LIB=error THREAD_LIB=error
if test "x${THREAD_LIB}" = "xerror"; then if test "${THREAD_LIB}" = "error"; then
AC_CHECK_LIB(pthread,main,THREAD_LIB="-lpthread") AC_CHECK_LIB(pthread,main,THREAD_LIB="-lpthread")
fi fi
if test "x${THREAD_LIB}" = "xerror"; then if test "${THREAD_LIB}" = "error"; then
AC_CHECK_LIB(pthreads,main,THREAD_LIB="-lpthreads") AC_CHECK_LIB(pthreads,main,THREAD_LIB="-lpthreads")
fi fi
if test "x${THREAD_LIB}" = "xerror"; then if test "${THREAD_LIB}" = "error"; then
AC_CHECK_LIB(c_r,main,THREAD_LIB="-lc_r") AC_CHECK_LIB(c_r,main,THREAD_LIB="-lc_r")
fi fi
if test "x${THREAD_LIB}" = "xerror"; then if test "${THREAD_LIB}" = "error"; then
AC_CHECK_FUNCS(pthread_mutex_lock) AC_CHECK_FUNCS(pthread_mutex_lock)
THREAD_LIB="" THREAD_LIB=""
fi fi
...@@ -393,7 +393,7 @@ dnl GNU portable threads ...@@ -393,7 +393,7 @@ dnl GNU portable threads
dnl dnl
AC_ARG_ENABLE(pth, AC_ARG_ENABLE(pth,
[ --enable-pth GNU Pth support (default disabled)], [ --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_CHECK_LIB(pth,pth_init)
AC_MSG_CHECKING(for pth_init in pth.h) AC_MSG_CHECKING(for pth_init in pth.h)
AC_EGREP_HEADER(pth_init,pth.h,[ AC_EGREP_HEADER(pth_init,pth.h,[
...@@ -412,7 +412,7 @@ dnl State Threads ...@@ -412,7 +412,7 @@ dnl State Threads
dnl dnl
AC_ARG_ENABLE(st, AC_ARG_ENABLE(st,
[ --enable-st State Threads (default disabled)], [ --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_CHECK_LIB(st,st_init)
AC_MSG_CHECKING(for st_init in st.h) AC_MSG_CHECKING(for st_init in st.h)
AC_EGREP_HEADER(st_init,st.h,[ AC_EGREP_HEADER(st_init,st.h,[
...@@ -430,7 +430,7 @@ LDFLAGS_vlc="${LDFLAGS_vlc} ${THREAD_LIB}" ...@@ -430,7 +430,7 @@ LDFLAGS_vlc="${LDFLAGS_vlc} ${THREAD_LIB}"
LDFLAGS_plugins="${LDFLAGS_plugins} ${THREAD_LIB}" LDFLAGS_plugins="${LDFLAGS_plugins} ${THREAD_LIB}"
dnl Don't link with rt when using GNU-pth 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 dnl HP/UX port
AC_CHECK_LIB(rt,sem_init, [LDFLAGS_vlc="${LDFLAGS_vlc} -lrt"]) AC_CHECK_LIB(rt,sem_init, [LDFLAGS_vlc="${LDFLAGS_vlc} -lrt"])
...@@ -462,7 +462,7 @@ AC_EGREP_HEADER(pthread_once,pthread.h,[ ...@@ -462,7 +462,7 @@ AC_EGREP_HEADER(pthread_once,pthread.h,[
AC_DEFINE(PTHREAD_ONCE_IN_PTHREAD_H, 1, AC_DEFINE(PTHREAD_ONCE_IN_PTHREAD_H, 1,
Define if <pthread.h> defines pthread_once.)],[ Define if <pthread.h> defines pthread_once.)],[
AC_MSG_RESULT(no)]) AC_MSG_RESULT(no)])
fi # end "x$SYS" != "xmingw32" fi # end "${SYS}" != "mingw32"
AC_MSG_CHECKING(for strncasecmp in strings.h) AC_MSG_CHECKING(for strncasecmp in strings.h)
AC_EGREP_HEADER(strncasecmp,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 ...@@ -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(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(dlfcn.h image.h)
AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.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(machine/param.h sys/shm.h)
AC_CHECK_HEADERS(linux/version.h) AC_CHECK_HEADERS(linux/version.h)
fi # end "x$SYS" != "xmingw32" fi # end "${SYS}" != "mingw32"
AC_HEADER_TIME AC_HEADER_TIME
...@@ -489,7 +489,7 @@ AC_CHECK_HEADERS(dirent.h,,[need_dirent=:]) ...@@ -489,7 +489,7 @@ AC_CHECK_HEADERS(dirent.h,,[need_dirent=:])
AM_CONDITIONAL(BUILD_DIRENT, ${need_dirent}) AM_CONDITIONAL(BUILD_DIRENT, ${need_dirent})
dnl Mac OS X and other OSes don't have declaration for nanosleep 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_MSG_CHECKING(for nanosleep in time.h)
AC_EGREP_HEADER(nanosleep,time.h,[ AC_EGREP_HEADER(nanosleep,time.h,[
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
...@@ -498,7 +498,7 @@ AC_EGREP_HEADER(nanosleep,time.h,[ ...@@ -498,7 +498,7 @@ AC_EGREP_HEADER(nanosleep,time.h,[
],[ ],[
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
]) ])
fi # end "x$SYS" != "xmingw32" fi # end "${SYS}" != "mingw32"
dnl Make sure we have timespecs dnl Make sure we have timespecs
AC_MSG_CHECKING(for timespec in sys/time.h) AC_MSG_CHECKING(for timespec in sys/time.h)
...@@ -511,15 +511,15 @@ AC_EGREP_HEADER(timespec,sys/time.h,[ ...@@ -511,15 +511,15 @@ AC_EGREP_HEADER(timespec,sys/time.h,[
]) ])
dnl Check for threads library 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) 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 dnl Default X headers and libraries
if test "x${x_includes}" = "xNONE"; then if test "${x_includes}" = "NONE"; then
x_includes="/usr/X11R6/include" x_includes="/usr/X11R6/include"
fi fi
if test "x${x_libraries}" = "xNONE"; then if test "${x_libraries}" = "NONE"; then
x_libraries="/usr/X11R6/lib" x_libraries="/usr/X11R6/lib"
fi fi
...@@ -539,7 +539,7 @@ AC_CACHE_CHECK([for ntohl in sys/param.h], ...@@ -539,7 +539,7 @@ AC_CACHE_CHECK([for ntohl in sys/param.h],
AC_TRY_COMPILE([#include <sys/param.h>], AC_TRY_COMPILE([#include <sys/param.h>],
[void foo() { int meuh; ntohl(meuh); }], [void foo() { int meuh; ntohl(meuh); }],
ac_cv_c_ntohl_sys_param_h=yes, ac_cv_c_ntohl_sys_param_h=no)]) 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.) AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if <sys/param.h> defines ntohl.)
fi fi
...@@ -548,7 +548,7 @@ AC_CACHE_CHECK([if \$CC accepts -finline-limit], ...@@ -548,7 +548,7 @@ AC_CACHE_CHECK([if \$CC accepts -finline-limit],
[ac_cv_c_inline_limit], [ac_cv_c_inline_limit],
[CFLAGS="${CFLAGS_save} -finline-limit-30000" [CFLAGS="${CFLAGS_save} -finline-limit-30000"
AC_TRY_COMPILE([],,ac_cv_c_inline_limit=yes, ac_cv_c_inline_limit=no)]) 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}" CFLAGS_save="${CFLAGS_save} -finline-limit-30000"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="${CXXFLAGS_save} -finline-limit-30000"; CXXFLAGS="${CXXFLAGS_save}" CXXFLAGS_save="${CXXFLAGS_save} -finline-limit-30000"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="${OBJCFLAGS_save} -finline-limit-30000"; OBJCFLAGS="${OBJCFLAGS_save}" OBJCFLAGS_save="${OBJCFLAGS_save} -finline-limit-30000"; OBJCFLAGS="${OBJCFLAGS_save}"
...@@ -562,7 +562,7 @@ fi ...@@ -562,7 +562,7 @@ fi
# [ac_cv_c_W${flag}], # [ac_cv_c_W${flag}],
# [CFLAGS="-W${flag} ${CFLAGS_save}" # [CFLAGS="-W${flag} ${CFLAGS_save}"
# AC_TRY_COMPILE([],,ac_cv_c_W${flag}=yes, ac_cv_c_W${flag}=no)]) # 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}" # CFLAGS_save="-W${flag} ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
# CXXFLAGS_save="-W${flag} ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" # CXXFLAGS_save="-W${flag} ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
# OBJCFLAGS_save="-W${flag} ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}" # OBJCFLAGS_save="-W${flag} ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
...@@ -599,43 +599,43 @@ AC_CACHE_CHECK([if \$CC accepts -Winline], ...@@ -599,43 +599,43 @@ AC_CACHE_CHECK([if \$CC accepts -Winline],
[CFLAGS="-Winline ${CFLAGS_save}" [CFLAGS="-Winline ${CFLAGS_save}"
AC_TRY_COMPILE([],,ac_cv_c_Winline=yes, ac_cv_c_Winline=no)]) 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}" CFLAGS_save="-Wall ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="-Wall ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" CXXFLAGS_save="-Wall ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="-Wall ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}" OBJCFLAGS_save="-Wall ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
fi 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}" # CFLAGS_save="-Wunreachable-code ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
# CXXFLAGS_save="-Wunreachable-code ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" # CXXFLAGS_save="-Wunreachable-code ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
# OBJCFLAGS_save="-Wunreachable-code ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_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 -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. 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}" # CFLAGS_save="-Wconversion ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
# CXXFLAGS_save="-Wconversion ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" # CXXFLAGS_save="-Wconversion ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
# OBJCFLAGS_save="-Wconversion ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}" # OBJCFLAGS_save="-Wconversion ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
# fi # 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}" CXXFLAGS_save="-Winline ${CXXFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
fi fi
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}" CFLAGS_save="-Wsign-compare ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="-Wsign-compare ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" CXXFLAGS_save="-Wsign-compare ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="-Wsign-compare ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}" OBJCFLAGS_save="-Wsign-compare ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
fi 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}" CFLAGS_save="-Wdisabled-optimization ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="-Wdisabled-optimization ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" CXXFLAGS_save="-Wdisabled-optimization ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="-Wdisabled-optimization ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}" OBJCFLAGS_save="-Wdisabled-optimization ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
fi fi