Changeset 973 for trunk

Timestamp:

Dec 11, 2009, 5:25:32 AM (13 years ago)

Author:

Peter Johansson

Message:

change treatment of arguments of --with-svn and --with-plplot. Translate them to absolute path and barf if it is not a directory. Exception is that --with-plplot=no is still allowed.

File:

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

trunk/configure.ac

@@ -161 +161 @@
   [ AS_CASE([$withval], [yes|no],
             [AC_MSG_ERROR([--with-svn requires a directory to be provided])])
-    DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-svn=$withval"
-    YAT_LD_ADD_FLAG([SVN_LDFLAGS], [-L$withval/lib])
-    YAT_CPP_ADD_FLAG([SVN_CPPFLAGS], [-I$withval/include])
+    AS_IF([test -d $with_svn], [], 
+          [AC_MSG_ERROR([$with_svn: no such directory])])
+    # transform argument to absolute path
+    with_svn=`cd $with_svn && pwd`
+    DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-svn=$with_svn"
+    YAT_LD_ADD_FLAG([SVN_LDFLAGS], [-L$with_svn/lib])
+    YAT_CPP_ADD_FLAG([SVN_CPPFLAGS], [-I$with_svn/include])
   ])
 # svn needs needs apr headers
@@ -206 +210 @@
      plplot_found=skip;
    ], [ dnl
+     AS_IF([test -d $with_plplot], [],
+           [AC_MSG_ERROR([$with_plplot: no such directory])])
+     with_plplot=`cd $with_plplot && pwd` 
      # help pkg-config find .pc file
-     PKG_CONFIG_PATH=${withval}/lib/pkgconfig${PATH_SEPARATOR}${PKG_CONFIG_PATH}
+     PKG_CONFIG_PATH=$with_plplot/lib/pkgconfig$PATH_SEPARATOR$PKG_CONFIG_PATH
      export PKG_CONFIG_PATH 
    ])