third-party-mirrors/spek
1
0
Fork 0
mirror of https://github.com/alexkay/spek.git synced 2025-06-10 04:12:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up dependency detection

Browse Source
This commit is contained in:
Alexander Kojevnikov 2012-08-10 21:55:38 -07:00
parent 4f8de5bdea
commit 093e80037d
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.ac
View File

@ -14,15 +14,15 @@ AC_MSG_CHECKING([the OS])
AS_CASE([$host], AS_CASE([$host],
[*-*-mingw*], [ [*-*-mingw*], [
os="WIN" os="WIN"
AC_DEFINE([OS_WIN], [1], [Platform]) AC_DEFINE([OS_WIN], [1], [Windows])
], ],
[*-*-darwin*], [ [*-*-darwin*], [
os="OSX" os="OSX"
AC_DEFINE([OS_OSX], [1], [Platform]) AC_DEFINE([OS_OSX], [1], [OS X])
], ],
[*], [ [*], [
os="UNIX" os="UNIX"
AC_DEFINE([OS_UNIX], [1], [Platform]) AC_DEFINE([OS_UNIX], [1], [Unix])
] ]
) )
AC_MSG_RESULT([$os]) AC_MSG_RESULT([$os])
@ -30,14 +30,12 @@ AC_MSG_RESULT([$os])
AC_CHECK_LIB(m, log10) AC_CHECK_LIB(m, log10)
pkg_modules="libavformat >= 52.111 libavcodec >= 52.123 libavutil" pkg_modules="libavformat >= 52.111 libavcodec >= 52.123 libavutil"
PKG_CHECK_MODULES(SPEK, [$pkg_modules]) PKG_CHECK_MODULES(FFMPEG, [$pkg_modules])
AC_SUBST(SPEK_CFLAGS)
AC_SUBST(SPEK_LIBS)
AM_OPTIONS_WXCONFIG AM_OPTIONS_WXCONFIG
reqwx=2.8.0 reqwx=2.8.0
AM_PATH_WXCONFIG($reqwx, wxWin=1) AM_PATH_WXCONFIG($reqwx, wx=1)
if test "$wxWin" != 1; then if test "$wx" != 1; then
AC_MSG_ERROR([ AC_MSG_ERROR([
wxWidgets must be installed on your system. wxWidgets must be installed on your system.
@ -49,11 +47,6 @@ if test "$wxWin" != 1; then
]) ])
fi fi
CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
LIBS="$LIBS $WX_LIBS"
GETTEXT_PACKAGE=spek GETTEXT_PACKAGE=spek
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext Package]) AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext Package])
AC_SUBST(GETTEXT_PACKAGE) AC_SUBST(GETTEXT_PACKAGE)

16
src/Makefile.am
View File

@ -15,18 +15,16 @@ spek_SOURCES = \
spek_CPPFLAGS = \ spek_CPPFLAGS = \
-include config.h \ -include config.h \
-DLOCALEDIR=\""$(localedir)"\" \ $(WX_CPPFLAGS)
-DPKGDATADIR=\""$(pkgdatadir)"\" \
-DPKGLIBDIR=\""$(pkglibdir)"\"
spek_CFLAGS = \ spek_CFLAGS = \
$(SPEK_CFLAGS) \ $(FFMPEG_CFLAGS) \
@CFLAGS@ $(WX_CFLAGS_ONLY)
spek_CXXFLAGS = \ spek_CXXFLAGS = \
$(SPEK_CFLAGS) \ $(FFMPEG_CFLAGS) \
@CXXFLAGS@ $(WX_CXXFLAGS_ONLY)
spek_LDADD = \ spek_LDADD = \
$(SPEK_LIBS) \ $(FFMPEG_LIBS) \
@LIBS@ $(WX_LIBS)