Add explicit link to libpthread, to work around debugging issues

[fips] / configure

diff --git a/configure b/configure
index d5438d33dc876c691fb05f22e831d793b875bbde..f0f1a2188eeed82d9a3468f1374b33771fbf0da7 100755 (executable)
--- a/configure
+++ b/configure
@@ -279,17 +279,11 @@ if pkg-config --exists gl; then
     printf "Yes.\n"
     have_gl=1
     gl_cflags=$(pkg-config --cflags gl)
+    gl_ldflags=$(pkg-config --libs 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
+    printf"No.\n"
+    have_gl=0
+    errors=$((errors + 1))
 fi
 
 printf "Checking for GL window-system-binding headers:\n"
@@ -308,27 +302,41 @@ else
 fi
 rm -f glx-minimal glx-minimal.c
 
-printf "       Checking for GL/egl.h... "
+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
     printf "Yes.\n"
     have_egl=Yes
     egl_cflags=$(pkg-config --cflags egl)
+    egl_ldflags=$(pkg-config --libs 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
+    printf "No.\n"
 fi
 
-if [ $have_gl_winsys -eq 0 ]; then
-    errors=$((errors + 1))
+printf "       Checking for GLESv2... "
+have_glesv2=No
+if pkg-config --exists glesv2; then
+    printf "Yes.\n"
+    have_glesv2=Yes
+    glesv2_cflags=$(pkg-config --cflags glesv2)
+    glesv2_ldflags=$(pkg-config --libs glesv2)
+else
+    printf "No.\n"
 fi
 
 printf "int main(void){return 0;}\n" > minimal.c
@@ -526,31 +534,39 @@ 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}
+
+# Whether X11 headers and library are available
+HAVE_X11 = ${have_x11}
+
+# Flags needed to compile and link against libX11
+X11_CLFLAGS = ${x11_cflags}
+X11_LDFLAGS = ${x11_ldflags}
 
 # Whether EGL headers are available
 HAVE_EGL = ${have_egl}
 
 # Flags needed to find EGL header files (EGL/egl.h)
 EGL_CFLAGS = ${egl_cflags}
+EGL_LDFLAGS = ${egl_ldflags}
 
-# Flags needed to have linker link only to necessary libraries
-AS_NEEDED_LDFLAGS = ${as_needed_ldflags}
+# Whether GLESv2 headers and library are available
+HAVE_GLESV2 = ${have_glesv2}
 
-# Flags needed to compile the fips binary
-FIPS_CFLAGS = \$(WARN_CFLAGS) \$(TALLOC_CFLAGS) \$(LIBELF_CFLAGS)
-FIPS_LDFLAGS = \$(TALLOC_LDFLAGS) \$(LIBELF_LDFLAGS)
+# Flags needed to compile and link against GLESv2
+GLESV2_CFLAGS = ${glesv2_cflags}
+GLESV2_LDFLAGS = ${glesv2_ldflags}
 
-# Flags needed to compile the libfips libraries
-LIBFIPS_CFLAGS = \$(WARN_CFLAGS) \$(GL_CFLAGS) \$(EGL_CFLAGS)
-LIBFIPS_LDFLAGS =
+# Flags needed to have linker link only to necessary libraries
+AS_NEEDED_LDFLAGS = ${as_needed_ldflags}
 EOF
 
 # construct config.h
 cat > config.h <<EOF
 /* Generated by configure. */
 
-/* Relative path from ${bindir} to ${libdir} */
+/* Relative path from ${BINDIR} to ${LIBDIR}/fips */
 #define BINDIR_TO_LIBFIPSDIR "$(relative_path ${BINDIR} ${LIBDIR})/fips"
 EOF