diff --git a/desmume/configure.ac b/desmume/configure.ac
index 3b2766d0b..1dc0f7252 100644
--- a/desmume/configure.ac
+++ b/desmume/configure.ac
@@ -117,10 +117,16 @@ if test "x$HAVE_SDL" = "xyes"; then
 fi
 
 case $target in
+  *linux*)
+    LIBS="$LIBS -lGL"
+    ;;
   *mingw*)
     LIBS="$LIBS -ldxguid -ldxerr8 -ldsound -lopengl32 -lws2_32 -mwindows"
     UI_DIR="windows"
     ;;
+  *darwin*)
+    LIBS="$LIBS -framework OpenGL"
+    ;;
 esac
 
 AC_SUBST(UI_DIR)
diff --git a/desmume/src/cli/Makefile.am b/desmume/src/cli/Makefile.am
index 1d830ac87..31f342b05 100644
--- a/desmume/src/cli/Makefile.am
+++ b/desmume/src/cli/Makefile.am
@@ -1,7 +1,6 @@
 include $(top_srcdir)/src/desmume.mk
 
 AM_CFLAGS += $(SDL_CFLAGS)
-AM_LDFLAGS += -lGL -lglut
 
 bin_PROGRAMS = desmume-cli
 desmume_cli_SOURCES = main.c ../sndsdl.c ../ctrlssdl.h ../ctrlssdl.c