aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xconfigure8
-rw-r--r--configure.ac8
3 files changed, 19 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d8065e3..69e9a92c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-04 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * configure.ac: Use macx-g++ spec for QT when building for darwin
+ host using C++ compiler for GNU.
+
2011-06-30 Gabriel Dos Reis <gdr@cs.tamu.edu>
* config/open-axiom.m4 (OPENAXIOM_CHECK_GMP): New.
diff --git a/configure b/configure
index 1be64aa6..1213f74a 100755
--- a/configure
+++ b/configure
@@ -23726,7 +23726,13 @@ fi
## Set up Makefile for QT-based gui
if test x$oa_has_qt = xyes; then
- (cd src/gui && $OA_QT_QMAKE -makefile gui.pro)
+ oa_qmake_spec=
+ case $host,$GXX in
+ *darwin*,yes)
+ oa_qmake_spec="-spec macx-g++"
+ ;;
+ esac
+ (cd src/gui && $OA_QT_QMAKE $oa_qmake_spec -makefile gui.pro)
fi
## Generate rules to extrad SPAD type definitions from pamphlets.
diff --git a/configure.ac b/configure.ac
index f48b2b0e..fa8454f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,7 +133,13 @@ AC_OUTPUT
## Set up Makefile for QT-based gui
if test x$oa_has_qt = xyes; then
- (cd src/gui && $OA_QT_QMAKE -makefile gui.pro)
+ oa_qmake_spec=
+ case $host,$GXX in
+ *darwin*,yes)
+ oa_qmake_spec="-spec macx-g++"
+ ;;
+ esac
+ (cd src/gui && $OA_QT_QMAKE -makefile $oa_qmake_spec gui.pro)
fi
## Generate rules to extrad SPAD type definitions from pamphlets.