]> granicus.if.org Git - graphviz/commitdiff
check for libann.so or libANN.so explicitly (Fedora v. Ubuntu)
authorJohn Ellson <ellson@research.att.com>
Fri, 16 Aug 2013 16:28:50 +0000 (12:28 -0400)
committerJohn Ellson <ellson@research.att.com>
Fri, 16 Aug 2013 16:28:50 +0000 (12:28 -0400)
configure.ac

index 38ebfc4d2a835f840d7fd6aa1000904fc67ea55d..600f86989e9251a1601db7f8b7cbba76e18f3587 100644 (file)
@@ -2491,15 +2491,22 @@ else
     AC_SUBST([ANN_CFLAGS])
     AC_SUBST([ANN_LIBS])
   ],[
-    AC_CHECK_PROGS(ANN2FIG,ann2fig,false)
-    if test "$ANN2FIG" != "false"; then
+    if test -f /usr/lib$LIBPOSTFIX/libANN.so; then
       AC_DEFINE_UNQUOTED(HAVE_ANN,1,
         [Define if you have the ann library])
       ANN_LIBS=-lANN
       AC_SUBST([ANN_LIBS])
       use_ann="Yes (but no ann.pc found)"
     else
-      use_ann="No (ANN library not available)"
+      if test -f /usr/lib$LIBPOSTFIX/libann.so; then
+        AC_DEFINE_UNQUOTED(HAVE_ANN,1,
+          [Define if you have the ann library])
+        ANN_LIBS=-lann
+        AC_SUBST([ANN_LIBS])
+        use_ann="Yes (but no ann.pc found)"
+      else
+        use_ann="No (ANN library not available)"
+      fi
     fi
   ])
 fi