1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
freebsd-ports/devel/qtez/files/patch-ad
Ade Lovett 34e2748f25 Unbreak for Qt-2.2.0, fix plist
PR:		21574
Submitted by:	Ports Fury
2000-10-13 20:19:52 +00:00

50 lines
1.5 KiB
Plaintext

--- configure.in.orig Tue Jul 18 16:43:22 2000
+++ configure.in Tue Sep 26 00:47:45 2000
@@ -48,15 +48,15 @@
if test "$enableval" = "yes"; then \
DEBUG="-g -DDEBUG -W -Wall"; \
else
- DEBUG="-O2 -DNO_DEBUG -DNO_CHECK"; \
+ DEBUG="-DNO_DEBUG -DNO_CHECK"; \
fi,
enableval=no
-DEBUG="-O2 -DNO_DEBUG -DNO_CHECK")
+DEBUG="-DNO_DEBUG -DNO_CHECK")
AC_MSG_RESULT($enableval)
AC_SUBST(DEBUG)
AC_MSG_CHECKING(for Qt >= 2.1.0)
-if ! test -r $QTDIR/include/qinputdialog.h; then
+if ! test -r $QTDIR/include/qt2/qinputdialog.h; then
AC_MSG_ERROR([ Sorry, but you need Qt version 2.1.0 or higher to compile $PACKAGE])
else
AC_MSG_RESULT(yes)
@@ -64,12 +64,12 @@
AC_PATH_X
qtdir=${QTDIR}
-qt_includes=$qtdir/include
+qt_includes=$qtdir/include/qt2
qt_libraries=$qtdir/lib
qt_moc=$qtdir/bin
QT_LDFLAGS=-L$qt_libraries
LDFLAGS="$LDFLAGS -L$qt_libraries"
-AC_CHECK_LIB(qt, main,,AC_MSG_ERROR(Cannot find required library Qt.))
+AC_CHECK_LIB(qt2, main,,AC_MSG_ERROR(Cannot find required library Qt.))
AC_SUBST(qt_includes)
AC_SUBST(qt_libraries)
AC_SUBST(QT_LDFLAGS)
@@ -78,12 +78,6 @@
dnl !!!!! fix it !!!!!
all_includes=-I$qt_includes
AC_SUBST(all_includes)
-
-dnl @iko : inject msg2qm real path, as if it may be installed in other catalog ^)
-AC_PATH_PROG(MSG2QM,msg2qm,,$bindir:$QTDIR/bin)
-if test "$MSG2QM" = ""; then
- AC_MSG_ERROR([ Sorry, but you need msg2qm (Qt2 program) to compile $PACKAGE])
-fi
dnl *** check QTEZ environment variable ***
AC_MSG_CHECKING(for QTEZ variable)