Merge branch 'master' into next

2009-09-28 23:50:56 +02:00
parent bcf727cf58 b784bebaa9
commit cf3bab89f9
1 changed files with 1 additions and 2 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -215,6 +215,7 @@ LIBS=""

 dnl check for some default libraries
 AC_SEARCH_LIBS(cos, m)
+AC_SEARCH_LIBS(clock_gettime, rt)

 base_LIBS="$LIBS"

@@ -429,8 +430,6 @@ AC_TRY_RUN([
 #define MIN_PLIB_VERSION 185

 int main() {
-    int major, minor, micro;
-
    if ( PLIB_VERSION < MIN_PLIB_VERSION ) {
 	 return -1;
    }