X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=configure;h=a79960700aeb0fa44ebdcd20da0452fd296e75a4;hb=e7e5c4643bbf59b0df88356ef5c511ebe764ff58;hp=6c8b186d4da8b25b3f48d4d2c4178962d9f90cff;hpb=1f4014b53a4dc77768f3998a6fd3b67024431fa3;p=fips

diff --git a/configure b/configure
index 6c8b186..a799607 100755
--- a/configure
+++ b/configure
@@ -211,35 +211,79 @@ else
     errors=$((errors + 1))
 fi
 
-printf "Checking which platform we are on... "
-uname=`uname`
-if [ $uname = "Darwin" ] ; then
-    printf "Mac OS X.\n"
-    platform=MACOSX
-    linker_resolves_library_dependencies=0
-elif [ $uname = "SunOS" ] ; then
-    printf "Solaris.\n"
-    platform=SOLARIS
-    linker_resolves_library_dependencies=0
-elif [ $uname = "FreeBSD" ] ; then
-    printf "FreeBSD.\n"
-    platform=FREEBSD
-    linker_resolves_library_dependencies=0
-elif [ $uname = "OpenBSD" ] ; then
-    printf "OpenBSD.\n"
-    platform=OPENBSD
-    linker_resolves_library_dependencies=0
-elif [ $uname = "Linux" ] || [ $uname = "GNU" ] ; then
-    printf "$uname\n"
-    platform="$uname"
-    linker_resolves_library_dependencies=1
+printf "Checking for libelf... "
+printf "#include <gelf.h>\nint main(void){return elf_version (EV_CURRENT);}\n" > elf-minimal.c
+if ${CC} -o elf-minimal elf-minimal.c -lelf > /dev/null 2>&1
+then
+    printf "Yes.\n"
+    have_libelf=1
+    libelf_cflags=
+    libelf_ldflags=-lelf
 else
-    printf "Unknown.\n"
-    cat <<EOF
+    printf "No.\n"
+    have_libelf=0
+    libelf_cflags=
+    libelf_ldflags=
+    errors=$((errors + 1))
+fi
+rm -f elf-minimal elf-minimal.c
 
-*** Warning: Unknown platform. ${PROJECT} might or might not build correctly.
+printf "Checking for OpenGL header file GL/gl.h... "
+have_gl=0
+if pkg-config --exists gl; then
+    printf "Yes.\n"
+    have_gl=1
+    gl_cflags=$(pkg-config --cflags gl)
+else
+    printf "#include <GL/gl.h>\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
+fi
 
-EOF
+printf "Checking for GL window-system-binding headers:\n"
+have_gl_winsys=0
+
+printf "    Checking for GL/glx.h... "
+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=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
 
 if [ $errors -gt 0 ]; then
@@ -255,6 +299,21 @@ EOF
 	echo "	http://talloc.samba.org/"
 	echo
     fi
+    if [ $have_libelf -eq 0 ]; then
+	echo "	The libelf library (including development files such as headers)"
+	echo "	http://http://sourceforge.net/projects/elftoolchain/"
+	echo
+    fi
+    if [ $have_gl -eq 0 ]; then
+	echo "	Open GL header files (GL/gl.h)"
+	echo "	http://www.mesa3d.org/"
+	echo
+    fi
+    if [ $have_gl_winsys -eq 0 ]; then
+	echo "	OpenGL window-system-bindings header files (GL/glx.h and/or GL/egl.h)"
+	echo "	http://www.mesa3d.org/"
+	echo
+    fi
     cat <<EOF
 With any luck, you're using a modern, package-based operating system
 that has all of these packages available in the distribution. In that
@@ -262,11 +321,13 @@ case a simple command will install everything you need. For example:
 
 On Debian and similar systems:
 
-	sudo apt-get install libtalloc-dev
+	sudo apt-get install libtalloc-dev libelf-dev \\
+	libgl1-mesa-dev libgles2-mesa-dev
 
 Or on Fedora and similar systems:
 
-	sudo yum install libtalloc-devel
+	sudo yum install libtalloc-devel libelf-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.
@@ -315,8 +376,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
@@ -382,24 +449,32 @@ mandir = ${MANDIR:=\$(prefix)/share/man}
 # The directory to which read-only (configuration) files should be installed
 sysconfdir = ${SYSCONFDIR:=\$(prefix)/etc}
 
-# Supported platforms (so far) are: LINUX, MACOSX, SOLARIS, FREEBSD, OPENBSD
-PLATFORM = ${platform}
-
-# Whether the linker will automatically resolve the dependency of one
-# library on another (if not, then linking a binary requires linking
-# directly against both)
-LINKER_RESOLVES_LIBRARY_DEPENDENCIES = ${linker_resolves_library_dependencies}
-
 # Flags needed to compile and link against talloc
 TALLOC_CFLAGS = ${talloc_cflags}
 TALLOC_LDFLAGS = ${talloc_ldflags}
 
+# Flags needed to compile and link against libelf
+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)
-CONFIGURE_LDFLAGS = \$(TALLOC_LDFLAGS)
+CONFIGURE_CFLAGS = \$(TALLOC_CFLAGS) \$(LIBELF_CFLAGS) \$(GL_CFLAGS) \$(EGL_CFLAGS)
+CONFIGURE_LDFLAGS = \$(TALLOC_LDFLAGS) \$(LIBELF_LDFLAGS)
 EOF
 
 # construct config.h