warning fixes and cleanups for 64-bit machines

[citadel.git] / citadel / configure.ac

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 31334de8cda77ba330532c3196325f7310fa62d0..776c40d1ec483440f5f76ae8bd23b352b71183c7 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -62,6 +62,7 @@ case "$host" in
        dnl Digital Unix has an odd way to build for pthreads, and we can't
        dnl build pthreads programs with gcc due to header problems.
        alpha*-dec-osf*)
+               test -z "$CC" && CC=cc
                PTHREAD_LIBS="-lpthread -lexc"
                check_pthread=no
        ;;
@@ -86,23 +87,16 @@ case "$host" in
 esac
 
 dnl Checks for programs.
-case "$host" in
-       alpha*-dec-osf*)
-               AC_PROG_CC(cc gcc /usr/ucb/cc c89)
-       ;;
-       *)
-               AC_PROG_CC
-       ;;
-esac
+AC_PROG_CC
 
 dnl Set up system-dependent compiler flags.
 if test "$GCC" = yes; then
        case "$host" in
-               *-*-solaris*)
-                       CFLAGS="$CFLAGS -Wall -Wno-char-subscripts"
+               *-*-solaris*|alpha*-dec-osf*)
+                       CFLAGS="$CFLAGS -Wall -Wcast-align -Wno-char-subscripts"
                ;;
                *)
-                       CFLAGS="$CFLAGS -Wall -Wstrict-prototypes"
+                       CFLAGS="$CFLAGS -Wall -Wcast-align -Wstrict-prototypes"
                ;;
        esac
 fi