Attachment #1101 for bug #943

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 943
Collapse All | Expand All




if test "$buildnpp" = "yes"; then
    if test "$PKGCONFIGFOUND" = "yes" ; then
        DBUS_REQ=1.0.0
        PKG_CHECK_MODULES(DBUS, [ dbus-tqt dbus-1 >= $DBUS_REQ ],
                          have_dbus=yes,have_dbus=no)
        if test "x$have_dbus" = "xyes"; then
            have_nspr=yes
            AC_DEFINE(HAVE_DBUS, 1, [have DBus])
            LIBQTDBUS="`$PKG_CONFIG --libs dbus-tqt`"
            LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-tqt`"
            AC_DEFINE(HAVE_NSPR, 1, [build Netscape plugin loader])
            LIBNSPR_LIBS="`$PKG_CONFIG --libs gtk+-x11-2.0` `$PKG_CONFIG --libs dbus-glib-1` `$PKG_CONFIG --libs gthread-2.0`"
            LIBNSPR_CFLAGS="`$PKG_CONFIG --cflags gtk+-x11-2.0` `$PKG_CONFIG --cflags dbus-glib-1`"




if test "$buildnpp" = "yes"; then
    if test "$PKGCONFIGFOUND" = "yes" ; then
        DBUS_REQ=1.0.0
        PKG_CHECK_MODULES(DBUS, [dbus-tqt dbus-1 >= $DBUS_REQ],
                          have_dbus=yes,have_dbus=no)
        if test "x$have_dbus" = "xyes"; then
            have_nspr=yes
            AC_DEFINE(HAVE_DBUS, 1, [have DBus])
            LIBQTDBUS="`$PKG_CONFIG --libs dbus-tqt`"
            LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-tqt`"
            AC_DEFINE(HAVE_NSPR, 1, [build Netscape plugin loader])
            LIBNSPR_LIBS="`$PKG_CONFIG --libs gtk+-x11-2.0` `$PKG_CONFIG --libs dbus-glib-1` `$PKG_CONFIG --libs gthread-2.0`"
            LIBNSPR_CFLAGS="`$PKG_CONFIG --cflags gtk+-x11-2.0` `$PKG_CONFIG --cflags dbus-glib-1`"

Return to bug 943

Lines 243-255 AC_ARG_ENABLE(nspr, [ --enable-npplayer Enables building with npp support], Link Here

(-)a/configure.in (-3 / +3 lines)
243	if test "$buildnpp" = "yes"; then	243	if test "$buildnpp" = "yes"; then
244	if test "$PKGCONFIGFOUND" = "yes" ; then	244	if test "$PKGCONFIGFOUND" = "yes" ; then
245	DBUS_REQ=1.0.0	245	DBUS_REQ=1.0.0
246	PKG_CHECK_MODULES(DBUS, dbus-1 >= $DBUS_REQ,	246	PKG_CHECK_MODULES(DBUS, [ dbus-tqt dbus-1 >= $DBUS_REQ ],
247	have_dbus=yes,have_dbus=no)	247	have_dbus=yes,have_dbus=no)
248	if test "x$have_dbus" = "xyes"; then	248	if test "x$have_dbus" = "xyes"; then
249	have_nspr=yes	249	have_nspr=yes
250	AC_DEFINE(HAVE_DBUS, 1, [have DBus])	250	AC_DEFINE(HAVE_DBUS, 1, [have DBus])
251	LIBQTDBUS="`$PKG_CONFIG --libs dbus-1` -ldbus-tqt-1"	251	LIBQTDBUS="`$PKG_CONFIG --libs dbus-tqt`"
252	LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-1`"	252	LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-tqt`"
253	AC_DEFINE(HAVE_NSPR, 1, [build Netscape plugin loader])	253	AC_DEFINE(HAVE_NSPR, 1, [build Netscape plugin loader])
254	LIBNSPR_LIBS="`$PKG_CONFIG --libs gtk+-x11-2.0` `$PKG_CONFIG --libs dbus-glib-1` `$PKG_CONFIG --libs gthread-2.0`"	254	LIBNSPR_LIBS="`$PKG_CONFIG --libs gtk+-x11-2.0` `$PKG_CONFIG --libs dbus-glib-1` `$PKG_CONFIG --libs gthread-2.0`"
255	LIBNSPR_CFLAGS="`$PKG_CONFIG --cflags gtk+-x11-2.0` `$PKG_CONFIG --cflags dbus-glib-1`"	255	LIBNSPR_CFLAGS="`$PKG_CONFIG --cflags gtk+-x11-2.0` `$PKG_CONFIG --cflags dbus-glib-1`"

Lines 177-189 AC_ARG_ENABLE(nspr, [ --enable-npplayer Enables building with npp support], Link Here

(-)a/configure.in.in (-3 / +3 lines)
177	if test "$buildnpp" = "yes"; then	177	if test "$buildnpp" = "yes"; then
178	if test "$PKGCONFIGFOUND" = "yes" ; then	178	if test "$PKGCONFIGFOUND" = "yes" ; then
179	DBUS_REQ=1.0.0	179	DBUS_REQ=1.0.0
180	PKG_CHECK_MODULES(DBUS, dbus-1 >= $DBUS_REQ,	180	PKG_CHECK_MODULES(DBUS, [dbus-tqt dbus-1 >= $DBUS_REQ],
181	have_dbus=yes,have_dbus=no)	181	have_dbus=yes,have_dbus=no)
182	if test "x$have_dbus" = "xyes"; then	182	if test "x$have_dbus" = "xyes"; then
183	have_nspr=yes	183	have_nspr=yes
184	AC_DEFINE(HAVE_DBUS, 1, [have DBus])	184	AC_DEFINE(HAVE_DBUS, 1, [have DBus])
185	LIBQTDBUS="`$PKG_CONFIG --libs dbus-1` -ldbus-tqt-1"	185	LIBQTDBUS="`$PKG_CONFIG --libs dbus-tqt`"
186	LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-1`"	186	LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-tqt`"
187	AC_DEFINE(HAVE_NSPR, 1, [build Netscape plugin loader])	187	AC_DEFINE(HAVE_NSPR, 1, [build Netscape plugin loader])
188	LIBNSPR_LIBS="`$PKG_CONFIG --libs gtk+-x11-2.0` `$PKG_CONFIG --libs dbus-glib-1` `$PKG_CONFIG --libs gthread-2.0`"	188	LIBNSPR_LIBS="`$PKG_CONFIG --libs gtk+-x11-2.0` `$PKG_CONFIG --libs dbus-glib-1` `$PKG_CONFIG --libs gthread-2.0`"
189	LIBNSPR_CFLAGS="`$PKG_CONFIG --cflags gtk+-x11-2.0` `$PKG_CONFIG --cflags dbus-glib-1`"	189	LIBNSPR_CFLAGS="`$PKG_CONFIG --cflags gtk+-x11-2.0` `$PKG_CONFIG --cflags dbus-glib-1`"