X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=configure;h=7c5a38ce6e2dae6f3d4cf075081e81231c92747d;hb=35ee06686adbfa4dd0feca625eb9a0dfee2d087e;hp=121aec4d2604add06e3454a46f15f63ab15dfdb6;hpb=385fae6dca60b9b41e91c9b8bfe1a05a4eb18240;p=fips

diff --git a/configure b/configure
index 121aec4..7c5a38c 100755
--- a/configure
+++ b/configure
@@ -192,13 +192,32 @@ EOF
 
 errors=0
 
+printf "Checking for pkg-config... "
 if pkg-config --version > /dev/null 2>&1; then
-    have_pkg_config=1
+    printf "Yes.\n"
 else
-    have_pkg_config=0
+    printf "No.\n"
+    cat <<EOF
+
+*** Error: This configure script requires pkg-config to find the
+compilation flags required to link against the various libraries
+needed by ${PROJECT}. The pkg-config program can be obtained from:
+
+	http://www.freedesktop.org/wiki/Software/pkg-config/
+
+Or you may be able install it with a command such as:
+
+	sudo apt-get install pkg-config
+    or:
+	sudo yum install pkgconfig
+
+EOF
+
+exit 1
+
 fi
 
-printf "Checking for talloc development files... "
+printf "Checking for libtalloc... "
 if pkg-config --exists talloc; then
     printf "Yes.\n"
     have_talloc=1
@@ -228,7 +247,7 @@ else
 fi
 rm -f elf-minimal elf-minimal.c
 
-printf "Checking for OpenGL header file GL/gl.h... "
+printf "Checking for GL/gl.h... "
 have_gl=0
 if pkg-config --exists gl; then
     printf "Yes.\n"
@@ -251,18 +270,37 @@ printf "Checking for GL window-system-binding headers:\n"
 have_gl_winsys=0
 
 printf "    Checking for GL/glx.h... "
-have_glx=0
+have_glx=No
 printf "#include <GL/glx.h>\nint main(void){return 0;}\n" > glx-minimal.c
 if ${CC} -o glx-minimal glx-minimal.c ${gl_cflags} > /dev/null 2>&1
 then
     printf "Yes.\n"
     have_gl_winsys=1
-    have_glx=1
+    have_glx=Yes
 else
     printf "No.\n"
 fi
 rm -f glx-minimal glx-minimal.c
 
+printf "    Checking for GL/egl.h... "
+have_egl=No
+if pkg-config --exists egl; then
+    printf "Yes.\n"
+    have_egl=Yes
+    egl_cflags=$(pkg-config --cflags egl)
+else
+    printf "#include <GL/egl.h>\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))
 fi
@@ -291,7 +329,7 @@ EOF
 	echo
     fi
     if [ $have_gl_winsys -eq 0 ]; then
-	echo "	OpenGL window-system-bindings header files (GL/glx.h)"
+	echo "	OpenGL window-system-bindings header files (GL/glx.h and/or GL/egl.h)"
 	echo "	http://www.mesa3d.org/"
 	echo
     fi
@@ -303,36 +341,16 @@ case a simple command will install everything you need. For example:
 On Debian and similar systems:
 
 	sudo apt-get install libtalloc-dev libelf-dev \\
-	libgl1-mesa-dev
+	libgl1-mesa-dev libgles2-mesa-dev
 
 Or on Fedora and similar systems:
 
 	sudo yum install libtalloc-devel libelf-devel \\
-	mesa-libGL-devel
+	mesa-libGL-devel mesa-libGLES-devel
 
 On other systems, similar commands can be used, but the details of the
 package names may be different.
 
-EOF
-    if [ $have_pkg_config -eq 0 ]; then
-cat <<EOF
-Note: the pkg-config program is not available. This configure script
-uses pkg-config to find the compilation flags required to link against
-the various libraries needed by ${PROJECT}. It's possible you simply need
-to install pkg-config with a command such as:
-
-	sudo apt-get install pkg-config
-Or:
-	sudo yum install pkgconfig
-
-But if pkg-config is not available for your system, then you will need
-to modify the configure script to manually set the cflags and ldflags
-variables to the correct values to link against each library in each
-case that pkg-config could not be used to determine those values.
-
-EOF
-    fi
-cat <<EOF
 When you have installed the necessary dependencies, you can run
 configure again to ensure the packages can be found, or simply run
 "make" to compile.
@@ -357,8 +375,14 @@ rm -f minimal minimal.c
 
 cat <<EOF
 
-All required packages were found. You may now run the following
-commands to compile and install ${PROJECT}:
+All required packages were found.
+
+The following OpenGL window-system bindings will be supported:
+
+	GLX: ${have_glx}
+	EGL: ${have_egl}
+
+You may now run the following commands to compile and install ${PROJECT}:
 
 	make
 	sudo make install
@@ -432,14 +456,23 @@ TALLOC_LDFLAGS = ${talloc_ldflags}
 LIBELF_CFLAGS = ${libelf_cflags}
 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)
 GL_CFLAGS = ${gl_cflags}
 
+# Whether EGL headers are available
+HAVE_EGL = ${have_egl}
+
+# Flags needed to find EGL header files (EGL/egl.h)
+EGL_CFLAGS = ${egl_cflags}
+
 # Flags needed to have linker link only to necessary libraries
 AS_NEEDED_LDFLAGS = ${as_needed_ldflags}
 
 # Combined flags for compiling and linking against all of the above
-CONFIGURE_CFLAGS = \$(TALLOC_CFLAGS) \$(LIBELF_CFLAGS) \$(GL_CFLAGS)
+CONFIGURE_CFLAGS = \$(TALLOC_CFLAGS) \$(LIBELF_CFLAGS) \$(GL_CFLAGS) \$(EGL_CFLAGS)
 CONFIGURE_LDFLAGS = \$(TALLOC_LDFLAGS) \$(LIBELF_LDFLAGS)
 EOF