From: Keith Packard <keithp@keithp.com>
Date: Fri, 20 Jul 2012 19:04:17 +0000 (-0700)
Subject: tools: Use pkgconfig to find stlink for ao-stmload
X-Git-Tag: 1.1~67^2~46
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=38f66a31174dd367e39d717c527f555add60a9d4;hp=e033a72d3f420e18ed24354c7dfc7e1317a03fb6

tools: Use pkgconfig to find stlink for ao-stmload

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/ao-tools/ao-stmload/Makefile.am b/ao-tools/ao-stmload/Makefile.am
index 77979daf..375896ea 100644
--- a/ao-tools/ao-stmload/Makefile.am
+++ b/ao-tools/ao-stmload/Makefile.am
@@ -2,12 +2,9 @@ bin_PROGRAMS=ao-stmload
 
 LIBSTLINKDIR=/local/src/stlink
 
-AM_CFLAGS=-I$(LIBSTLINKDIR)/src $(LIBUSB_CFLAGS) -I../lib
+AM_CFLAGS=$(LIBSTLINK_CFLAGS) $(LIBUSB_CFLAGS) -I../lib
 
-AO_STMLOAD_LIBS=$(LIBSTLINKDIR)/libstlink.a
-ao_stmload_DEPENDENCIES = $(AO_STMLOAD_LIBS)
-
-ao_stmload_LDADD=$(AO_STMLOAD_LIBS) $(LIBUSB_LIBS) -lelf
+ao_stmload_LDADD=$(LIBSTLINK_LIBS) $(LIBUSB_LIBS) -lelf
 
 ao_stmload_SOURCES=ao-stmload.c
 
diff --git a/configure.ac b/configure.ac
index 10bf9abf..bcd2dcac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,6 +136,11 @@ AC_CHECK_LIB(readline, readline)
 
 PKG_CHECK_MODULES([LIBUSB], [libusb-1.0])
 
+AC_CHECK_HEADERS(libelf.h libelf/libelf.h, [break])
+AC_CHECK_HEADERS(gelf.h libelf/gelf.h, [break])
+
+PKG_CHECK_MODULES([LIBSTLINK], [stlink])
+
 AC_OUTPUT([
 Makefile
 altoslib/Makefile