Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-25 04:11:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Proper CFLAGS, LDFLAGS, -lxxx for expat and zlib.

Browse Source
This commit is contained in:
Moritz Bunkus 2003-09-01 16:32:33 +00:00
parent 059a99c5ec
commit f54ac11b4a
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
acinclude-2.1.m4
View File

@ -675,7 +675,7 @@ AC_DEFUN(PATH_EXPAT,
EXPAT_CFLAGS= EXPAT_CFLAGS=
EXPAT_LIBS= EXPAT_LIBS=
if test "$with_expat" != "yes"; then if test "$with_expat" != "yes" -a "$with_expat" != ""; then
EXPAT_CFLAGS="-I$with_expat/include" EXPAT_CFLAGS="-I$with_expat/include"
EXPAT_LIBS="-L$with_expat/lib" EXPAT_LIBS="-L$with_expat/lib"
fi fi
@ -710,7 +710,7 @@ AC_DEFUN(PATH_ZLIB,
ZLIB_CFLAGS= ZLIB_CFLAGS=
ZLIB_LIBS= ZLIB_LIBS=
if test "$with_zlib" != "yes"; then if test "$with_zlib" != "yes" -a "$with_zlib" != ""; then
ZLIB_CFLAGS="-I$with_zlib/include" ZLIB_CFLAGS="-I$with_zlib/include"
ZLIB_LIBS="-L$with_zlib/lib" ZLIB_LIBS="-L$with_zlib/lib"
fi fi

4
acinclude-2.5.m4
View File

@ -675,7 +675,7 @@ AC_DEFUN(PATH_EXPAT,
EXPAT_CFLAGS= EXPAT_CFLAGS=
EXPAT_LIBS= EXPAT_LIBS=
if test "$with_expat" != "yes"; then if test "$with_expat" != "yes" -a "$with_expat" != ""; then
EXPAT_CFLAGS="-I$with_expat/include" EXPAT_CFLAGS="-I$with_expat/include"
EXPAT_LIBS="-L$with_expat/lib" EXPAT_LIBS="-L$with_expat/lib"
fi fi
@ -710,7 +710,7 @@ AC_DEFUN(PATH_ZLIB,
ZLIB_CFLAGS= ZLIB_CFLAGS=
ZLIB_LIBS= ZLIB_LIBS=
if test "$with_zlib" != "yes"; then if test "$with_zlib" != "yes" -a "$with_zlib" != ""; then
ZLIB_CFLAGS="-I$with_zlib/include" ZLIB_CFLAGS="-I$with_zlib/include"
ZLIB_LIBS="-L$with_zlib/lib" ZLIB_LIBS="-L$with_zlib/lib"
fi fi

2
configure.in
View File

@ -26,7 +26,7 @@ dnl Check for headers
AC_HEADER_STDC() AC_HEADER_STDC()
CFLAGS="-Wall -Wno-sign-compare -Wno-comment -I../src @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@ @MATROSKA_CFLAGS@ @EBML_CFLAGS@" CFLAGS="-Wall -Wno-sign-compare -Wno-comment -I../src @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@ @MATROSKA_CFLAGS@ @EBML_CFLAGS@"
CXXFLAGS="-Wall -Wno-sign-compare -Wno-comment -I../avilib -I.. @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@ @MATROSKA_CFLAGS@ @EBML_CFLAGS@ @WXWINDOWS_CFLAGS@ @EXPAT_CFLAGS@" CXXFLAGS="-Wall -Wno-sign-compare -Wno-comment -I../avilib -I.. @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@ @MATROSKA_CFLAGS@ @EBML_CFLAGS@ @WXWINDOWS_CFLAGS@ @EXPAT_CFLAGS@ @ZLIB_CFLAGS@"
LDFLAGS=-L../avilib LDFLAGS=-L../avilib
AC_OUTPUT(Makefile avilib/Makefile src/Makefile doc/Makefile) AC_OUTPUT(Makefile avilib/Makefile src/Makefile doc/Makefile)

2
src/Makefile.am
View File

@ -65,7 +65,7 @@ base64tool_SOURCES = base64tool.cpp \
mkvmerge_LDADD = @AVILIB_LIBS@ @PROFILING_LIBS@ \ mkvmerge_LDADD = @AVILIB_LIBS@ @PROFILING_LIBS@ \
@MATROSKA_LIBS@ @EBML_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ \ @MATROSKA_LIBS@ @EBML_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ \
@ICONV_LIBS@ @MINGW_LIBS@ @EXPAT_LIBS@ -lexpat @ICONV_LIBS@ @MINGW_LIBS@ @EXPAT_LIBS@ @ZLIB_LIBS@
mkvinfo_LDADD = @PROFILING_LIBS@ @MATROSKA_LIBS@ @EBML_LIBS@ @ICONV_LIBS@ \ mkvinfo_LDADD = @PROFILING_LIBS@ @MATROSKA_LIBS@ @EBML_LIBS@ @ICONV_LIBS@ \
@WXWINDOWS_LIBS@ @MINGW_LIBS@ @WXWINDOWS_LIBS@ @MINGW_LIBS@