From: Uwe Hermann <redacted>
Date: Thu, 7 Mar 2013 10:32:30 +0000 (+0100)
Subject: Support sdcc tool names as used on Fedora.
X-Git-Tag: sigrok-firmware-fx2lafw-0.1.1~9
X-Git-Url: http://sigrok.org/gitweb/?p=sigrok-firmware-fx2lafw.git;a=commitdiff_plain;h=3a7ae082fcdd2610bf936f8fddcc07e93aa1a0ec

Support sdcc tool names as used on Fedora.

Fedora (e.g. Fedora 18) names the sdcc tools like this:

 sdcc-sdcc, sdcc-sdcclib, sdcc-makebin, etc.
---

diff --git a/NEWS b/NEWS
index 34ab80e0..51a561c9 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@
    containing just the generated *.fw files.
  * If 'objcopy' is not found, try to use sdcc's 'makebin' instead.
    This fixes the build e.g. on some Mac OS X systems without 'objycopy'.
+ * Add support for differently named sdcc tools on various distros.
 
 0.1.0 (2012-07-24)
 ------------------
diff --git a/configure.ac b/configure.ac
index 999b5c92..13018f68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,10 +35,11 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_PROG_INSTALL
 AC_PROG_LN_S
 
-AC_CHECK_PROGS([SDCC], [sdcc])
-AC_CHECK_PROGS([SDCCLIB], [sdcclib])
+# On Fedora, all sdcc tools have an 'sdcc-' prefix in the filename.
+AC_CHECK_PROGS([SDCC], [sdcc sdcc-sdcc])
+AC_CHECK_PROGS([SDCCLIB], [sdcclib sdcc-sdcc])
 AC_CHECK_PROGS([OBJCOPY], [objcopy])
-AC_CHECK_PROGS([MAKEBIN], [makebin])
+AC_CHECK_PROGS([MAKEBIN], [makebin sdcc-makebin])
 
 AM_CONDITIONAL([FOUND_OBJCOPY], [test "x$OBJCOPY" != "x"])
 AM_CONDITIONAL([FOUND_MAKEBIN], [test "x$MAKEBIN" != "x"])