Attachment #86352 for bug #132556




        wv_cv_with_qt=no
        CPPFLAGS_save="$CPPFLAGS"
        LDFLAGS_save="$LDFLAGS"
        LIBS_save="$LIBS"
        for wv_qtdir in $with_qt $QTDIR $QT_SEARCH_PATH; do
            eval wv_qtdir="$wv_qtdir"
            CPPFLAGS="$CPPFLAGS_save -I$wv_qtdir/include -I$wv_qtdir/include/qt3"
            LDFLAGS="$LDFLAGS_save -L$wv_qtdir/lib"
            LIBS="$LIBS_save -lqt-mt"
            AC_TRY_LINK([#include <qstring.h>],
                        [QString x("hello"); return 0; ],
                        [wv_cv_with_qt=$wv_qtdir; break])
        done
        CPPFLAGS="$CPPFLAGS_save"
        LDFLAGS="$LDFLAGS_save"
        LIBS="$LIBS_save"
    ])
    with_qt=$wv_cv_with_qt
    if test "$with_qt" != no; then

Lines 272-278 Link Here

(-)wvstreams-4.2.2/wvrules.mk.orig (-1 / +1 lines)
272	%.so: SONAME=$@$(if $(SO_VERSION),.$(SO_VERSION))	272	%.so: SONAME=$@$(if $(SO_VERSION),.$(SO_VERSION))
273	wvsoname=$(if $($1-SONAME),$($1-SONAME),$(if $(SONAME),$(SONAME),$1))	273	wvsoname=$(if $($1-SONAME),$($1-SONAME),$(if $(SONAME),$(SONAME),$1))
274	define wvlink_so	274	define wvlink_so
275	$(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -Wl,-soname,$(call wvsoname,$1) -shared -o $1 $(filter %.o %.a %.so,$2) $($1-LIBS) $(LIBS) $(XX_LIBS)	275	$(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -Wl,-soname,$(call wvsoname,$1) -shared -o $1 $(filter %.o %.a,$2) $(filter %.so,$2) $($1-LIBS) $(LIBS) $(XX_LIBS)
276	$(if $(filter-out $(call wvsoname,$1),$1),$(call wvlns,$1,$(call wvsoname,$1)))	276	$(if $(filter-out $(call wvsoname,$1),$1),$(call wvlns,$1,$(call wvsoname,$1)))
277	endef	277	endef
278		278

Return to bug 132556

Lines 517-532 Link Here

(-)wvstreams-4.2.2/configure.ac.orig (-1 / +4 lines)
517	wv_cv_with_qt=no	517	wv_cv_with_qt=no
518	CPPFLAGS_save="$CPPFLAGS"	518	CPPFLAGS_save="$CPPFLAGS"
519	LDFLAGS_save="$LDFLAGS"	519	LDFLAGS_save="$LDFLAGS"
		520	LIBS_save="$LIBS"
520	for wv_qtdir in $with_qt $QTDIR $QT_SEARCH_PATH; do	521	for wv_qtdir in $with_qt $QTDIR $QT_SEARCH_PATH; do
521	eval wv_qtdir="$wv_qtdir"	522	eval wv_qtdir="$wv_qtdir"
522	CPPFLAGS="$CPPFLAGS_save -I$wv_qtdir/include -I$wv_qtdir/include/qt3"	523	CPPFLAGS="$CPPFLAGS_save -I$wv_qtdir/include -I$wv_qtdir/include/qt3"
523	LDFLAGS="$LDFLAGS_save -L$wv_qtdir/lib -lqt-mt"	524	LDFLAGS="$LDFLAGS_save -L$wv_qtdir/lib"
		525	LIBS="$LIBS_save -lqt-mt"
524	AC_TRY_LINK([#include <qstring.h>],	526	AC_TRY_LINK([#include <qstring.h>],
525	[QString x("hello"); return 0; ],	527	[QString x("hello"); return 0; ],
526	[wv_cv_with_qt=$wv_qtdir; break])	528	[wv_cv_with_qt=$wv_qtdir; break])
527	done	529	done
528	CPPFLAGS="$CPPFLAGS_save"	530	CPPFLAGS="$CPPFLAGS_save"
529	LDFLAGS="$LDFLAGS_save"	531	LDFLAGS="$LDFLAGS_save"
		532	LIBS="$LIBS_save"
530	])	533	])
531	with_qt=$wv_cv_with_qt	534	with_qt=$wv_cv_with_qt
532	if test "$with_qt" != no; then	535	if test "$with_qt" != no; then