| 341 |
|
|
| 342 |
|
AC_LANG_PUSH(C++) |
| 343 |
|
save_CXXFLAGS="$CXXFLAGS" |
| 344 |
< |
CXXFLAGS="$CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR" |
| 344 |
> |
CXXFLAGS="$CXXFLAGS $CGAL_CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR" |
| 345 |
|
AC_CHECK_HEADER(CGAL/Cartesian.h, cgal=yes, cgal=no) |
| 346 |
|
CXXFLAGS="$save_CXXFLAGS" |
| 347 |
|
|
| 388 |
|
|
| 389 |
|
CGAL_LIBS="$CGAL_LIBS -lm" |
| 390 |
|
|
| 391 |
< |
CGAL_CXXFLAGS="-ftemplate-depth-50" |
| 391 |
> |
CGAL_CXXFLAGS="-ftemplate-depth-50 $CGAL_CXXFLAGS" |
| 392 |
|
|
| 393 |
|
AC_MSG_RESULT(CGAL_USES_LEDA= $CGAL_USES_LEDA) |
| 394 |
|
AC_MSG_RESULT(CGAL_USES_GMP = $CGAL_USES_GMP) |
| 408 |
|
# if test "x$CGAL_USES_GMP" = xyes; then |
| 409 |
|
# LIBS="-lgmp $LIBS $GMP_LIBDIR" |
| 410 |
|
# fi |
| 411 |
< |
AC_CHECK_CXX_LIB(CGAL, ::CGAL::Cartesian<int>::Point_2, [#include <CGAL/Cartesian.h>], [::CGAL::Cartesian<int>::Point_2 P], [cgal=yes], [cgal=no], -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR) |
| 411 |
> |
AC_CHECK_CXX_LIB(CGAL, ::CGAL::Cartesian<int>::Point_2, [#include <CGAL/Cartesian.h>], [::CGAL::Cartesian<int>::Point_2 P], [cgal=yes], [cgal=no], $CGAL_CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR) |
| 412 |
|
LIBS="$save_LIBS" |
| 413 |
|
fi |
| 414 |
|
|
| 468 |
|
AC_SUBST(LDFLAGS) |
| 469 |
|
AC_SUBST(PREPDEFFLAG) |
| 470 |
|
AC_SUBST(F90_MODULE_NAMES) |
| 471 |
< |
AC_CONFIG_FILES([make/Makefile src/utils/Makefile src/applications/nanoRodBuilder/Makefile src/applications/utilities/affineScale src/applications/utilities/waterBoxer scripts/filepp], [chmod 0755 scripts/*]) |
| 471 |
> |
AC_CONFIG_FILES([make/Makefile src/utils/Makefile src/applications/nanoRodBuilder/Makefile scripts/filepp], [chmod 0755 scripts/*]) |
| 472 |
|
|
| 473 |
|
AC_OUTPUT |
