configure: Set GL_LDFLAGS and EGL_LDFLAGS in configure script

[fips] / configure

diff --git a/configure b/configure
index c584c93a349ad7023f58f4112bc942d4d734c6f8..dd0a6a686d2dc73599e4791fa458ca1b59a8f7d7 100755 (executable)
--- a/configure
+++ b/configure
@@ -279,6 +279,7 @@ 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
@@ -308,14 +309,15 @@ else
 fi
 rm -f glx-minimal glx-minimal.c
 
-printf "       Checking for GL/egl.h... "
+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
+    printf "#include <EGL/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"
@@ -528,19 +530,17 @@ HAVE_GLX = ${have_glx}
 
 # Flags needed to find GL and GLX header files (GL/gl.h and GL/glx.h)
 GL_CFLAGS = ${gl_cflags}
+GL_LDFLAGS = ${gl_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}
-
-# Combined flags for compiling and linking against all of the above
-CONFIGURE_CFLAGS = \$(TALLOC_CFLAGS) \$(LIBELF_CFLAGS) \$(GL_CFLAGS) \$(EGL_CFLAGS)
-CONFIGURE_LDFLAGS = \$(TALLOC_LDFLAGS) \$(LIBELF_LDFLAGS)
 EOF
 
 # construct config.h