Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 584892 | Differences between
and this patch

Collapse All | Expand All

(-)libreoffice-5.1.2.2/configure.ac.old (-1 / +7 lines)
Lines 11169-11174 Link Here
11169
    if test "x$kde_incdir" = "xno"; then
11169
    if test "x$kde_incdir" = "xno"; then
11170
        AC_MSG_ERROR([KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
11170
        AC_MSG_ERROR([KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
11171
    fi
11171
    fi
11172
    if test "$kde_incdir" = "/usr/include"; then kde_incdir=; fi
11172
11173
11173
    dnl Check for KDE4 libraries
11174
    dnl Check for KDE4 libraries
11174
    AC_MSG_CHECKING([for KDE4 libraries])
11175
    AC_MSG_CHECKING([for KDE4 libraries])
Lines 11186-11192 Link Here
11186
    fi
11187
    fi
11187
11188
11188
    PKG_CHECK_MODULES([QT4],[QtNetwork QtGui])
11189
    PKG_CHECK_MODULES([QT4],[QtNetwork QtGui])
11189
    KDE4_CFLAGS="-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
11190
    if ! test -z "$kde_incdir"; then
11191
    	KDE4_CFLAGS="-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
11192
    else
11193
    	KDE4_CFLAGS="$QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
11194
    fi
11195
11190
    KDE4_LIBS="-L$kde_libdir -lkio -lkfile -lkdeui -lkdecore -L$qt_lib_dir $QT4_LIBS"
11196
    KDE4_LIBS="-L$kde_libdir -lkio -lkfile -lkdeui -lkdecore -L$qt_lib_dir $QT4_LIBS"
11191
    KDE4_CFLAGS=$(printf '%s' "$KDE4_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
11197
    KDE4_CFLAGS=$(printf '%s' "$KDE4_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
11192
    FilterLibs "$KDE4_LIBS"
11198
    FilterLibs "$KDE4_LIBS"
(-)libreoffice-5.1.2.2/configure.old (-1 / +7 lines)
Lines 38441-38446 Link Here
38441
    if test "x$kde_incdir" = "xno"; then
38441
    if test "x$kde_incdir" = "xno"; then
38442
        as_fn_error $? "KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." "$LINENO" 5
38442
        as_fn_error $? "KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." "$LINENO" 5
38443
    fi
38443
    fi
38444
    if test "$kde_incdir" = "/usr/include"; then kde_incdir=; fi
38444
38445
38445
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KDE4 libraries" >&5
38446
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KDE4 libraries" >&5
38446
$as_echo_n "checking for KDE4 libraries... " >&6; }
38447
$as_echo_n "checking for KDE4 libraries... " >&6; }
Lines 38549-38555 Link Here
38549
$as_echo "yes" >&6; }
38550
$as_echo "yes" >&6; }
38550
38551
38551
fi
38552
fi
38552
    KDE4_CFLAGS="-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
38553
    if ! test -z "$kde_incdir"; then
38554
    	KDE4_CFLAGS="-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
38555
    else
38556
    	KDE4_CFLAGS="$QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
38557
    fi
38558
38553
    KDE4_LIBS="-L$kde_libdir -lkio -lkfile -lkdeui -lkdecore -L$qt_lib_dir $QT4_LIBS"
38559
    KDE4_LIBS="-L$kde_libdir -lkio -lkfile -lkdeui -lkdecore -L$qt_lib_dir $QT4_LIBS"
38554
    KDE4_CFLAGS=$(printf '%s' "$KDE4_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
38560
    KDE4_CFLAGS=$(printf '%s' "$KDE4_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
38555
    FilterLibs "$KDE4_LIBS"
38561
    FilterLibs "$KDE4_LIBS"

Return to bug 584892