From 955f9af0395a7fa2bba0d1c3a4e6ef5d3e111dae Mon Sep 17 00:00:00 2001 From: notaz Date: Fri, 8 Feb 2013 01:46:08 +0200 Subject: [PATCH] frontend: check for xlib when it's needed --- configure | 17 +++++++++++++++++ frontend/libpicofe | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 4d3bb5f8..8b5cbda5 100755 --- a/configure +++ b/configure @@ -49,6 +49,7 @@ have_tslib="" have_gles="" enable_dynarec="yes" need_sdl="no" +need_xlib="no" need_libpicofe="yes" need_warm="no" CFLAGS_GLES="" @@ -84,6 +85,7 @@ set_platform() drc_cache_base="yes" optimize_cortexa8="yes" have_arm_neon="yes" + need_xlib="yes" ;; maemo) ram_fixed="yes" @@ -360,6 +362,15 @@ EOF compile_binary "$@" } +check_xlib_headers() +{ + cat > $TMPC < + void *f() { return XOpenDisplay(0); } +EOF + compile_object "$@" +} + MAIN_LDLIBS="$MAIN_LDLIBS -lz" check_zlib || fail "please install zlib (libz-dev)" @@ -420,6 +431,7 @@ fi if [ -d /opt/vc/include -a -d /opt/vc/lib ]; then CFLAGS_GLES="$CFLAGS_GLES -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads" LDLIBS_GLES="$LDLIBS_GLES -L/opt/vc/lib" + need_xlib="yes" fi # check for GLES headers @@ -445,6 +457,11 @@ if [ "$have_arm_neon" = "yes" -a "$builtin_gpu" != "neon" ]; then plugins="$plugins plugins/gpu_neon/gpu_neon.so" fi +# check for xlib (only headers needed) +if [ "x$need_xlib" = "xyes" ]; then + check_xlib_headers || fail "please install libx11-dev" +fi + cat > $TMPC <