Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

make kakadu optional, and change arbitrary_qt handling

  • Loading branch information...
commit 0d57a7a533122e747f494d79b714285f67892c35 1 parent 3a2c386
@novas0x2a novas0x2a authored
Showing with 13 additions and 9 deletions.
  1. +9 −8 configure.ac
  2. +4 −1 m4/ax_pkg.m4
View
17 configure.ac
@@ -254,12 +254,11 @@ AX_PKG_ONE_OF(QT,
HAVE_PKG_ARBITRARY_QT="no:Set \$QT_ARBITRARY_MODULES"
else
for module in $QT_ARBITRARY_MODULES; do
- PKG_ARBITRARY_QT_NEEDED_HEADERS="$PKG_ARBITRARY_QT_NEEDED_HEADERS Qt${module}"
- PKG_ARBITRARY_QT_LIBS="-lQt${module} $PKG_ARBITRARY_QT_LIBS"
+ PKG_ARBITRARY_QT_NEEDED_HEADERS="$PKG_ARBITRARY_QT_NEEDED_HEADERS ${module}"
done
- fi
- PKG_ARBITRARY_QT_CPPFLAGS="$PKG_ARBITRARY_QT_CPPFLAGS -DQT_SHARED"
- AX_PKG(ARBITRARY_QT, [], [-lQtCore], [$PKG_ARBITRARY_QT_NEEDED_HEADERS])],
+ PKG_ARBITRARY_QT_CPPFLAGS="$PKG_ARBITRARY_QT_CPPFLAGS -DQT_SHARED"
+ AX_PKG(ARBITRARY_QT, [], [], [$PKG_ARBITRARY_QT_NEEDED_HEADERS])
+ fi],
APPLE_QMAKE_QT, [AX_PKG_APPLE(QMAKE_QT, [GL QT_QMAKE], [])],
LINUX_QMAKE_QT,
[AX_PKG(QT_QMAKE_OPENGL, [QT_QMAKE], [], [QtOpenGL])
@@ -298,9 +297,11 @@ AX_PKG_ONE_OF(KAKADU,
KAKADU_SPLIT, [AX_PKG(KAKADU_SPLIT, [], [-lkdu -lkdu_apps])],
KAKADU_63_JOIN, [AX_PKG(KAKADU_63_JOIN, [], [-lkdu_a63R])])
-AX_PKG_ONE_OF(ISIS3RDPARTY,
- APPLE_ISIS3RDPARTY, [AX_PKG_APPLE(ISIS3RDPARTY, [LAPACK GSL QWT GEOS SPICE XERCESC KAKADU])],
- LINUX_ISIS3RDPARTY, [AX_PKG(LINUX_ISIS3RDPARTY, [LAPACK GSL QWT GEOS SPICE XERCESC KAKADU SUPERLU])])
+if test x"$host_vendor" = "xapple"; then
+ AX_PKG(ISIS3RDPARTY, [LAPACK GSL QWT GEOS SPICE XERCESC], [],[],[],[],[],[KAKADU])
+else
+ AX_PKG(ISIS3RDPARTY, [LAPACK GSL QWT GEOS SPICE XERCESC SUPERLU],[],[],[],[],[],[KAKADU])
+fi
AX_PKG(ISIS, [ISIS3RDPARTY QT], [-lisis3], [SpecialPixel.h])
View
5 m4/ax_pkg.m4
@@ -7,7 +7,7 @@ dnl __END_LICENSE__
m4_ifdef([_AX_FIXUPS], [], [m4_include([m4/fixups.m4])])
-dnl Usage: AX_PKG(<name>, <dependencies>, <libraries>, <headers>[, <relative include path>, <relative lib path>, <required-functions>])
+dnl Usage: AX_PKG(<name>, <dependencies>, <libraries>, <headers>[, <relative include path>, <relative lib path>, <required-functions>, <optional-deps>])
AC_DEFUN([AX_PKG],
[
@@ -61,6 +61,9 @@ AC_DEFUN([AX_PKG],
AS_IF([test -n "$missing"], [AC_MSG_RESULT([no ([missing] $missing)]); HAVE_PKG_$1=no])
AS_VAR_POPDEF([missing])
+ dnl load some optional deps
+ AX_LOAD_DEPS([$1], [$8])
+
if test "x$HAVE_PKG_$1" = "xno" ; then
# printed the result already
:
Please sign in to comment.
Something went wrong with that request. Please try again.