Patchwork configure: fix libcacard check

login
register
mail settings
Submitter Alon Levy
Date July 22, 2012, 11 a.m.
Message ID <1342954829-17303-1-git-send-email-alevy@redhat.com>
Download mbox | patch
Permalink /patch/172505/
State New
Headers show

Comments

Alon Levy - July 22, 2012, 11 a.m.
SRC_PATH is undefined during configure run time, it is only defined in
makefiles generated by it. Replace with source_path which is defined.

Signed-off-by: Alon Levy <alevy@redhat.com>
---
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Peter Maydell - July 22, 2012, 11:30 a.m.
On 22 July 2012 12:00, Alon Levy <alevy@redhat.com> wrote:
> SRC_PATH is undefined during configure run time, it is only defined in
> makefiles generated by it. Replace with source_path which is defined.

There's a (slightly different) patch to address this issue in my
configure series I posted earlier this week:
http://patchwork.ozlabs.org/patch/171698/

-- PMM
Alon Levy - July 22, 2012, 12:05 p.m.
On Sun, Jul 22, 2012 at 12:30:27PM +0100, Peter Maydell wrote:
> On 22 July 2012 12:00, Alon Levy <alevy@redhat.com> wrote:
> > SRC_PATH is undefined during configure run time, it is only defined in
> > makefiles generated by it. Replace with source_path which is defined.
> 
> There's a (slightly different) patch to address this issue in my
> configure series I posted earlier this week:
> http://patchwork.ozlabs.org/patch/171698/
> 

Your fix looks fine. I appologize for not checking - wasn't sure if this
happens when not requesting libcacard compilation (via
--enable-smartcard-nss), so didn't think it was already addressed on the
list, my bad.

> -- PMM
>

Patch

diff --git a/configure b/configure
index 5fcd315..227c7d4 100755
--- a/configure
+++ b/configure
@@ -2653,7 +2653,7 @@  if test "$smartcard" != "no" ; then
 #include <pk11pub.h>
 int main(void) { PK11_FreeSlot(0); return 0; }
 EOF
-        smartcard_cflags="-I\$(SRC_PATH)/libcacard"
+        smartcard_cflags="-I$source_path/libcacard"
         libcacard_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
         libcacard_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
         if $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 && \