diff options
| author | Kacper Kasper <kacperkasper@gmail.com> | 2018-08-06 00:22:39 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2018-08-29 11:17:33 +0200 |
| commit | 5f60f6fe1475491ac0c2f529fb2d074c32336add (patch) | |
| tree | 762fef1a5358182bb8e7c8b41586222ee5d025fe /configure.ac | |
| parent | 84151f7aa93521070fe405c60cbd0eaab4305805 (diff) | |
Various Haiku improvements
* Fix make distro-pack-install.
* Remove Xorg dependency.
* Remove stack protector workaround.
* Update distro-config and enabled features.
Change-Id: I273dc8343ad84bd77b86453cc01ff427b50ea0b5
Reviewed-on: https://gerrit.libreoffice.org/58634
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index a96f968581b4..2a60d92430e8 100644 --- a/configure.ac +++ b/configure.ac @@ -795,17 +795,13 @@ haiku*) test_randr=no test_xrender=no test_freetype=yes - enable_java=no - enable_opengl=no enable_odk=no - enable_gconf=no - enable_gnome_vfs=no - enable_gstreamer=no + enable_gstreamer_0_10=no + enable_gstreamer_1_0=no enable_vlc=no - enable_gltf=no - enable_collada=no enable_coinmp=no enable_pdfium=no + enable_sdremote=no enable_postgresql_sdbc=no enable_firebird_sdbc=no _os=Haiku @@ -11239,7 +11235,9 @@ then AC_MSG_ERROR([KF5 libraries not found. Please specify the root of your KF5 installation by exporting KF5DIR before running "configure".]) fi - PKG_CHECK_MODULES(KF5_XCB,[xcb],,[AC_MSG_ERROR([XCB not installed])]) + if test "$USING_X11" = TRUE; then + PKG_CHECK_MODULES(KF5_XCB,[xcb],,[AC_MSG_ERROR([XCB not installed])]) + fi KF5_CFLAGS="-I$kf5_incdir -I$kf5_incdir/KCoreAddons -I$kf5_incdir/KI18n -I$kf5_incdir/KConfigCore -I$kf5_incdir/KWindowSystem -I$kf5_incdir/KIOCore -I$kf5_incdir/KIOWidgets -I$kf5_incdir/KIOFileWidgets -I$qt5_incdir -I$qt5_incdir/QtCore -I$qt5_incdir/QtGui -I$qt5_incdir/QtWidgets -I$qt5_incdir/QtNetwork -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT $KF5_XCB_CFLAGS" KF5_LIBS="-L$kf5_libdir -lKF5CoreAddons -lKF5I18n -lKF5ConfigCore -lKF5WindowSystem -lKF5KIOCore -lKF5KIOWidgets -lKF5KIOFileWidgets -L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network $KF5_XCB_LIBS" |