Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2012-02-25 17:44:49 +0000
committerStijn Buys <ingar@osirion.org>2012-02-25 17:44:49 +0000
commit0934e5bc329c2b292110b1559c4114f9d1dbba9d (patch)
tree20538b7703cf9b1ecece11f52f38da074f498299
parent7ad671f5e58df320a5744c78a745206abf0d79de (diff)
The finetuning of ./configure parameters I forgot to commit in the previous revision.
-rw-r--r--configure.in24
1 files changed, 11 insertions, 13 deletions
diff --git a/configure.in b/configure.in
index 4ccee5c..9a24317 100644
--- a/configure.in
+++ b/configure.in
@@ -12,14 +12,13 @@ AM_INIT_AUTOMAKE
AC_PROG_CC
AC_PROG_CXX
-AC_MSG_CHECKING(QT4.1 directory)
-
dnl
dnl Qt installation prefix
dnl
+AC_MSG_CHECKING(Qt installation prefix)
QTDIR=xxx
AC_ARG_WITH([qt-prefix],
- AC_HELP_STRING([--with-qt-prefix=/path/to/Qt-4.8.0], [to specify the path to the Qt-4.8.0 installation prefix.]),
+ AC_HELP_STRING([--with-qt-prefix=], [to specify the path to the Qt-4.8.0 installation prefix.]),
[QTPATHS="$withval"],
[QTPATHS="/usr /usr/qt4 /opt/qt4"])
@@ -36,17 +35,23 @@ AC_MSG_RESULT($QTDIR)
dnl
dnl Qt includes directory
dnl
+AC_MSG_CHECKING(Qt includes directory)
+
AC_ARG_WITH([qt-includes],
- AC_HELP_STRING([--with-qt-includes=QTDIR/include], [to specify the path to directory containing the the Qt-4.8.0 includes.]),
+ AC_HELP_STRING([--with-qt-includes], [to specify the path to directory containing the the Qt-4.8.0 includes.]),
[QTINCLUDEDIR="$withval"],
[QTINCLUDEDIR="$QTDIR/include"])
+AC_MSG_RESULT($QTINCLUDEDIR)
+
dnl
dnl libraries directory
dnl
+AC_MSG_CHECKING(Qt libraries directory)
AC_ARG_WITH([qt-libraries],
- AC_HELP_STRING([--with-qt-libraries=QTDIR/lib], [to specify the path to directory containing the the Qt-4.8.0 libraries.]),
+ AC_HELP_STRING([--with-qt-libraries=], [to specify the path to directory containing the the Qt-4.8.0 libraries.]),
[QTLIBDIR="$withval"],
[QTLIBDIR="$QTDIR/lib"])
+AC_MSG_RESULT($QTLIBDIR)
host=`uname -a` # AC_CANONICAL_HOST is broken at the time of this writing.
case $host in
@@ -135,11 +140,4 @@ AC_MSG_RESULT(yes)
rm -f moc_myqt.cpp myqt.h myqt.cpp myqt.o myqt moc_myqt.o
AC_CONFIG_FILES(Makefile src/Makefile)
-AC_OUTPUT
-
-AC_MSG_RESULT([
-
-Qt prefix .................................. $QTDIR
-Qt includes ................................ $QTINCLUDEDIR
-Qt libraries ............................... $QTLIBDIR
-]) \ No newline at end of file
+AC_OUTPUT \ No newline at end of file