File 0003-Improve-check-for-standard-libs.patch of Package mingw32-openjpeg

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-Improve-check-for-standard-libs.patch of Package mingw32-openjpeg (Revision 9c82c116fd36301e370cf580c57a2448)

Currently displaying revision 9c82c116fd36301e370cf580c57a2448 , Show latest

From 8204cdd11b9cf349aa3ee776ad51ff61d87add61 Mon Sep 17 00:00:00 2001
From: Hib Eris <hib@hiberis.nl>
Date: Wed, 22 Feb 2012 15:39:32 +0100
Subject: [PATCH 3/3] 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.
---
 m4/opj_check_lib.m4 |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/m4/opj_check_lib.m4 b/m4/opj_check_lib.m4
index a92d262..ea73105 100644
--- a/m4/opj_check_lib.m4
+++ b/m4/opj_check_lib.m4
@@ -21,16 +21,28 @@ __opj_func=$4
 __opj_have_dep="no"
 
 save_CPPFLAGS=${CPPFLAGS}
-save_LDFLAGS=${LDFLAGS}
 save_LIBS=${LIBS}
 
-if test "x${__opj_prefix}" = "x" ; then
+if test "x$UP[_CFLAGS]" != "x"; then
    CPPFLAGS="${CPPFLAGS} $UP[_CFLAGS]"
-   LDFLAGS="${LDFLAGS} $UP[_LIBS]"
 else
-   CPPFLAGS="${CPPFLAGS} -I${__opj_prefix}/include"
-   LDFLAGS="${LDFLAGS} -L${__opj_prefix}/lib"
-   LIBS="${LIBS} -l${__opj_lib}"
+   if test "x${__opj_prefix}" != "x" ; then
+     __opj_CPPFLAGS="-I${__opj_prefix}/include"
+   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
 
 AC_LINK_IFELSE(
@@ -45,7 +57,6 @@ ${__opj_func}();
        [__opj_have_dep="no"])
 
 CPPFLAGS=${save_CPPFLAGS}
-LDFLAGS=${save_LDFLAGS}
 LIBS=${save_LIBS}
 
 if test "x${__opj_prefix}" = "x" ; then
@@ -55,12 +66,12 @@ else
 fi
 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
-      UP[]_CFLAGS="-I${__opj_prefix}/include"
+      UP[]_CFLAGS="${__opj_CPPFLAGS}"
    fi
    if test "x${UP[]_LIBS}" = "x" ; then
-      UP[]_LIBS="-L${__opj_prefix}/lib -l${__opj_lib}"
+      UP[]_LIBS="${__opj_LIBS}"
    fi
 fi
 
-- 
1.7.7

Places

File 0003-Improve-check-for-standard-libs.patch of Package mingw32-openjpeg (Revision 9c82c116fd36301e370cf580c57a2448)

Places