From 444fab8f879f3c012668fadce3f27baf0c9d8942 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sun, 11 Oct 2009 00:44:23 +0000
Subject: more build fixes

git-svn-id: svn+q:///qpdf/trunk@777 71b93d88-0707-0410-a8cf-f5a4172ac649
---
 configure.ac | 46 ++++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index d6523ff7..09670697 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,19 +84,30 @@ else
    AC_MSG_RESULT(no)
 fi
 
-qpdf_USE_WALL=0
-AC_MSG_CHECKING(for whether $CC supports -Wall)
-oCFLAGS=$CFLAGS
-CFLAGS="$CFLAGS -Wall"
-AC_TRY_COMPILE([], [int a = 1; int b = a; a = b;],
-	       qpdf_USE_WALL=1,
-	       qpdf_USE_WALL=0)
-if test "$qpdf_USE_WALL" = "1"; then
-   AC_MSG_RESULT(yes)
-   CXXFLAGS="$CXXFLAGS -Wall"
-else
-   AC_MSG_RESULT(no)
-   CFLAGS=$oCFLAGS
+AC_MSG_CHECKING(which build rules to use)
+AC_SUBST(BUILDRULES)
+AC_ARG_WITH(buildrules,
+   AS_HELP_STRING([--with-buildrules=rules],
+		  [which build rules to use; see README]),
+   [BUILDRULES=$withval],
+   [BUILDRULES=libtool])
+AC_MSG_RESULT($BUILDRULES)
+
+if test "$BUILDRULES" != "msvc"; then
+   qpdf_USE_WALL=0
+   AC_MSG_CHECKING(for whether $CC supports -Wall)
+   oCFLAGS=$CFLAGS
+   CFLAGS="$CFLAGS -Wall"
+   AC_TRY_COMPILE([], [int a = 1; int b = a; a = b;],
+		  qpdf_USE_WALL=1,
+		  qpdf_USE_WALL=0)
+   if test "$qpdf_USE_WALL" = "1"; then
+      AC_MSG_RESULT(yes)
+      CXXFLAGS="$CXXFLAGS -Wall"
+   else
+      AC_MSG_RESULT(no)
+      CFLAGS=$oCFLAGS
+   fi
 fi
 
 if test "$BUILD_EXTERNAL_LIBS" = "0"; then
@@ -118,15 +129,6 @@ if test "$BUILD_EXTERNAL_LIBS" = "0"; then
    fi
 fi
 
-AC_MSG_CHECKING(which build rules to use)
-AC_SUBST(BUILDRULES)
-AC_ARG_WITH(buildrules,
-   AS_HELP_STRING([--with-buildrules=rules],
-		  [which build rules to use; see README]),
-   [BUILDRULES=$withval],
-   [BUILDRULES=libtool])
-AC_MSG_RESULT($BUILDRULES)
-
 AC_SUBST(SKIP_TEST_COMPARE_IMAGES)
 AC_ARG_ENABLE(test-compare-images,
    AS_HELP_STRING([--enable-test-compare-images],
-- 
cgit v1.2.3-54-g00ecf