Changeset 1585

Timestamp:

Aug 13, 2015, 4:07:59 PM (7 years ago)

Author:

Jari Häkkinen

Message:

Addresses #532. Prefer checking for newer version of support libraries.

File:

• branches/0.10-stable/configure.ac (modified) (1 diff)

branches/0.10-stable/configure.ac

@@ -234 +234 @@
 # indicate double floating number precision was removed from library
 # names.
-PLPLOT_USE_D=d
+PLPLOT_USE_D=
 use_plplot_pc="no"
 AS_IF([test "x$plplot_found" = "xyes" && test -n "$PKG_CONFIG"], [
-  AC_MSG_CHECKING([for plplotd-c++.pc])
-  AS_IF([$PKG_CONFIG --exists plplotd-c++], [
+  # check for plplot 5.11 or later first
+  AC_MSG_CHECKING([for plplot-c++.pc])
+  AS_IF([$PKG_CONFIG --exists plplot-c++], [
     AC_MSG_RESULT([yes])
     use_plplot_pc="yes"
   ],[
-    # checking if plplot 5.11 or later is installed. The character 'd'
-    # is missing from plplot library files (pre 5.11 plplot-c++ was
-    # named plplotd-c++ and similarly for other plplot libraries
-    AC_MSG_CHECKING([for plplot-c++.pc])
-    AS_IF([$PKG_CONFIG --exists plplot-c++], [
-    AC_MSG_RESULT([yes])
-    use_plplot_pc="yes"
-    # plplot 5.11 or later found, don't use 'd'
-    PLPLOT_USE_D=
+    # fall back to check for plplot prior to version 5.11
+    AC_MSG_CHECKING([for plplotd-c++.pc])
+    AS_IF([$PKG_CONFIG --exists plplotd-c++], [
+      AC_MSG_RESULT([yes])
+      use_plplot_pc="yes"
+      # plplot prior to 5.11 found, use 'd'
+      PLPLOT_USE_D=d
     ],[
       AC_MSG_RESULT([no])