48 lines
2.1 KiB
Diff
48 lines
2.1 KiB
Diff
|
Index: gnubg-1.02.000/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- gnubg-1.02.000.orig/Makefile.am
|
||
|
|
+++ gnubg-1.02.000/Makefile.am
|
||
|
|
@@ -161,7 +161,7 @@ if USE_PYTHON
|
||
|
|
gnubg_LDADD += @PYTHON_LIBS@
|
||
|
|
endif
|
||
|
|
if USE_BOARD3D
|
||
|
|
-gnubg_LDADD += -L$(srcdir)/board3d board3d/libboard3d.la @GTKGLEXT_LIBS@
|
||
|
|
+gnubg_LDADD += -L$(srcdir)/board3d board3d/libboard3d.la $(GTKGLEXT_LIBS) $(GLU_LIBS)
|
||
|
|
endif
|
||
|
|
|
||
|
|
if WIN32
|
||
|
|
Index: gnubg-1.02.000/board3d/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- gnubg-1.02.000.orig/board3d/Makefile.am
|
||
|
|
+++ gnubg-1.02.000/board3d/Makefile.am
|
||
|
|
@@ -7,7 +7,7 @@ AM_CPPFLAGS = -I$(srcdir)/.. $(COMMON_IN
|
||
|
|
-I$(srcdir)/../lib \
|
||
|
|
-DLOCALEDIR=\"$(localedir)\" \
|
||
|
|
-DAC_DATADIR='"$(datadir)"' -DAC_PKGDATADIR=='"$(datadir)/gnubg"'\
|
||
|
|
- @FREETYPE2_CFLAGS@ @GTKGLEXT_CFLAGS@
|
||
|
|
+ @FREETYPE2_CFLAGS@ @GTKGLEXT_CFLAGS@ $(GLU_CFLAGS)
|
||
|
|
|
||
|
|
if USE_BOARD3D
|
||
|
|
noinst_LTLIBRARIES = libboard3d.la
|
||
|
|
Index: gnubg-1.02.000/configure.ac
|
||
|
|
===================================================================
|
||
|
|
--- gnubg-1.02.000.orig/configure.ac
|
||
|
|
+++ gnubg-1.02.000/configure.ac
|
||
|
|
@@ -130,6 +130,7 @@ PKG_CHECK_MODULES(LIBPNG, [libpng >= 1.2
|
||
|
|
PKG_CHECK_MODULES(CAIRO, [cairo >= 1.2], have_cairo="yes", [AC_MSG_WARN([no cairo support])])
|
||
|
|
PKG_CHECK_MODULES(PANGOCAIRO, [pangocairo >= 1.0], have_pangocairo="yes", [AC_MSG_WARN([no pangocairo support])])
|
||
|
|
PKG_CHECK_MODULES(SQLITE, [sqlite3], have_sqlite="yes", AC_MSG_WARN([no sqlite support]))
|
||
|
|
+PKG_CHECK_MODULES(GLU, [glu], have_glu="yes", AC_MSG_WARN([no glu support]))
|
||
|
|
|
||
|
|
if test "x$win32" != "xyes"; then
|
||
|
|
PKG_CHECK_MODULES(CANBERRA, [libcanberra-gtk], have_canberra="yes", AC_MSG_WARN([no libcanberra-gtk support]))
|
||
|
|
@@ -302,7 +303,7 @@ fi
|
||
|
|
|
||
|
|
AC_CHECK_HEADERS(GL/glx.h)
|
||
|
|
|
||
|
|
-if test "$with_board3d" != "no" && test "$with_gtk" != "no" && test "x$have_gtk" = "xyes" && test "x$have_gtkglext" = "xyes"; then
|
||
|
|
+if test "$with_board3d" != "no" && test "$with_gtk" != "no" && test "x$have_gtk" = "xyes" && test "x$have_gtkglext" = "xyes" -a "x$have_glu" = "xyes"; then
|
||
|
|
AC_DEFINE(USE_BOARD3D,1, [Define if you want to use the 3d boards])
|
||
|
|
no_board3d="no"
|
||
|
|
fi
|