• R/O
  • HTTP
  • SSH
  • HTTPS

fermisurfer: Commit

fermisurfer Git


Commit MetaInfo

Revision322396d5fa3bdb3560860b248495ecf651d8b540 (tree)
Zeit2018-03-07 16:13:57
Autormitsuaki1987 <kawamitsuaki@gmai...>
Commitermitsuaki1987

Log Message

Update for macos high sierra

Ändern Zusammenfassung

Diff

--- a/configure
+++ b/configure
@@ -3833,9 +3833,6 @@ fi
38333833 echo ""
38343834 echo " Check OpenMP"
38353835 echo ""
3836-echo ""
3837-echo " Check OpenMP"
3838-echo ""
38393836
38403837 # Check whether --with-openmp was given.
38413838 if test "${with_openmp+set}" = set; then :
@@ -8976,8 +8973,8 @@ fi
89768973
89778974
89788975
8979-CFLAGS="$CFLAGS $GLUT_CFLAGS"
8980-LIBS="$LIBS $GLUT_LIBS -lm"
8976+CFLAGS="$CFLAGS $GL_CFLAGS $GLU_CFLAGS $GLUT_CFLAGS"
8977+LIBS="$LIBS $GLUT_LIBS $GLU_LIBS $GL_LIBS -lm"
89818978 echo ""
89828979 echo " Output files"
89838980 echo ""
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,6 @@ AC_PROG_CC
1111 echo ""
1212 echo " Check OpenMP"
1313 echo ""
14-echo ""
15-echo " Check OpenMP"
16-echo ""
1714 AC_ARG_WITH(openmp, [AS_HELP_STRING([--with-openmp],
1815 [compile with OpenMP (parallelization) support.
1916 If none is found, OpenMP is not used. Default: yes])],,
@@ -26,9 +23,11 @@ fi
2623 echo ""
2724 echo " Check OpenGL and GLUT"
2825 echo ""
26+AX_CHECK_GL
27+AX_CHECK_GLU
2928 AX_CHECK_GLUT
30-CFLAGS="$CFLAGS $GLUT_CFLAGS"
31-LIBS="$LIBS $GLUT_LIBS -lm"
29+CFLAGS="$CFLAGS $GL_CFLAGS $GLU_CFLAGS $GLUT_CFLAGS"
30+LIBS="$LIBS $GLUT_LIBS $GLU_LIBS $GL_LIBS -lm"
3231 echo ""
3332 echo " Output files"
3433 echo ""
Show on old repository browser