Changeset 12833

Timestamp:

02/03/12 12:46:03 (13 years ago)

Author:

tbretz

Message:

Added QtSql

File:

• trunk/FACT++/.macro_dir/qt4_do_it_all.m4 (modified) (3 diffs)

trunk/FACT++/.macro_dir/qt4_do_it_all.m4

@@ -38 +38 @@
                 done
                 qt4_cv_libname=
-                for libname in '-lQtCore -lQtGui' \
-                               '-lQtCore4 -lQtGui4' \
-                               '-framework QtCore -framework QtGui'
+                for libname in '-lQtCore -lQtGui -lQtSql' \
+                               '-lQtCore4 -lQtGui4 -lQtSql4' \
+                               '-framework QtCore -framework QtGui -framework QtSql'
                 do
                         QT4_TRY_LINK($libname)
@@ -155 +155 @@
                 AC_SUBST(QT4_CORE_LIB)
         fi
-        PKG_CHECK_MODULES(QT4_FRONTEND, QtCore QtGui,,[:])
+        PKG_CHECK_MODULES(QT4_FRONTEND, QtCore QtGui QtSql,,[:])
         if test "$pkg_failed" = "no" ; then
                 QT4_INCLUDES=$QT4_FRONTEND_CFLAGS
                 dnl QT4_LDFLAGS=$QT4_FRONTEND_LIBS
-                QT4_LDFLAGS=`$PKG_CONFIG --libs-only-L QtCore QtGui`
+                QT4_LDFLAGS=`$PKG_CONFIG --libs-only-L QtCore QtGui QtSql`
                 AC_SUBST(QT4_INCLUDES)
                 AC_SUBST(QT4_LDFLAGS)
                 QT4_VERSION=`$PKG_CONFIG --modversion QtCore`
                 AC_SUBST(QT4_VERSION)
-                QT4_LIB=`$PKG_CONFIG --libs-only-l QtCore QtGui`
+                QT4_LIB=`$PKG_CONFIG --libs-only-l QtCore QtGui QtSql`
                 AC_SUBST(QT4_LIB)
-                LIBS="$LIBS `$PKG_CONFIG --libs-only-other QtCore QtGui`"
-        fi
-        PKG_CONFIG_PATH=$save_PKG_CONFIG_PATH
+                LIBS="$LIBS `$PKG_CONFIG --libs-only-other QtCore QtGui QtSql`"
+        fi
 ])
 
@@ -190 +189 @@
         if test -n "$qt4_cv_includes"; then
                 QT4_INCLUDES="-I$qt4_cv_includes"
-                for i in Qt QtCore QtGui; do
+                for i in Qt QtCore QtGui QtSql; do
                         QT4_INCLUDES="$QT4_INCLUDES -I$qt4_cv_includes/$i"
                 done