Push final collection of CFLAGS/LDFLAGS from Makefile.config to Makefile.local

[fips] / configure

diff --git a/configure b/configure
index c584c93a349ad7023f58f4112bc942d4d734c6f8..ae6b31af5ca49551530797efc08c2b175953e798 100755 (executable)
--- a/configure
+++ b/configure
@@ -308,14 +308,14 @@ 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)
 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"
@@ -537,10 +537,6 @@ 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) \$(EGL_CFLAGS)
-CONFIGURE_LDFLAGS = \$(TALLOC_LDFLAGS) \$(LIBELF_LDFLAGS)
 EOF
 
 # construct config.h