Browse Source

Merge branch 'utlist' into bfgminer

Luke Dashjr 12 years ago
parent
commit
6539015c63
2 changed files with 11 additions and 6 deletions
  1. 1 1
      README
  2. 10 5
      configure.ac

+ 1 - 1
README

@@ -89,7 +89,7 @@ Dependencies:
 
 	libjansson-dev 2.0+  http://www.digip.org/jansson/
 	
-	uthash-dev           http://troydhanson.github.io/uthash/
+	uthash-dev 1.9.2+    http://troydhanson.github.io/uthash/
 
 Optional Dependencies:
 	Text-User-Interface (TUI): curses dev library; any one of:

+ 10 - 5
configure.ac

@@ -143,12 +143,17 @@ m4_define([BFG_PREPROC_IFELSE],
 )
 
 
-AC_CHECK_HEADER([uthash.h], [
-	AC_CHECK_HEADER([utlist.h], [true], [
-		AC_MSG_ERROR([Could not find utlist header - please install uthash-dev])
+AC_CHECK_DECL([HASH_ITER],[
+	AC_CHECK_DECL([DL_FOREACH_SAFE],[
+	],[
+		AC_MSG_ERROR([Could not find DL_FOREACH_SAFE - install uthash-dev 1.9.2+])
+	],[
+		#include <utlist.h>
 	])
-], [
-	AC_MSG_ERROR([Could not find uthash header - please install uthash-dev])
+],[
+	AC_MSG_ERROR([Could not find HASH_ITER - please install uthash-dev 1.9.2+])
+],[
+	#include <uthash.h>
 ])