Mercurial > mxe-octave

annotate src/ftgl-1-gl-m4.patch @ 2988:aca8511e7751

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt.mk: link to correct files in bin directory
author John W. Eaton <jwe@octave.org>
date Thu, 16 May 2013 13:32:57 -0400
parents 3a42978c7bc6
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1417
3a42978c7bc6 new package: ftgl
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
1 --- ftgl-2.1.3~rc5/m4/gl.m4 2008-05-05 16:48:57.000000000 +0200
3a42978c7bc6 new package: ftgl
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
2 +++ ftgl-2.1.3~rc5/m4/gl.m4.new 2010-09-20 14:55:27.000000000 +0200
3a42978c7bc6 new package: ftgl
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
3 @@ -63,6 +63,8 @@
3a42978c7bc6 new package: ftgl
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
4 LIBS="-lGL"
3a42978c7bc6 new package: ftgl
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
5 fi
3a42978c7bc6 new package: ftgl
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
6 AC_LINK_IFELSE([AC_LANG_CALL([],[glBegin])],[HAVE_GL=yes], [HAVE_GL=no])
3a42978c7bc6 new package: ftgl
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
7 +HAVE_GL=yes
3a42978c7bc6 new package: ftgl
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
8 +LIBS="-lopengl32"
3a42978c7bc6 new package: ftgl
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
9 if test "x$HAVE_GL" = xno ; then
3a42978c7bc6 new package: ftgl
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
10 if test "x$GL_X_LIBS" != x ; then
3a42978c7bc6 new package: ftgl
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
11 LIBS="-lGL $GL_X_LIBS"
3a42978c7bc6 new package: ftgl
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
12 @@ -105,6 +107,8 @@
3a42978c7bc6 new package: ftgl
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
13 AC_MSG_CHECKING([for GLU library])
3a42978c7bc6 new package: ftgl
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
14 LIBS="-lGLU $GL_LIBS"
3a42978c7bc6 new package: ftgl
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
15 AC_LINK_IFELSE([AC_LANG_CALL([],[gluNewTess])],[HAVE_GLU=yes], [HAVE_GLU=no])
3a42978c7bc6 new package: ftgl
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
16 +LIBS="-lglu32 $GL_LIBS"
3a42978c7bc6 new package: ftgl
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
17 +HAVE_GLU=yes
3a42978c7bc6 new package: ftgl
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
18 if test "x$HAVE_GLU" = xno ; then
3a42978c7bc6 new package: ftgl
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
19 if test "x$GL_X_LIBS" != x ; then
3a42978c7bc6 new package: ftgl
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
20 LIBS="-lGLU $GL_LIBS $GL_X_LIBS"