Changeset 888 for trunk/configure.ac

Timestamp:

Nov 25, 2009, 5:03:59 AM (13 years ago)

Author:

Peter Johansson

Message:

fixes #374

The problem was in the map year2rev that maps from a year to the last
revision of that year. We got that information from an SVNlog(ROOT)
object. When ROOT was yat/yat the problem (we've seen before)
occured. The problem is that if we follow the log of yat/yat we
realize it was created in 2005, so the map wouldn't cover for year
2004 and 2003. And there are many files, for example
yat/yat/Makefile.am, that were created in 2003 and 2004.

I could see two obvious solutions to the problem. Either call get the
log from repos_root_url or call NODE::log. The latter gives the union
of the logs of nodes in the directory (and below), which should be
sufficient. That, however, also implies that a log call is needed for
every file, which makes this slow in particular since ROOT often is
quite high the files structure. I therefore went with a log call to
repos_root_url, which is fast since it only involves one call to svn
server.

File:

• trunk/configure.ac (modified) (4 diffs)

trunk/configure.ac

@@ -168 +168 @@
 plplot_found="yes"
 plplot_version=5.9
-AC_CHECK_HEADER([plplot/plstream.h],
-                [if $PKG_CONFIG --atleast-version=$plplot_version plplotd-c++; then
-                  PLPLOT_LDFLAGS=`$PKG_CONFIG --libs plplotd-c++`
-                  AC_SUBST([PLPLOT_LDFLAGS])
-                else
-                  plplot_found="nolib"
-                fi],
-                [plplot_found="noheader"])
+save_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+AC_ARG_WITH([plplot],
+  [AS_HELP_STRING([--with-plplot=DIR],[prefix for plplot developer files])],
+  [DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-plplot=$withval"
+   PKG_CONFIG_PATH=${withval}/lib/pkgconfig${PATH_SEPARATOR}${PKG_CONFIG_PATH}
+   export PKG_CONFIG_PATH
+  ])
+
+# copy flags if pkg-config finds plplot
+PKG_CHECK_EXISTS([plplotd-c++], [
+  YAT_CPP_ADD_FLAG([PLPLOT_CPPFLAGS], [`$PKG_CONFIG plplotd-c++ --cflags`])
+  YAT_LD_ADD_FLAG([PLPLOT_LDFLAGS], [`$PKG_CONFIG plplotd-c++ --libs-only-L`])
+  PLPLOT_LIBS="`$PKG_CONFIG plplotd-c++ --libs-only-l --libs-only-other`"
+],[
+  plplot_found=no-pkg-config
+])
+                  
+AS_IF([test "x$plplot_found" = "xyes"], [
+  save_CPPFLAGS=$CPPFLAGS
+  CPPFLAGS="$PLPLOT_CPPFLAGS $CPPFLAGS"
+  AC_CHECK_HEADER([plplot/plstream.h], [], [plplot_found="noheader"])
+  CPPFLAGS=$save_CPPFLAGS
+])
+
+AS_IF([test "x$plplot_found" = "xyes"], [
+  AS_IF([$PKG_CONFIG --atleast-version=$plplot_version plplotd-c++], [
+  ],[
+    plplot_found="nolib"
+  ])
+])
+# restore variable
+export PKG_CONFIG_PATH=$save_PKG_CONFIG_PATH
+AC_SUBST(PLPLOT_CPPFLAGS)
+AC_SUBST(PLPLOT_LDFLAGS)
+AC_SUBST(PLPLOT_LIBS)
 
 # checking if we build in a subversion WC
@@ -281 +308 @@
   Version at least $plplot_version is required. Please upgrade PLplot.])
   all_reqs_ok="false"
+elif (test "$plplot_found" = "no-pkg-config") ; then
+  AC_MSG_WARN([cannot find pkg-config])
+  all_reqs_ok="false"
 fi
 
@@ -310 +340 @@
     APR_CPPFLAGS:     $APR_CPPFLAGS
     SVN_CPPFLAGS:     $SVN_CPPFLAGS
+    PLPLOT_CPPFLAGS:  $PLPLOT_CPPFLAGS
   C++ flags:
     CXXFLAGS:         $CXXFLAGS
@@ -322 +353 @@
     APR_LIBS          $APR_LIBS
     SVN_LIBS          $SVN_LIBS
+    PLPLOT_LIBS       $PLPLOT_LIBS
 +++++++++++++++++++++++++++++++++++++++++++++++]dnl
 )