isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 18:11:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

[build] More spring clean fixes

Browse Source 
* Remove the last if...fi with AS_IF

* Put back the regexp for the mingw32 check that commit 0d1c626a
  inadvertedly removed
This commit is contained in:
Emmanuele Bassi 2009-05-25 16:52:53 +01:00
parent 0d1c626a86
commit 733508b80d
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
configure.ac
View File

@ -121,7 +121,7 @@ AM_CONDITIONAL(HAVE_LIBDL, [test "x$HAVE_LIBDL" = "xyes"])
dnl === COGL GLES backend ===================================================== dnl === COGL GLES backend =====================================================
AS_IF([test "x$clutterbackend" = "xeglnative" || AS_IF([test "x$clutterbackend" = "xeglnative" ||
test "x$clutterbackend" = "xeglx" || test "x$clutterbackend" = "xeglx" ||
test "x$clutterbackend" = "xfruity"], test "x$clutterbackend" = "xfruity"],
[ [
@ -141,27 +141,34 @@ AS_IF([test "x$clutterbackend" = "xeglnative" ||
# check for upper/lower case libgles_em # check for upper/lower case libgles_em
# The powervr sdk uses lower case. # The powervr sdk uses lower case.
AC_CHECK_LIB(GLES_CM, eglInitialize, HAVE_LIBGLES=yes, HAVE_LIBGLES=no) AC_CHECK_LIB(GLES_CM, [eglInitialize],
if test "x$HAVE_LIBGLES" = "xno" [HAVE_LIBGLES=yes],
then [HAVE_LIBGLES=no])
AC_CHECK_LIB(GLESv1_CM, eglInitialize, HAVE_LIBGLES=yes, HAVE_LIBGLES=no)
if test "x$HAVE_LIBGLES" = "xno" AS_IF([test "x$HAVE_LIBGLES" = "xyes"],
then [GLES_LIBS="-lGLES_CM"],
AC_CHECK_LIB(gles_cm, eglInitialize, HAVE_LIBGLES=yes, HAVE_LIBGLES=no) [
AC_CHECK_LIB(GLESv1_CM, [eglInitialize],
[HAVE_LIBGLES=yes],
[HAVE_LIBGLES=no])
if test "x$HAVE_LIBGLES" = "xno" AS_IF([test "x$HAVE_LIBGLES" = "xyes"],
then [GLES_LIBS="-lGLESv1_CM"],
AC_MSG_ERROR([GLES library not found and egl backend requested.]); [
else AC_CHECK_LIB(gles_cm, [eglInitialize],
GLES_LIBS="-lgles_cm" [HAVE_LIBGLES=yes],
fi [HAVE_LIBGLES=no])
else
GLES_LIBS="-lGLESv1_CM" AS_IF([test "x$HAVE_LIBGLES" = "xyes"],
fi [GLES_LIBS="-lgles_cm"],
else [
GLES_LIBS="-lGLES_CM" AC_MSG_ERROR([GLES library not found and egl backend requested.])
fi ]
)
]
)
]
)
], ],
[2*], [2*],
@ -217,11 +224,11 @@ AS_CASE([$clutterbackend],
SDL_CFLAGS=`$SDL_CONFIG --cflags` SDL_CFLAGS=`$SDL_CONFIG --cflags`
SDL_LIBS=`$SDL_CONFIG --libs` SDL_LIBS=`$SDL_CONFIG --libs`
# Use -lopengl32 under Windows instead of -lGL
AS_CASE([$host], AS_CASE([$host],
[mingw32], [*mingw32*],
[ [
# Use -lopengl32 under Windows instead of -lGL
SDL_LIBS="$SDL_LIBS -lopengl32" SDL_LIBS="$SDL_LIBS -lopengl32"
CLUTTER_LT_LDFLAGS="$CLUTTER_LT_LDFLAGS -no-undefined" CLUTTER_LT_LDFLAGS="$CLUTTER_LT_LDFLAGS -no-undefined"
], ],