X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=configure;h=9428296b75825aef8b26e08f9a3c6e099189c3b7;hb=18ff92375257efa1ba4a4441079b0cd587661bfe;hp=a79960700aeb0fa44ebdcd20da0452fd296e75a4;hpb=b1570730174c0efe6431e8b032c5d408c7367a21;p=fips

diff --git a/configure b/configure
index a799607..9428296 100755
--- a/configure
+++ b/configure
@@ -192,13 +192,58 @@ 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 working C compiler (${CC})... "
+printf "int main(void){return 42;}\n" > minimal.c
+if ${CC} -o minimal minimal.c > /dev/null 2>&1
+then
+    printf "Yes.\n"
+else
+    printf "No.\n"
+    cat <<EOF
+
+*** Error: No functioning C compiler found. Either set the CC environment
+to a working C compiler, or else install gcc:
+
+	http://gcc.gnu.org/
+
+You may be able to install gcc with a command such as:
+
+	sudo apt-get install build-essential
+    or:
+	sudo yum install make automake gcc gcc-c++ kernel-devel
+
+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 +273,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"
@@ -332,26 +377,6 @@ Or on Fedora and similar systems:
 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.