From 8ed5d7baae51c94fc10f6088fc5c5da9e9fed79a Mon Sep 17 00:00:00 2001
From: telwertowski <telwertowski@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Wed, 13 Apr 2005 07:16:57 +0000
Subject: [PATCH] Add HAVE_QTMAC conditional to configure. Use it to suppress
 compile-time paths which cause errors when building with Qt/Mac which obtains
 paths from qApp->applicationDirPath() at runtime.

git-svn-id: http://svn.osgeo.org/qgis/trunk@3142 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 configure.in                           | 2 ++
 plugins/grass/Makefile.am              | 2 ++
 plugins/grid_maker/Makefile.am         | 2 ++
 plugins/grid_maker/main.cpp            | 4 ++++
 plugins/north_arrow/Makefile.am        | 2 ++
 src/Makefile.am                        | 6 ++++++
 widgets/projectionselector/Makefile.am | 2 ++
 7 files changed, 20 insertions(+)

diff --git a/configure.in b/configure.in
index 531f977a351..7cdf3c57fa3 100644
--- a/configure.in
+++ b/configure.in
@@ -83,6 +83,8 @@ dnl Qt check
 dnl ---------------------------------------------------------------------------
 AQ_CHECK_QT
 
+AM_CONDITIONAL([HAVE_QTMAC], [test x$QTDIR != x -a -f "$QTDIR/config.tests/mac/tst_mac_version"])
+
 
 dnl ---------------------------------------------------------------------------
 dnl GDAL/OGR
diff --git a/plugins/grass/Makefile.am b/plugins/grass/Makefile.am
index f77cc78a0d9..c6dde7834e7 100644
--- a/plugins/grass/Makefile.am
+++ b/plugins/grass/Makefile.am
@@ -15,7 +15,9 @@ SUBDIRS = config modules themes
 INCLUDES = -I../../src
 
 DEFS=-DGRASS_BASE=\"$(GRASS_BASE)\"
+if !HAVE_QTMAC
 PREFIX=-DPREFIX=\"$(prefix)\"
+endif
 
 plugindir = ${pkglibdir}
 
diff --git a/plugins/grid_maker/Makefile.am b/plugins/grid_maker/Makefile.am
index 57705e13a73..1949a607575 100644
--- a/plugins/grid_maker/Makefile.am
+++ b/plugins/grid_maker/Makefile.am
@@ -10,7 +10,9 @@
 #
 # $Id$
 
+if !HAVE_QTMAC
 PKGDATAPATH=-DPKGDATAPATH=\"$(pkgdatadir)\"
+endif
 
 plugindir = ${pkglibdir}
 
diff --git a/plugins/grid_maker/main.cpp b/plugins/grid_maker/main.cpp
index 045f0a2a358..b1945838ff7 100644
--- a/plugins/grid_maker/main.cpp
+++ b/plugins/grid_maker/main.cpp
@@ -13,6 +13,10 @@ int main(int argc, char *argv[])
 {
   QApplication a(argc, argv);
 
+#if defined(Q_OS_MACX) || defined(WIN32)
+  QString PKGDATAPATH = qApp->applicationDirPath() + "/share/qgis";
+#endif
+
   /* Load translationfile */
   QTranslator tor(0);
   tor.load(QString("qgis_") + QTextCodec::locale(), QString(PKGDATAPATH) + "/i18n");
diff --git a/plugins/north_arrow/Makefile.am b/plugins/north_arrow/Makefile.am
index 2ac949fbb6b..a19fe9a1fe3 100644
--- a/plugins/north_arrow/Makefile.am
+++ b/plugins/north_arrow/Makefile.am
@@ -11,7 +11,9 @@
 # $Id$
 
 plugindir = ${pkglibdir}
+if !HAVE_QTMAC
 PKGDATAPATH=-DPKGDATAPATH=\"$(pkgdatadir)\"
+endif
 #NorthArrow below to be replaced with the name of the plugin
 plugin_LTLIBRARIES = northarrowplugin.la
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 15d5ebc8052..65dee5d67ff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,9 +10,11 @@
 
 SUBDIRS = svg images themes resources
 
+if !HAVE_QTMAC
 PREFIX=-DPREFIX=\"$(prefix)\"
 PLUGINPATH=-DPLUGINPATH=\"$(pkglibdir)\"
 PKGDATAPATH=-DPKGDATAPATH=\"$(pkgdatadir)\"
+endif
 WIDGETPATH=../widgets
 %.moc.cpp: %.h
 	$(MOC) -o $@ $<
@@ -430,7 +432,11 @@ BUILT_SOURCES = $(qgis_MOC) $(qgis_UIMOC) $(qgis_UIHEADERS) $(qgis_UISOURCES) \
 
 
 qgis_LDADD = $(LDADD) $(QT_LDADD) $(GDAL_LDADD) $(PG_LIB) $(GEOS_LDADD) -lproj -lsqlite3 libqgis.la
+if HAVE_QTMAC
+qgis_LDFLAGS = -framework ApplicationServices
+else
 qgis_LDFLAGS = -rdynamic
+endif
 qgis_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) -I$(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) -I../widgets/projectionselector/
 
 libqgis_la_SOURCES =				\
diff --git a/widgets/projectionselector/Makefile.am b/widgets/projectionselector/Makefile.am
index 25cf47a7e0e..e1f76a0a723 100644
--- a/widgets/projectionselector/Makefile.am
+++ b/widgets/projectionselector/Makefile.am
@@ -11,7 +11,9 @@
 # $Id$
 
 plugindir = ${pkglibdir}
+if !HAVE_QTMAC
 PKGDATAPATH=-DPKGDATAPATH=\"$(pkgdatadir)\"
+endif
 
 
 %.moc.cpp: %.h