X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=configure;h=77fedba4fb0e8f088e9ae05b2c148342067ba84f;hb=bf449ac6d282ad726817c4413eb2c310adba2316;hp=dd0a6a686d2dc73599e4791fa458ca1b59a8f7d7;hpb=211a9ae3f02ce8032da195b211ea683d5fada05d;p=fips diff --git a/configure b/configure index dd0a6a6..77fedba 100755 --- a/configure +++ b/configure @@ -281,16 +281,9 @@ if pkg-config --exists gl; then gl_cflags=$(pkg-config --cflags gl) gl_ldflags=$(pkg-config --libs gl) else - printf "#include \nint main(void){return 0;}\n" > gl-minimal.c - if ${CC} -o gl-minimal gl-minimal.c > /dev/null 2>&1 - then - printf "Yes.\n" - have_gl=1 - else - printf "No.\n" - errors=$((errors + 1)) - fi - rm -f gl-minimal gl-minimal.c + printf"No.\n" + have_gl=0 + errors=$((errors + 1)) fi printf "Checking for GL window-system-binding headers:\n" @@ -309,6 +302,21 @@ else fi rm -f glx-minimal glx-minimal.c +if [ $have_gl_winsys -eq 0 ]; then + errors=$((errors + 1)) +fi + +printf " Checking for X11... " +have_x11=No +if pkg-config --exists x11; then + printf "Yes.\n" + have_x11=Yes + x11_cflags=$(pkg-config --cflags x11) + x11_ldflags=$(pkg-config --libs x11) +else + printf "No.\n" +fi + printf " Checking for EGL/egl.h... " have_egl=No if pkg-config --exists egl; then @@ -317,20 +325,8 @@ if pkg-config --exists egl; then egl_cflags=$(pkg-config --cflags egl) egl_ldflags=$(pkg-config --libs egl) else - printf "#include \nint main(void){return 0;}\n" > egl-minimal.c - if ${CC} -o egl-minimal egl-minimal.c ${gl_cflags} > /dev/null 2>&1 - then - printf "Yes.\n" - have_gl_winsys=1 - have_egl=1 - else - printf "No.\n" - fi - rm -f egl-minimal egl-minimal.c -fi - -if [ $have_gl_winsys -eq 0 ]; then - errors=$((errors + 1)) + printf "No.\n" + have_egl=No fi printf "int main(void){return 0;}\n" > minimal.c @@ -528,10 +524,17 @@ LIBELF_LDFLAGS = ${libelf_ldflags} # Whether GLX headers are available HAVE_GLX = ${have_glx} -# Flags needed to find GL and GLX header files (GL/gl.h and GL/glx.h) +# Flags needed to compile and link against libGL GL_CFLAGS = ${gl_cflags} GL_LDFLAGS = ${gl_ldflags} +# Wheter X11 headers and library are available +HAVE_X11 = ${have_x11} + +# Flags needs to compile and link against libX11 +X11_CLFLAGS = ${x11_cflags} +X11_LDFLAGS = ${x11_ldflags} + # Whether EGL headers are available HAVE_EGL = ${have_egl}