X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=d460b6b7822a1bc052c2797f31e5e6bf13734784;hb=4c4035a7b45d6e865fac0a4ac96c83ab6baf7a13;hp=999b5c92df199ab98a979b290e5a628f754a4db9;hpb=9e7a268db08095e2585d845a51a9e5c89ba90fbd;p=sigrok-firmware-fx2lafw.git

diff --git a/configure.ac b/configure.ac
index 999b5c92..d460b6b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 ##
-## This file is part of the fx2lafw project.
+## This file is part of the sigrok-firmware-fx2lafw project.
 ##
 ## Copyright (C) 2013 Uwe Hermann <uwe@hermann-uwe.de>
 ##
@@ -21,7 +21,7 @@
 # We require at least autoconf 2.63 (AC_INIT format changed there).
 AC_PREREQ([2.63])
 
-AC_INIT([sigrok-firmware-fx2lafw], [0.1.0],
+AC_INIT([sigrok-firmware-fx2lafw], [0.1.2],
 	[sigrok-devel@lists.sourceforge.net],
 	[sigrok-firmware-fx2lafw], [http://www.sigrok.org])
 AC_CONFIG_HEADER([config.h])
@@ -35,10 +35,20 @@ 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])
+if test "x$SDCC" == "x"; then
+	AC_MSG_ERROR([cannot find sdcc.])
+fi
+AC_CHECK_PROGS([SDCCLIB], [sdcclib sdcc-sdcclib])
+if test "x$SDCCLIB" == "x"; then
+	AC_MSG_ERROR([cannot find sdcclib.])
+fi
 AC_CHECK_PROGS([OBJCOPY], [objcopy])
-AC_CHECK_PROGS([MAKEBIN], [makebin])
+AC_CHECK_PROGS([MAKEBIN], [makebin sdcc-makebin])
+if test "x$OBJCOPY" == "x" && test "x$MAKEBIN" == "x"; then
+	AC_MSG_ERROR([cannot find objcopy or makebin.])
+fi
 
 AM_CONDITIONAL([FOUND_OBJCOPY], [test "x$OBJCOPY" != "x"])
 AM_CONDITIONAL([FOUND_MAKEBIN], [test "x$MAKEBIN" != "x"])
@@ -50,6 +60,9 @@ AM_COND_IF([FOUND_MAKEBIN], [AC_SUBST(FOUND_MAKEBIN, "yes")])
 # Newer sdcc, Fedora: sdcc-sdas8051
 # Older sdcc: asx8051
 AC_CHECK_PROGS([SDAS8051], [sdas8051 sdcc-sdas8051 asx8051])
+if test "x$SDAS8051" == "x"; then
+	AC_MSG_ERROR([cannot find sdas8051.])
+fi
 
 AC_SUBST(SDCC_FLAGS, "--code-size 0x1c00 --xram-size 0x0200 --xram-loc 0x1c00 -Wl\"-b DSCR_AREA=0x1e00\" -Wl\"-b INT2JT=0x1f00\"")
 AC_SUBST(FIRMWARE_DIR, "$datadir/sigrok-firmware")
@@ -68,6 +81,8 @@ AC_CONFIG_FILES([Makefile
 		 hw/cwav-usbeesx/Makefile
 		 hw/cypress-fx2/Makefile
 		 hw/saleae-logic/Makefile
+		 hw/sigrok-fx2-8ch/Makefile
+		 hw/sigrok-fx2-16ch/Makefile
 		])
 
 AC_OUTPUT