Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-10-22 07:21:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build system: use system version of UTF8-CPP if present

Browse Source
This commit is contained in:
Dominik 'Rathann' Mierzejewski 2015-03-31 01:32:37 +02:00
parent 2f82b3a3d5
commit fcd92036b4
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Rakefile
View File

@ -54,9 +54,13 @@ def setup_globals
$manpages = $programs.collect { |name| "doc/man/#{name}.1" } $manpages = $programs.collect { |name| "doc/man/#{name}.1" }
$manpages << "doc/man/mkvtoolnix-gui.1" if !$build_mkvtoolnix_gui $manpages << "doc/man/mkvtoolnix-gui.1" if !$build_mkvtoolnix_gui
$system_includes = "-I. -Ilib -Ilib/avilib-0.6.10 -Ilib/utf8-cpp/source -Isrc" $system_includes = "-I. -Ilib -Ilib/avilib-0.6.10 -Isrc"
$system_libdirs = "-Llib/avilib-0.6.10 -Llib/librmff -Lsrc/common" $system_libdirs = "-Llib/avilib-0.6.10 -Llib/librmff -Lsrc/common"
if c?(:UTF8CPP_INTERNAL)
$system_includes += " -Ilib/utf8-cpp/source"
end
if c?(:PUGIXML_INTERNAL) if c?(:PUGIXML_INTERNAL)
$system_includes += " -Ilib/pugixml/src" $system_includes += " -Ilib/pugixml/src"
$system_libdirs += " -Llib/pugixml/src" $system_libdirs += " -Llib/pugixml/src"

19
ac/utf8cpp.m4 Normal file
View File

@ -0,0 +1,19 @@
dnl
dnl Check for UTF8-CPP
dnl
AC_LANG_PUSH(C++)
AC_CHECK_HEADERS([utf8.h])
AC_LANG_POP
if test x"$ac_cv_header_utf8_h" = xyes; then
AC_MSG_NOTICE([Using the system version of UTF8-CPP])
UTF8CPP_INTERNAL=no
else
AC_MSG_NOTICE([Using the internal version of UTF8-CPP])
UTF8CPP_INTERNAL=yes
fi
AC_SUBST(UTF8CPP_INTERNAL)

1
configure.in
View File

@ -30,6 +30,7 @@ m4_include(ac/vorbis.m4)
m4_include(ac/flac.m4) m4_include(ac/flac.m4)
m4_include(ac/matroska.m4) m4_include(ac/matroska.m4)
m4_include(ac/pugixml.m4) m4_include(ac/pugixml.m4)
m4_include(ac/utf8cpp.m4)
m4_include(ac/zlib.m4) m4_include(ac/zlib.m4)
m4_include(ac/wxwidgets.m4) m4_include(ac/wxwidgets.m4)
m4_include(ac/qt5.m4) m4_include(ac/qt5.m4)