Changeset 973


Ignore:
Timestamp:
Dec 11, 2009, 5:25:32 AM (12 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r972 r973  
    161161  [ AS_CASE([$withval], [yes|no],
    162162            [AC_MSG_ERROR([--with-svn requires a directory to be provided])])
    163     DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-svn=$withval"
    164     YAT_LD_ADD_FLAG([SVN_LDFLAGS], [-L$withval/lib])
    165     YAT_CPP_ADD_FLAG([SVN_CPPFLAGS], [-I$withval/include])
     163    AS_IF([test -d $with_svn], [],
     164          [AC_MSG_ERROR([$with_svn: no such directory])])
     165    # transform argument to absolute path
     166    with_svn=`cd $with_svn && pwd`
     167    DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-svn=$with_svn"
     168    YAT_LD_ADD_FLAG([SVN_LDFLAGS], [-L$with_svn/lib])
     169    YAT_CPP_ADD_FLAG([SVN_CPPFLAGS], [-I$with_svn/include])
    166170  ])
    167171# svn needs needs apr headers
     
    206210     plplot_found=skip;
    207211   ], [ dnl
     212     AS_IF([test -d $with_plplot], [],
     213           [AC_MSG_ERROR([$with_plplot: no such directory])])
     214     with_plplot=`cd $with_plplot && pwd`
    208215     # help pkg-config find .pc file
    209      PKG_CONFIG_PATH=${withval}/lib/pkgconfig${PATH_SEPARATOR}${PKG_CONFIG_PATH}
     216     PKG_CONFIG_PATH=$with_plplot/lib/pkgconfig$PATH_SEPARATOR$PKG_CONFIG_PATH
    210217     export PKG_CONFIG_PATH
    211218   ])
Note: See TracChangeset for help on using the changeset viewer.