From 0d4a665a2c683352d5246de1a242665f1148d70c Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Sun, 21 Jul 2013 12:47:47 -0700
Subject: [PATCH] Fixed bug 1973 - test/Makefile.in fails on Mac OS X with X11
 enabled...

Ryan C. Gordon

If you have the X11 SDK installed on Mac OS X, you'll build with X11 support, but the Makefile doesn't build anything but the Cocoa testnative code for Mac OS X, which is fine, but then testnative fails to link because testnative.h enables the X11 support based on the SDL config header.

Building the testnativex11.c code on Mac OS X doesn't work because you need to explicitly link with "-L/usr/X11/lib -lX11" if this code is enabled, but you can't link with that by default because the X11 SDK might be missing.

So this needs a little configure magic to do the right thing (or forcibly disabling X11 support on Mac OS X in testnative.h).
---
 test/Makefile.in  | 7 ++++---
 test/configure    | 3 +++
 test/configure.in | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/test/Makefile.in b/test/Makefile.in
index d7386992b..073d20100 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -150,8 +150,9 @@ testlock$(EXE): $(srcdir)/testlock.c
 
 ifeq (@ISMACOSX@,true)
 testnative$(EXE): $(srcdir)/testnative.c \
-			$(srcdir)/testnativecocoa.m
-	$(CC) -o $@ $^ $(CFLAGS) $(LIBS) -framework Cocoa
+			$(srcdir)/testnativecocoa.m \
+			$(srcdir)/testnativex11.c
+	$(CC) -o $@ $^ $(CFLAGS) $(LIBS) -framework Cocoa @XLIB@
 endif
 
 ifeq (@ISWINDOWS@,true)
@@ -163,7 +164,7 @@ endif
 ifeq (@ISUNIX@,true)
 testnative$(EXE): $(srcdir)/testnative.c \
 			$(srcdir)/testnativex11.c
-	$(CC) -o $@ $^ $(CFLAGS) $(LIBS) -L/usr/X11/lib -lX11
+	$(CC) -o $@ $^ $(CFLAGS) $(LIBS) @XLIB@
 endif
 
 testoverlay2$(EXE): $(srcdir)/testoverlay2.c
diff --git a/test/configure b/test/configure
index f91d30d9a..319c03298 100755
--- a/test/configure
+++ b/test/configure
@@ -585,6 +585,7 @@ ac_unique_file="README"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 SDL_TTF_LIB
+XLIB
 GLLIB
 CPP
 XMKMF
@@ -3793,6 +3794,7 @@ if test x$have_x = xyes; then
         :
     else
         XPATH="-L$ac_x_libraries"
+        XLIB="-L$ac_x_libraries -lX11"
     fi
 fi
 
@@ -3865,6 +3867,7 @@ fi
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TTF_Init in -lSDL2_ttf" >&5
 $as_echo_n "checking for TTF_Init in -lSDL2_ttf... " >&6; }
 if ${ac_cv_lib_SDL2_ttf_TTF_Init+:} false; then :
diff --git a/test/configure.in b/test/configure.in
index b89b4617d..b74800758 100644
--- a/test/configure.in
+++ b/test/configure.in
@@ -100,6 +100,7 @@ if test x$have_x = xyes; then
         :
     else
         XPATH="-L$ac_x_libraries"
+        XLIB="-L$ac_x_libraries -lX11"
     fi
 fi
 
@@ -141,6 +142,7 @@ else
 fi
 
 AC_SUBST(GLLIB)
+AC_SUBST(XLIB)
 
 dnl Check for SDL_ttf
 AC_CHECK_LIB(SDL2_ttf, TTF_Init, have_SDL_ttf=yes)