Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore
Modified Files:
configure.in
Log Message:
Use pkgconfig, not -config file
===================================================================
RCS file: /cvs/e/e17/libs/ecore/configure.in,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -3 -r1.220 -r1.221
--- configure.in 4 Nov 2007 09:29:17 -0000 1.220
+++ configure.in 4 Nov 2007 19:15:28 -0000 1.221
@@ -569,49 +569,26 @@
fi
## SDL
-AC_ARG_WITH(sdl-config, [ --with-sdl-config=SDL_CONFIG use sdl-config
specified],
-[ SDL_CONFIG=$withval;
- echo "using "$SDL_CONFIG" for sdl-config"; ],
-[ if test -z "$SDL_CONFIG"; then
- AC_PATH_PROG(SDL_CONFIG, "sdl-config", "", $PATH)
- fi
-])
-if test -z "$SDL_CONFIG" ; then SDL_CONFIG="sdl-config"; fi
-
-have_sdl="no"
-AC_CHECK_HEADER(SDL/SDL.h,
- [ have_sdl="yes" ],
- [ have_sdl="no" ]
-)
+PKG_CHECK_MODULES(SDL, sdl >= 1.2.0,
+ [ have_sdl="yes" ],
+ [ have_sdl="no" ])
ECORE_CHECK_MODULE([SDL], [yes], [$have_sdl],
[requirements_ecore_evas="$requirements_ecore_evas ecore-sdl"])
want_ecore_evas_sdl="yes";
have_ecore_evas_sdl="no";
-sdl_cflags="";
-sdl_libs="";
AC_MSG_CHECKING(whether ecore_evas sdl support is to be built)
AC_ARG_ENABLE(ecore-evas-sdl,
[ --enable-ecore-evas-sdl enable sdl in the ecore_evas module],
- [
- if test x"$enableval" = x"yes"; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- want_ecore_evas_sdl="no"
- fi
- ], [
- AC_MSG_RESULT(yes)
- ]
+ [ want_ecore_evas_sdl=$enableval ]
)
-if test "x$want_ecore_evas_sdl" = "xyes"; then
- sdl_cflags=`$SDL_CONFIG --cflags`
- sdl_libs=`$SDL_CONFIG --libs`
+AC_MSG_RESULT($want_ecore_evas_sdl)
+if test "x$want_ecore_evas_sdl" = "xyes"; then
save_CFLAGS=$CFLAGS
- CFLAGS=$CFLAGS" $sdl_cflags"
+ CFLAGS=$CFLAGS" $SDL_CFLAGS"
AC_CHECK_HEADER(Evas_Engine_SDL.h,
[
AC_DEFINE(BUILD_ECORE_EVAS_SDL, 1, [Support for SDL in Ecore_Evas])
@@ -630,9 +607,6 @@
[ AC_DEFINE(BUILD_ECORE_EVAS_SDL_130, 1, [Support for SVN SDL]) ],
[ dummy=no ])
fi
-
-AC_SUBST(sdl_cflags)
-AC_SUBST(sdl_libs)
want_ecore_evas_buffer="yes";
have_ecore_evas_buffer="no";
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
