diff options
Diffstat (limited to 'libreoffice/build/libreoffice.SlackBuild')
| -rwxr-xr-x | libreoffice/build/libreoffice.SlackBuild | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild index f6153802..6b1e478a 100755 --- a/libreoffice/build/libreoffice.SlackBuild +++ b/libreoffice/build/libreoffice.SlackBuild @@ -326,19 +326,6 @@ else COMPR="xz" fi -# Causes a lot of trouble otherwise: -if ! which gpgme-config 1>/dev/null 2>/dev/null ; then - GPGMEOPTS="--without-system-gpgmepp" -elif [ $(gpgme-config --version |cut -d. -f1) -eq 1 -a $(gpgme-config --version |cut -d. -f2) -lt 9 ]; then - # gpgme < 1.9.0 so don't use the system libs: - GPGMEOPTS="--without-system-gpgmepp" -elif [ "$ARCH" = "x86_64" ]; then - echo "Using system gpgme" - GPGMEOPTS="--with-system-gpgmepp" -else - GPGMEOPTS="--without-system-gpgmepp" -fi - DOCS="AUTHORS COPYING* MAINTAINERS NEWS README* TODO" PACKAGER="Eric Hameleers" @@ -1172,6 +1159,19 @@ else GSTOPTS="--enable-gstreamer-0-10 --disable-gstreamer-1-0" fi +# Causes a lot of trouble otherwise: +if ! which gpgme-config 1>/dev/null 2>/dev/null ; then + GPGMEOPTS="--without-system-gpgmepp" +elif [ $(gpgme-config --version |cut -d. -f1) -eq 1 -a $(gpgme-config --version |cut -d. -f2) -lt 9 ]; then + # gpgme < 1.9.0 so don't use the system libs: + GPGMEOPTS="--without-system-gpgmepp" +elif [ "$ARCH" = "x86_64" ]; then + echo "Using system gpgme" + GPGMEOPTS="--with-system-gpgmepp" +else + GPGMEOPTS="--without-system-gpgmepp" +fi + # Make it install into proper directories: export OOInBase="/usr/lib${LIBDIRSUFFIX}/libreoffice" export OOInstall="/usr/lib${LIBDIRSUFFIX}/libreoffice" |