ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/configure
(Generate patch)

Comparing trunk/configure (file contents):
Revision 1036 by gezelter, Mon Sep 4 13:37:15 2006 UTC vs.
Revision 1085 by chuckv, Mon Oct 23 18:11:06 2006 UTC

# Line 13603 | Line 13603 | ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
13603   ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
13604  
13605      save_CXXFLAGS="$CXXFLAGS"
13606 <    CXXFLAGS="$CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
13606 >    CXXFLAGS="$CXXFLAGS $CGAL_CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
13607      if test "${ac_cv_header_CGAL_Cartesian_h+set}" = set; then
13608    echo "$as_me:$LINENO: checking for CGAL/Cartesian.h" >&5
13609   echo $ECHO_N "checking for CGAL/Cartesian.h... $ECHO_C" >&6
# Line 13800 | Line 13800 | echo "${ECHO_T}no" >&6
13800  
13801        CGAL_LIBS="$CGAL_LIBS -lm"
13802  
13803 <      CGAL_CXXFLAGS="-ftemplate-depth-50"
13803 >      CGAL_CXXFLAGS="-ftemplate-depth-50 $CGAL_CXXFLAGS"
13804  
13805        echo "$as_me:$LINENO: result: CGAL_USES_LEDA=     $CGAL_USES_LEDA" >&5
13806   echo "${ECHO_T}CGAL_USES_LEDA=     $CGAL_USES_LEDA" >&6
# Line 13830 | Line 13830 | save_CXXFLAGS_CHECK_CXX_LIB="$CXXFLAGS"
13830        echo "$as_me:$LINENO: checking for ::CGAL::Cartesian<int>::Point_2 in -lCGAL" >&5
13831   echo $ECHO_N "checking for ::CGAL::Cartesian<int>::Point_2 in -lCGAL... $ECHO_C" >&6
13832   save_CXXFLAGS_CHECK_CXX_LIB="$CXXFLAGS"
13833 < CXXFLAGS="$CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
13833 > CXXFLAGS="$CXXFLAGS $CGAL_CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
13834   save_LIBS_CHECK_CXX_LIB="$LIBS"
13835   LIBS="-lCGAL  $LIBS"
13836   cat >conftest.$ac_ext <<_ACEOF
# Line 14106 | Line 14106 | fi
14106  
14107  
14108  
14109 <                                                            ac_config_files="$ac_config_files make/Makefile src/utils/Makefile src/applications/nanoRodBuilder/Makefile src/applications/utilities/affineScale src/applications/utilities/waterBoxer scripts/filepp"
14109 >                                        ac_config_files="$ac_config_files make/Makefile src/utils/Makefile src/applications/nanoRodBuilder/Makefile scripts/filepp"
14110  
14111  
14112   cat >confcache <<\_ACEOF
# Line 14640 | Line 14640 | do
14640    "make/Makefile" ) CONFIG_FILES="$CONFIG_FILES make/Makefile" ;;
14641    "src/utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/utils/Makefile" ;;
14642    "src/applications/nanoRodBuilder/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/applications/nanoRodBuilder/Makefile" ;;
14643 –  "src/applications/utilities/affineScale" ) CONFIG_FILES="$CONFIG_FILES src/applications/utilities/affineScale" ;;
14644 –  "src/applications/utilities/waterBoxer" ) CONFIG_FILES="$CONFIG_FILES src/applications/utilities/waterBoxer" ;;
14643    "scripts/filepp" ) CONFIG_FILES="$CONFIG_FILES scripts/filepp" ;;
14644    "src/getopt.h" ) CONFIG_LINKS="$CONFIG_LINKS src/getopt.h:src/utils/gnugetopt.h" ;;
14645    "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
# Line 15054 | Line 15052 | s,@INSTALL@,$ac_INSTALL,;t t
15052      make/Makefile ) chmod 0755 scripts/* ;;
15053      src/utils/Makefile ) chmod 0755 scripts/* ;;
15054      src/applications/nanoRodBuilder/Makefile ) chmod 0755 scripts/* ;;
15057 –    src/applications/utilities/affineScale ) chmod 0755 scripts/* ;;
15058 –    src/applications/utilities/waterBoxer ) chmod 0755 scripts/* ;;
15055      scripts/filepp ) chmod 0755 scripts/* ;;
15056    esac
15057   done

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines