Don't link unconditionally against libosmesa

fix cli frontend --opengl-2d when libosmesa is available.
This commit is contained in:
riccardom 2010-02-01 20:22:30 +00:00
parent 568e0548e5
commit 69bf4a0b03
2 changed files with 6 additions and 1 deletions

View File

@ -83,9 +83,11 @@ if test "x$osmesa" = "xyes" ; then
AC_CHECK_LIB(OSMesa, main,[
useosmesa=yes
AC_DEFINE(HAVE_LIBOSMESA)
LIBS="-lOSMesa $LIBS"
OSMESA_LIBS="-lOSMesa"
AC_SUBST(OSMESA_LIBS)
])
fi
AM_CONDITIONAL([HAVE_LIBOSMESA], [test "${useosmesa}" = "yes"])
dnl - hack to help zero build gtk frontend macos x package
AC_ARG_ENABLE(macosxhack,

View File

@ -23,6 +23,9 @@ desmume_LDADD = ../libdesmume.a \
if HAVE_GDB_STUB
desmume_LDADD += ../gdbstub/libgdbstub.a
endif
if HAVE_LIBOSMESA
desmume_LDADD += $(OSMESA_LIBS)
endif
UPDATE_DESKTOP = \
appsdir=$(DESTDIR)$(datadir)/applications ; \