videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-07-21 07:24:15 +02:00
Code Releases Activity

Adds some missing files to dist target (blaming j-b & dionoea)

Browse Source 
Adds libgcrypt.m4 for systems running autotools without libgcrypt-dev installed
Prefers tabs over spaces in Makefiles
This commit is contained in:
Rafaël Carré 2007-11-28 18:58:06 +00:00
parent 4816afd20f
commit 8f32f1ea83
4 changed files with 155 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
m4/Makefile.am
View File

@ -20,7 +20,8 @@ EXTRA_DIST = \
lib-ld.m4 \
lib-link.m4 \
lib-prefix.m4 \
lock.m4
libgcrypt.m4 \
lock.m4 \
private.m4 \
progtest.m4 \
stdint_h.m4 \

108
m4/libgcrypt.m4 Normal file
View File

@ -0,0 +1,108 @@
dnl Autoconf macros for libgcrypt
dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.
dnl
dnl This file is free software; as a special exception the author gives
dnl unlimited permission to copy and/or distribute it, with or without
dnl modifications, as long as this notice is preserved.
dnl
dnl This file is distributed in the hope that it will be useful, but
dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
dnl with the API version to also check the API compatibility. Example:
dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using
dnl this features allows to prevent build against newer versions of libgcrypt
dnl with a changed API.
dnl
AC_DEFUN([AM_PATH_LIBGCRYPT],
[ AC_ARG_WITH(libgcrypt-prefix,
AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
[prefix where LIBGCRYPT is installed (optional)]),
libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
if test x$libgcrypt_config_prefix != x ; then
if test x${LIBGCRYPT_CONFIG+set} != xset ; then
LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
fi
fi
AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
tmp=ifelse([$1], ,1:1.2.0,$1)
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
else
req_libgcrypt_api=0
min_libgcrypt_version="$tmp"
fi
AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
ok=no
if test "$LIBGCRYPT_CONFIG" != "no" ; then
req_major=`echo $min_libgcrypt_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
req_minor=`echo $min_libgcrypt_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
req_micro=`echo $min_libgcrypt_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
major=`echo $libgcrypt_config_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
minor=`echo $libgcrypt_config_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
micro=`echo $libgcrypt_config_version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
if test "$major" -gt "$req_major"; then
ok=yes
else
if test "$major" -eq "$req_major"; then
if test "$minor" -gt "$req_minor"; then
ok=yes
else
if test "$minor" -eq "$req_minor"; then
if test "$micro" -ge "$req_micro"; then
ok=yes
fi
fi
fi
fi
fi
fi
if test $ok = yes; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
if test $ok = yes; then
# If we have a recent libgcrypt, we should also check that the
# API is compatible
if test "$req_libgcrypt_api" -gt 0 ; then
tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
if test "$tmp" -gt 0 ; then
AC_MSG_CHECKING([LIBGCRYPT API version])
if test "$req_libgcrypt_api" -eq "$tmp" ; then
AC_MSG_RESULT(okay)
else
ok=no
AC_MSG_RESULT([does not match (want=$req_libgcrypt_api got=$tmp)])
fi
fi
fi
fi
if test $ok = yes; then
LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
ifelse([$2], , :, [$2])
else
LIBGCRYPT_CFLAGS=""
LIBGCRYPT_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(LIBGCRYPT_CFLAGS)
AC_SUBST(LIBGCRYPT_LIBS)
])

8
modules/gui/qt4/Modules.am
View File

@ -176,7 +176,8 @@ EXTRA_DIST += \
pixmaps/folder-blue_16px.png \
pixmaps/folder-grey_16px.png \
pixmaps/go-next.png \
pixmaps/menus_help_16px.png \
pixmaps/harddisk_16px.png \
pixmaps/menus_help_16px.png \
pixmaps/menus_info_16px.png \
pixmaps/menus_messages_16px.png \
pixmaps/menus_preferences_16px.png \
@ -219,4 +220,7 @@ pixmaps/menus_help_16px.png \
pixmaps/type_unknown.xpm \
pixmaps/volume-high.png \
pixmaps/volume-low.png \
pixmaps/volume-muted.png
pixmaps/volume-muted.png \
pixmaps/volume-slider.svg \
pixmaps/volume-slider-inside.png \
pixmaps/volume-slider-outside.png

75
share/Makefile.am
View File

@ -35,14 +35,14 @@ DIST_rsrc = \
vlc_win32_rc.rc
DIST_pda = \
pda-forwardb16x16.xpm \
pda-openb16x16.xpm \
pda-pauseb16x16.xpm \
pda-playb16x16.xpm \
pda-playlistb16x16.xpm \
pda-preferencesb16x16.xpm \
pda-rewindb16x16.xpm \
pda-stopb16x16.xpm
pda-forwardb16x16.xpm \
pda-openb16x16.xpm \
pda-pauseb16x16.xpm \
pda-playb16x16.xpm \
pda-playlistb16x16.xpm \
pda-preferencesb16x16.xpm \
pda-rewindb16x16.xpm \
pda-stopb16x16.xpm
DIST_icons16 = vlc16x16.png vlc16x16.xpm
@ -60,34 +60,34 @@ DIST_skins2 = \
skins2/winamp2.xml
skins2_default_vlt_FILES = \
skins2/default/main/pause_over.png \
skins2/default/main/main_up.png \
skins2/default/main/timeslider.png \
skins2/default/main/main_down.png \
skins2/default/main/main.png \
skins2/default/main/dvd_prevtitle.png \
skins2/default/main/dvd_nexttitle.png \
skins2/default/main/dvd_nextchapter.png \
skins2/default/main/pause_up.png \
skins2/default/main/main_over.png \
skins2/default/main/pause_down.png \
skins2/default/main/dvd_prevchapter.png \
skins2/default/main/vol_bg.png \
skins2/default/main/vol_mask.png \
skins2/default/main/vol_slider.png \
skins2/default/main/dvd_menu.png \
skins2/default/switch.png \
skins2/default/font.otf \
skins2/default/credits.png \
skins2/default/theme.xml \
skins2/default/playlist/plscroller.png \
skins2/default/playlist/playlist_down.png \
skins2/default/playlist/playtreeglyphs.png \
skins2/default/playlist/playlist_up.png \
skins2/default/playlist/playlist_over.png \
skins2/default/playlist/playlist.png \
skins2/default/minimal.png \
skins2/default/equalizer.png
skins2/default/main/pause_over.png \
skins2/default/main/main_up.png \
skins2/default/main/timeslider.png \
skins2/default/main/main_down.png \
skins2/default/main/main.png \
skins2/default/main/dvd_prevtitle.png \
skins2/default/main/dvd_nexttitle.png \
skins2/default/main/dvd_nextchapter.png \
skins2/default/main/pause_up.png \
skins2/default/main/main_over.png \
skins2/default/main/pause_down.png \
skins2/default/main/dvd_prevchapter.png \
skins2/default/main/vol_bg.png \
skins2/default/main/vol_mask.png \
skins2/default/main/vol_slider.png \
skins2/default/main/dvd_menu.png \
skins2/default/switch.png \
skins2/default/font.otf \
skins2/default/credits.png \
skins2/default/theme.xml \
skins2/default/playlist/plscroller.png \
skins2/default/playlist/playlist_down.png \
skins2/default/playlist/playtreeglyphs.png \
skins2/default/playlist/playlist_up.png \
skins2/default/playlist/playlist_over.png \
skins2/default/playlist/playlist.png \
skins2/default/minimal.png \
skins2/default/equalizer.png
skins2/default.vlt: $(skins2_default_vlt_FILES)
mkdir -p skins2
@ -251,6 +251,7 @@ DIST_lua= \
luameta/README.txt \
luameta/googleimage.lua \
luaplaylist/README.txt \
luaplaylist/appletrailers.lua \
luaplaylist/break.lua \
luaplaylist/dailymotion.lua \
luaplaylist/joox.lua \
@ -271,6 +272,7 @@ DIST_lua= \
DIST_http_lua = \
http-lua/.hosts \
http-lua/custom.lua \
http-lua/dialogs/.hosts \
http-lua/dialogs/browse \
http-lua/dialogs/footer \
@ -299,6 +301,7 @@ DIST_http_lua = \
http-lua/images/prev.png \
http-lua/images/refresh.png \
http-lua/images/repeat.png \
http-lua/images/reset.png \
http-lua/images/sd.png \
http-lua/images/shuffle.png \
http-lua/images/slider_bar.png \