Author: durner
Date: 2006-07-23 03:36:41 -0700 (Sun, 23 Jul 2006)
New Revision: 3125
Modified:
gnunet-qt/configure.ac
gnunet-qt/src/common/common.pro.in
gnunet-qt/src/core/core.pro.in
Log:
trying to get include path right
Modified: gnunet-qt/configure.ac
===================================================================
--- gnunet-qt/configure.ac 2006-07-19 00:36:44 UTC (rev 3124)
+++ gnunet-qt/configure.ac 2006-07-23 10:36:41 UTC (rev 3125)
@@ -58,6 +58,7 @@
*)
LDFLAGS="-L$with_gnunet/lib $LDFLAGS"
CPPFLAGS="-I$with_gnunet/include $CPPFLAGS"
+ INCLUDEPATH="$with_gnunet/include $INCLUDEPATH"
AC_CHECK_HEADERS(GNUnet/gnunet_util.h,
AC_CHECK_LIB([gnunetutil], [initUtil],
EXT_LIB_PATH="-L$with_gnunet/lib $EXT_LIB_PATH"
@@ -104,6 +105,7 @@
;;
*)
CPPFLAGS="-I$with_extractor/include $CPPFLAGS"
+ INCLUDEPATH="$with_extractor/include $INCLUDEPATH"
AC_CHECK_HEADERS(extractor.h,extractor=1)
;;
esac
@@ -175,6 +177,7 @@
AC_SUBST(LIBPREFIX)
AC_SUBST(QT_CONFIG)
+AC_SUBST(INCLUDEPATH)
AC_CONFIG_COMMANDS([qmake], [MINGW_IN_SHELL=1 qmake -unix -recursive])
Modified: gnunet-qt/src/common/common.pro.in
===================================================================
--- gnunet-qt/src/common/common.pro.in 2006-07-19 00:36:44 UTC (rev 3124)
+++ gnunet-qt/src/common/common.pro.in 2006-07-23 10:36:41 UTC (rev 3125)
@@ -5,7 +5,7 @@
DLLDESTDIR = .
QMAKE_LFLAGS += -shared
-INCLUDEPATH = ../include
+INCLUDEPATH = ../include @INCLUDEPATH@
target.path = @prefix@/bin
INSTALLS += target
Modified: gnunet-qt/src/core/core.pro.in
===================================================================
--- gnunet-qt/src/core/core.pro.in 2006-07-19 00:36:44 UTC (rev 3124)
+++ gnunet-qt/src/core/core.pro.in 2006-07-23 10:36:41 UTC (rev 3125)
@@ -3,7 +3,7 @@
CONFIG += @QT_CONFIG@
DESTDIR = .
DEPENDPATH += .
-INCLUDEPATH += ../include @top_builddir@ .
+INCLUDEPATH += ../include @top_builddir@ @INCLUDEPATH@ .
LIBS += -L../common/ -lgnunetqt_common -lgnunetutil
target.path = @prefix@/bin
_______________________________________________
GNUnet-SVN mailing list
GNUnet-SVN@gnu.org
http://lists.gnu.org/mailman/listinfo/gnunet-svn
