Don't explicetly include tqt.h anymore

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/26/head
Michele Calgaro 4 weeks ago
parent c927d0a1ce
commit 31fd50fb44
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -1558,14 +1558,11 @@ AC_DEFUN([AC_SS_FIND_QT3_INCLUDE_DIR],
AC_SS_SET_NORMALINK AC_SS_SET_NORMALINK
AC_MSG_ERROR([This was a fatal one...aborting]) AC_MSG_ERROR([This was a fatal one...aborting])
else else
SS_QT3_INCDIR="$SS_QT3_INCDIR -I/usr/include/tqt -include tqt.h"
AC_MSG_RESULT([found in $SS_QT3_INCDIR]) AC_MSG_RESULT([found in $SS_QT3_INCDIR])
fi fi
else else
AC_MSG_RESULT([using user supplied path for the TQt 3.x include files $SS_QT3_INCDIR]) AC_MSG_RESULT([using user supplied path for the TQt 3.x include files $SS_QT3_INCDIR])
SS_QT3_INCDIR="$SS_QT3_INCDIR -I/usr/include/tqt -include tqt.h"
fi fi
]) ])
@ -1719,7 +1716,7 @@ AC_DEFUN([AC_SS_ENSURE_CAN_COMPILE_X_AND_QT3],
CPPFLAGS="" CPPFLAGS=""
fi fi
CPPFLAGS="$CPPFLAGS -I$SS_QT3_INCDIR" CPPFLAGS="$CPPFLAGS -I$SS_QT3_INCDIR"
CXXFLAGS="-O2 -Wall -I/usr/include/tqt -include tqt.h $CXXFLAGS" CXXFLAGS="-O2 -Wall $CXXFLAGS"
if test -n "$SS_X_LIBDIR"; then if test -n "$SS_X_LIBDIR"; then
LIBS="-L$SS_X_LIBDIR" LIBS="-L$SS_X_LIBDIR"
else else

Loading…
Cancel
Save