Skip to content
Permalink
Browse files

Fixed X11 library detection

Allow passing CFLAGS for the build in the environment
  • Loading branch information
slouken committed Feb 20, 2006
1 parent f6762cb commit c06a5ceff3d16e22ec88dea6943207a946628347
Showing with 17 additions and 21 deletions.
  1. +17 −21 configure.in
@@ -49,34 +49,30 @@ else
AC_DEFINE(SDL_BYTEORDER, 1234)
fi

dnl Set up the base CFLAGS and LIBS
dnl Set up the compiler and linker flags
INCLUDE="-I$srcdir/include"
if test x$srcdir != x.; then
INCLUDE="-Iinclude $INCLUDE"
fi
case "$target" in
*-*-cygwin*)
# We build SDL on cygwin without the UNIX emulation layer
BASE_CFLAGS="-I/usr/include/mingw -DWIN32 -Uunix -mno-cygwin"
BASE_LIBS="-mno-cygwin"
CFLAGS="$CFLAGS -I/usr/include/mingw -DWIN32 -Uunix -mno-cygwin"
BUILD_CFLAGS="$CFLAGS \$(INCLUDE)"
BUILD_LIBS="-mno-cygwin"
SDL_CFLAGS="-I/usr/include/mingw -DWIN32 -Uunix -mno-cygwin"
SDL_LIBS="-lSDL -mno-cygwin"
;;
*)
BASE_CFLAGS="-D_GNU_SOURCE=1"
BASE_LIBS=""
CFLAGS="$CFLAGS -D_GNU_SOURCE=1"
BUILD_CFLAGS="$CFLAGS \$(INCLUDE)"
BUILD_LIBS=""
SDL_CFLAGS=""
SDL_LIBS="-lSDL"
;;
esac
CFLAGS="$CFLAGS $BASE_CFLAGS"

dnl Set up the compiler and linker flags for building SDL
INCLUDE="-I$srcdir/include"
if test x$srcdir != x.; then
INCLUDE="-Iinclude $INCLUDE"
fi
BUILD_CFLAGS="$BASE_CFLAGS \$(INCLUDE)"
BUILD_LIBS="$BASE_LIBS"

dnl Set up the compiler and linker flags for SDL applications
SDL_CFLAGS="$BASE_CFLAGS"
SDL_LIBS="$BASE_LIBS -lSDL"

dnl Check for tools
#AC_LIBTOOL_DLOPEN
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
AC_PROG_CC
@@ -751,9 +747,9 @@ AC_HELP_STRING([--enable-x11-shared], [dynamically load X11 support [default=yes
;;
*)
if test x$X_LIBS = x; then X_LIBS="-L/usr/lib"; fi
x11_lib_spec=`echo $X_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libX11.so*/'`
x11_lib_spec=[`echo $X_LIBS | sed 's/.*-L\([^ ]*\).*/\1\/libX11.so.[0-9]/'`]
x11_lib=`ls $x11_lib_spec 2>/dev/null | sort -r | sed 's/.*\/\(.*\)/\1/; q'`
x11ext_lib_spec=`echo $X_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libXext.so*/'`
x11ext_lib_spec=[`echo $X_LIBS | sed 's/.*-L\([^ ]*\).*/\1\/libXext.so.[0-9]/'`]
x11ext_lib=`ls $x11ext_lib_spec 2>/dev/null | sort -r | sed 's/.*\/\(.*\)/\1/; q'`
;;
esac

0 comments on commit c06a5ce

Please sign in to comment.