Changeset 888 for trunk/configure.ac
- Timestamp:
- Nov 25, 2009, 5:03:59 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/configure.ac
r887 r888 168 168 plplot_found="yes" 169 169 plplot_version=5.9 170 AC_CHECK_HEADER([plplot/plstream.h], 171 [if $PKG_CONFIG --atleast-version=$plplot_version plplotd-c++; then 172 PLPLOT_LDFLAGS=`$PKG_CONFIG --libs plplotd-c++` 173 AC_SUBST([PLPLOT_LDFLAGS]) 174 else 175 plplot_found="nolib" 176 fi], 177 [plplot_found="noheader"]) 170 save_PKG_CONFIG_PATH=$PKG_CONFIG_PATH 171 AC_ARG_WITH([plplot], 172 [AS_HELP_STRING([--with-plplot=DIR],[prefix for plplot developer files])], 173 [DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-plplot=$withval" 174 PKG_CONFIG_PATH=${withval}/lib/pkgconfig${PATH_SEPARATOR}${PKG_CONFIG_PATH} 175 export PKG_CONFIG_PATH 176 ]) 177 178 # copy flags if pkg-config finds plplot 179 PKG_CHECK_EXISTS([plplotd-c++], [ 180 YAT_CPP_ADD_FLAG([PLPLOT_CPPFLAGS], [`$PKG_CONFIG plplotd-c++ --cflags`]) 181 YAT_LD_ADD_FLAG([PLPLOT_LDFLAGS], [`$PKG_CONFIG plplotd-c++ --libs-only-L`]) 182 PLPLOT_LIBS="`$PKG_CONFIG plplotd-c++ --libs-only-l --libs-only-other`" 183 ],[ 184 plplot_found=no-pkg-config 185 ]) 186 187 AS_IF([test "x$plplot_found" = "xyes"], [ 188 save_CPPFLAGS=$CPPFLAGS 189 CPPFLAGS="$PLPLOT_CPPFLAGS $CPPFLAGS" 190 AC_CHECK_HEADER([plplot/plstream.h], [], [plplot_found="noheader"]) 191 CPPFLAGS=$save_CPPFLAGS 192 ]) 193 194 AS_IF([test "x$plplot_found" = "xyes"], [ 195 AS_IF([$PKG_CONFIG --atleast-version=$plplot_version plplotd-c++], [ 196 ],[ 197 plplot_found="nolib" 198 ]) 199 ]) 200 # restore variable 201 export PKG_CONFIG_PATH=$save_PKG_CONFIG_PATH 202 AC_SUBST(PLPLOT_CPPFLAGS) 203 AC_SUBST(PLPLOT_LDFLAGS) 204 AC_SUBST(PLPLOT_LIBS) 178 205 179 206 # checking if we build in a subversion WC … … 281 308 Version at least $plplot_version is required. Please upgrade PLplot.]) 282 309 all_reqs_ok="false" 310 elif (test "$plplot_found" = "no-pkg-config") ; then 311 AC_MSG_WARN([cannot find pkg-config]) 312 all_reqs_ok="false" 283 313 fi 284 314 … … 310 340 APR_CPPFLAGS: $APR_CPPFLAGS 311 341 SVN_CPPFLAGS: $SVN_CPPFLAGS 342 PLPLOT_CPPFLAGS: $PLPLOT_CPPFLAGS 312 343 C++ flags: 313 344 CXXFLAGS: $CXXFLAGS … … 322 353 APR_LIBS $APR_LIBS 323 354 SVN_LIBS $SVN_LIBS 355 PLPLOT_LIBS $PLPLOT_LIBS 324 356 +++++++++++++++++++++++++++++++++++++++++++++++]dnl 325 357 )
Note: See TracChangeset
for help on using the changeset viewer.