walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Improve check for standard libs 

Previously, with <lib>_LIBS and <lib>_CFLAGS undefined,
the most basic compile command "$CC conftest.c -l<lib>" was not
tested.

issue: 129
This commit is contained in:
Rex Dieter 2014-03-24 17:01:23 +00:00
parent c302efcf86
commit 259f629a46
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
m4/opj_check_lib.m4
View File

@ -21,16 +21,28 @@ __opj_func=$4
__opj_have_dep="no" __opj_have_dep="no"
save_CPPFLAGS=${CPPFLAGS} save_CPPFLAGS=${CPPFLAGS}
save_LDFLAGS=${LDFLAGS}
save_LIBS=${LIBS} save_LIBS=${LIBS}
if test "x${__opj_prefix}" = "x" ; then if test "x$UP[_CFLAGS]" != "x"; then
CPPFLAGS="${CPPFLAGS} $UP[_CFLAGS]" CPPFLAGS="${CPPFLAGS} $UP[_CFLAGS]"
LDFLAGS="${LDFLAGS} $UP[_LIBS]"
else else
CPPFLAGS="${CPPFLAGS} -I${__opj_prefix}/include" if test "x${__opj_prefix}" != "x" ; then
LDFLAGS="${LDFLAGS} -L${__opj_prefix}/lib" __opj_CPPFLAGS="-I${__opj_prefix}/include"
LIBS="${LIBS} -l${__opj_lib}" else
__opj_CPPFLAGS=""
fi
CPPFLAGS="${CPPFLAGS} ${__opj_CPPFLAGS}"
fi
if test "x$UP[_LIBS]" != "x"; then
LIBS="${LIBS} $UP[_LIBS]"
else
if test "x${__opj_prefix}" != "x" ; then
__opj_LIBS="-L${__opj_prefix}/lib -l${__opj_lib}"
else
__opj_LIBS="-l${__opj_lib}"
fi
LIBS="${LIBS} ${__opj_LIBS}"
fi fi
AC_LINK_IFELSE( AC_LINK_IFELSE(
@ -45,7 +57,6 @@ ${__opj_func}();
[__opj_have_dep="no"]) [__opj_have_dep="no"])
CPPFLAGS=${save_CPPFLAGS} CPPFLAGS=${save_CPPFLAGS}
LDFLAGS=${save_LDFLAGS}
LIBS=${save_LIBS} LIBS=${save_LIBS}
if test "x${__opj_prefix}" = "x" ; then if test "x${__opj_prefix}" = "x" ; then
@ -55,12 +66,12 @@ else
fi fi
AC_MSG_RESULT([${__opj_have_dep}]) AC_MSG_RESULT([${__opj_have_dep}])
if test "x${__opj_have_dep}" = "xyes" && ! test "x${__opj_prefix}" = "x"; then if test "x${__opj_have_dep}" = "xyes"; then
if test "x${UP[]_CFLAGS}" = "x" ; then if test "x${UP[]_CFLAGS}" = "x" ; then
UP[]_CFLAGS="-I${__opj_prefix}/include" UP[]_CFLAGS="${__opj_CPPFLAGS}"
fi fi
if test "x${UP[]_LIBS}" = "x" ; then if test "x${UP[]_LIBS}" = "x" ; then
UP[]_LIBS="-L${__opj_prefix}/lib -l${__opj_lib}" UP[]_LIBS="${__opj_LIBS}"
fi fi
fi fi