Added ./configure options for Qt include and library directories.

1 files changed, 36 insertions, 11 deletions

diff --git a/configure.in b/configure.in
index 6951f9b..4ccee5c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
-
-dnl configure.in for the Project::OSiRiON zon editor
+dnl
+dnl configure.in for the Project::OSiRiON world editor
 dnl
 dnl see also http://qtnode.net/wiki/Qt_with_autotools
 dnl
@@ -14,10 +14,12 @@ AC_PROG_CXX
 
 AC_MSG_CHECKING(QT4.1 directory)
 
+dnl
+dnl Qt installation prefix
+dnl
 QTDIR=xxx
-AC_ARG_WITH([qt-dir],
-             AC_HELP_STRING([--with-qt-dir=/path/to/Qt-4.1.0],
-                            [to specify the path to the Qt-4.1.0 directory.]),
+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.]),
              [QTPATHS="$withval"],
              [QTPATHS="/usr /usr/qt4 /opt/qt4"])
 
@@ -30,19 +32,35 @@ if test $QTDIR = xxx ; then
    AC_MSG_ERROR(Could not locate QT 4.1)
 fi
 AC_MSG_RESULT($QTDIR)
+
+dnl
+dnl Qt includes directory
+dnl
+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.]),
+             [QTINCLUDEDIR="$withval"],
+             [QTINCLUDEDIR="$QTDIR/include"])
+dnl
+dnl libraries directory
+dnl             
+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.]),
+             [QTLIBDIR="$withval"],
+             [QTLIBDIR="$QTDIR/lib"])
+
 host=`uname -a` # AC_CANONICAL_HOST is broken at the time of this writing.
 case $host in
   MINGW32*)
-    AC_MSG_NOTICE($host)
-    QTLIBS="-L$QTDIR/lib -lgdi32 -luser32 -lmingw32 -lqtmain -lQtGui4 -lQtCore4 -mthreads -Wl,-enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc -Wl,-s -Wl,-s -Wl,-subsystem,windows"
-    QTINC="-I$QTDIR/include -I$QTDIR/include/QtCore -I$QTDIR/include/QtGui -DUNICODE -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DQT_NEEDS_QMAIN -frtti -fexceptions"
+    AC_MSG_NOTICE(win32)
+    QTLIBS="-L$QTLIBDIR -lgdi32 -luser32 -lmingw32 -lqtmain -lQtGui4 -lQtCore4 -mthreads -Wl,-enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc -Wl,-s -Wl,-s -Wl,-subsystem,windows"
+    QTINC="-I$QTINCLUDEDIR -I$QTINCLUDEDIR/QtCore -I$QTINCLUDEDIR/include/QtGui -DUNICODE -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DQT_NEEDS_QMAIN -frtti -fexceptions"
     QTBIN="$QTDIR/bin"
     ;;
   *)
-    AC_MSG_NOTICE($host)
+    AC_MSG_NOTICE(generic UNIX)
     AC_PATH_XTRA
-    QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtCore -lpthread"
-    QTINC="-I$QTDIR/include -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore $X_CFLAGS -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED"
+    QTINC="-I$QTINCLUDEDIR -I$QTINCLUDEDIR/QtGui -I$QTINCLUDEDIR/QtCore $X_CFLAGS -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED"
+    QTLIBS="-Wl,-rpath,QTLIBDIR -L$QTLIBDIR -lQtGui -lQtCore -lpthread"
     QTBIN="$QTDIR/bin"
     ;;
 esac
@@ -118,3 +136,10 @@ 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