Skip to content
Browse files

Change a bit about how qt is detected. Shouldn't be confused by qt3 vs

qt4, and also shouldn't break OSX.
  • Loading branch information...
1 parent d552925 commit 46eeae88ad8af4d42b87a69c6fc823162504334b @novas0x2a novas0x2a committed Oct 9, 2008
Showing with 17 additions and 12 deletions.
  1. +2 −2 acinclude.m4
  2. +1 −4 config/autotroll.m4
  3. +14 −6 configure.ac
View
4 acinclude.m4
@@ -115,7 +115,7 @@ AC_DEFUN([AX_FIND_FILES],
])
-dnl Usage: AX_PKG(<name>, <dependencies>, <libraries>, <headers>[, <relative include path>])
+dnl Usage: AX_PKG(<name>, <dependencies>, <libraries>, <headers>[, <additional cxxflags>])
AC_DEFUN([AX_PKG],
[
AC_ARG_WITH(translit($1,`A-Z',`a-z'),
@@ -218,7 +218,7 @@ AC_DEFUN([AX_PKG],
if test -z "$5"; then
ASP_CPPFLAGS="-I$path/${AX_INCLUDE_DIR} $ASP_CPPFLAGS"
else
- ASP_CPPFLAGS="-I$path/${AX_INCLUDE_DIR}/$5 $ASP_CPPFLAGS"
+ ASP_CPPFLAGS="$5 $ASP_CPPFLAGS"
fi
CPPFLAGS="$ax_pkg_old_cppflags $ASP_CPPFLAGS"
AC_LINK_IFELSE(
View
5 config/autotroll.m4
@@ -222,10 +222,7 @@ _ASEOF
# Find the .pro file generated by qmake.
pro_file='conftest.dir.pro'
test -f $pro_file || pro_file=`echo *.pro`
- if test -f "$pro_file"; then :i
- # Force qmake to include OpenGL support
- echo 'QT += opengl' >> $pro_file
- else
+ if test -f "$pro_file"; then :; else
AC_MSG_ERROR([Can't find the .pro file generated by Qmake.])
fi
View
20 configure.ac
@@ -217,7 +217,7 @@ AC_PROG_LIBTOOL
AC_PROG_MAKE_SET
# Qt with AutoTroll.
-AT_WITH_QT
+AT_WITH_QT([+gui +sql +opengl])
if test "yes" = "$ENABLE_VERBOSE"; then
AC_MSG_NOTICE([using PKG_PATHS=$PKG_PATHS])
@@ -249,13 +249,21 @@ AX_PKG(VW_CARTOGRAPHY, [], [-lvwCartography], [vw/Cartography/GeoReference.h])
AX_PKG(VW_INTEREST_POINT, [], [-lvwInterestPoint])
AX_PKG(OPENSCENEGRAPH, [], [-losg -losgDB -lOpenThreads -losgViewer -losgText -losgGA -losgFX -losgTerrain -losgUtil], [osg/ref_ptr])
-AX_PKG(MBA, [], [-lMBA_1.0_gpl_nopt], [MBA.h])
+AX_PKG(MBA10, [], [-lMBA_1.0_gpl_nopt], [MBA.h])
+
+if test "$HAVE_PKG_MBA10" = "no"; then
+ echo "Checking for MBA 1.1"
+ AX_PKG(MBA, [], [-lMBA-1.1], [MBA.h])
+else
+ AX_PKG(MBA, [MBA10], [], [])
+fi
+
AX_PKG(SPICE, [], [-lcspice], [SpiceUsr.h SpiceZfc.h])
-AX_PKG(QT_INCLUDE, [], [], [QtCore/QVector])
-AX_PKG(QT_CORE, [QT_INCLUDE], [-lQtCore.4], [QVector], [QtCore])
-AX_PKG(QT_GUI, [QT_INCLUDE], [-lQtGui.4], [QLabel], [QtGui])
-AX_PKG(QT_SQL, [QT_INCLUDE], [-lQtSql.4], [QtSql],[QtSql])
+AX_PKG(QT_INCLUDE, [], [], [QVector], [${QT_CPPFLAGS}])
+AX_PKG(QT_CORE, [QT_INCLUDE], [-lQtCore], [QVector], [${QT_CPPFLAGS}])
+AX_PKG(QT_GUI, [QT_INCLUDE], [-lQtGui], [QLabel], [${QT_CPPFLAGS}])
+AX_PKG(QT_SQL, [QT_INCLUDE], [-lQtSql], [QtSql], [${QT_CPPFLAGS}])
dnl We need to link ISIS3RDPARTY against LAPACK because, on some systems,
dnl the ISIS compilation does not resolve certain BLAS symbols that its

0 comments on commit 46eeae8

Please sign in to comment.
Something went wrong with that request. Please try again.