From d06acce2eafefa6d6ad6ae54d50ca40679c35335 Mon Sep 17 00:00:00 2001 From: Michael Ledford Date: Fri, 8 Mar 2013 20:25:50 -0500 Subject: [PATCH] Removed explicit search paths for libpng on Mac OS X. Instead now include a more generic search path to /usr/local/include and /usr/local/lib to which any dependency libraries should be installed. --- lib/configure | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/configure b/lib/configure index 37c8cdb07e..06375582a6 100755 --- a/lib/configure +++ b/lib/configure @@ -103,8 +103,8 @@ else fi if [[ $IS_OSX ]] ; then XCODE_SDK_PATH=$(xcodebuild -version -sdk $XCODE_SDK Path) - CFLAGS="$CFLAGS-isysroot $XCODE_SDK_PATH " - LDFLAGS="$LDFLAGS-isysroot $XCODE_SDK_PATH " + CFLAGS="$CFLAGS-isysroot $XCODE_SDK_PATH -I/usr/local/include " + LDFLAGS="$LDFLAGS-isysroot $XCODE_SDK_PATH -L/usr/local/lib " fi if [[ $ARCH != arm* ]] ; then echo -ne " Enable \033[4mSSE2\033[m [Y/n] ? " @@ -129,10 +129,6 @@ else [nN]* ) ;; * ) CFLAGS="$CFLAGS-D HAVE_LIBPNG " LDFLAGS="$LDFLAGS-lpng -lz " - if [[ $IS_OSX ]] ; then - CFLAGS="$CFLAGS-I/usr/X11/include " - LDFLAGS="$LDFLAGS-L/usr/X11/lib " - fi ;; esac echo -ne " With \033[4mgsl\033[m [Y/n] ? "