Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 20:01:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added/updated the wxWindows check.

Browse Source
This commit is contained in:
Moritz Bunkus 2003-05-28 08:20:12 +00:00
parent 8af067e55d
commit 393d2fd980
2 changed files with 64 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
acinclude-2.1.m4
View File

@ -639,3 +639,43 @@ dnl [Define as const if the declaration of iconv() needs const.])
AC_SUBST(ICONV_LIBS)
])
dnl PATH_WXWINDOWS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl Test for wxWindows, and define MATROSKA_CFLAGS and MATROSKA_LIBS
dnl
AC_DEFUN(PATH_WXWINDOWS,
[
AC_MSG_CHECKING(for wxWindows)
if wx-config --cxxflags > /dev/null 2>&1; then
wxwversion=`wx-config --version`
wxwver_ok=`echo $wxwversion | sed 's;\.;\ ;g' | (read -a mver
if test ${mver[[0]]} -gt 2 ; then
wxwver_ok=1
elif test ${mver[[0]]} -lt 2 ; then
wxwver_ok=0
else
if test ${mver[[1]]} -ge 4 ; then
wxwver_ok=1
else
wxwver_ok=0
fi
fi
echo $wxwver_ok )`
if test "$wxwver_ok" = "1" ; then
WXWINDOWS_CFLAGS=$(wx-config --cxxflags)
WXWINDOWS_LDFLAGS=$(wx-config --ldflags)
WXWINDOWS_LIBS=$(wx-config --libs)
echo '#define HAVE_WXWINDOWS 1' >> config.h
AC_MSG_RESULT($wxwversion ok)
else
AC_MSG_RESULT(no: version $wxwversion is too old)
fi
else
echo '/* #define HAVE_WXWINDOWS 1 */' >> config.h
AC_MSG_RESULT(no: wx-config was not found)
fi
AC_SUBST(WXWINDOWS_CFLAGS)
AC_SUBST(WXWINDOWS_LDFLAGS)
AC_SUBST(WXWINDOWS_LIBS)
])

30
acinclude-2.5.m4
View File

@ -646,12 +646,30 @@ AC_DEFUN(PATH_WXWINDOWS,
[
AC_MSG_CHECKING(for wxWindows)
if wx-config --cxxflags > /dev/null 2>&1; then
wx_config="yes"
WXWINDOWS_CFLAGS=$(wx-config --cxxflags)
WXWINDOWS_LDFLAGS=$(wx-config --ldflags)
WXWINDOWS_LIBS=$(wx-config --libs)
echo '#define HAVE_WXWINDOWS 1' >> config.h
AC_MSG_RESULT(yes)
wxwversion=`wx-config --version`
wxwver_ok=`echo $wxwversion | sed 's;\.;\ ;g' | (read -a mver
if test ${mver[[0]]} -gt 2 ; then
wxwver_ok=1
elif test ${mver[[0]]} -lt 2 ; then
wxwver_ok=0
else
if test ${mver[[1]]} -ge 4 ; then
wxwver_ok=1
else
wxwver_ok=0
fi
fi
echo $wxwver_ok )`
if test "$wxwver_ok" = "1" ; then
WXWINDOWS_CFLAGS=$(wx-config --cxxflags)
WXWINDOWS_LDFLAGS=$(wx-config --ldflags)
WXWINDOWS_LIBS=$(wx-config --libs)
echo '#define HAVE_WXWINDOWS 1' >> config.h
AC_MSG_RESULT($wxwversion ok)
else
AC_MSG_RESULT(no: version $wxwversion is too old)
fi
else
echo '/* #define HAVE_WXWINDOWS 1 */' >> config.h
AC_MSG_RESULT(no: wx-config was not found)