diff options
-rw-r--r-- | config_host/config_gtk3_kde5.h.in | 10 | ||||
-rw-r--r-- | config_host/config_kde5.h.in | 10 | ||||
-rw-r--r-- | config_host/config_qt5.h.in | 11 | ||||
-rw-r--r-- | config_host/config_vclplug.h.in | 6 | ||||
-rw-r--r-- | configure.ac | 5 |
5 files changed, 5 insertions, 37 deletions
diff --git a/config_host/config_gtk3_kde5.h.in b/config_host/config_gtk3_kde5.h.in deleted file mode 100644 index 06c672d4bb69..000000000000 --- a/config_host/config_gtk3_kde5.h.in +++ /dev/null @@ -1,10 +0,0 @@ -/* -Settings for GTK3/KDE5 integration. -*/ - -#ifndef CONFIG_GTK3_KDE5_H -#define CONFIG_GTK3_KDE5_H - -#define ENABLE_GTK3_KDE5 0 - -#endif diff --git a/config_host/config_kde5.h.in b/config_host/config_kde5.h.in deleted file mode 100644 index af42a5edcf6a..000000000000 --- a/config_host/config_kde5.h.in +++ /dev/null @@ -1,10 +0,0 @@ -/* -Settings for KDE5 integration. -*/ - -#ifndef CONFIG_KDE5_H -#define CONFIG_KDE5_H - -#define KDE5_HAVE_GLIB 0 - -#endif diff --git a/config_host/config_qt5.h.in b/config_host/config_qt5.h.in deleted file mode 100644 index 51bb58566f2b..000000000000 --- a/config_host/config_qt5.h.in +++ /dev/null @@ -1,11 +0,0 @@ -/* -Settings for QT5 integration. -*/ - -#ifndef CONFIG_QT5_H -#define CONFIG_QT5_H - -#define ENABLE_QT5 0 -#define QT5_HAVE_GLIB 0 - -#endif diff --git a/config_host/config_vclplug.h.in b/config_host/config_vclplug.h.in index 5bd9b4b98fe4..0b9ca095e5ec 100644 --- a/config_host/config_vclplug.h.in +++ b/config_host/config_vclplug.h.in @@ -1,6 +1,6 @@ /* -Settings about which X11 desktops have support enabled. +Settings about which desktops have support enabled. */ @@ -8,7 +8,9 @@ Settings about which X11 desktops have support enabled. #define CONFIG_VCLPLUG_H #define ENABLE_GTK 0 -#define ENABLE_KDE5 0 +#define ENABLE_GTK3 0 #define ENABLE_GTK3_KDE5 0 +#define ENABLE_KDE5 0 +#define ENABLE_QT5 0 #endif diff --git a/configure.ac b/configure.ac index 09a21db2e37f..7f98a4a429b5 100644 --- a/configure.ac +++ b/configure.ac @@ -10229,6 +10229,7 @@ if test "x$enable_gtk3" = "xyes"; then : ${with_system_cairo:=yes} PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.18 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="") if test "x$ENABLE_GTK3" = "xTRUE"; then + AC_DEFINE(ENABLE_GTK3) R="gtk3" dnl Avoid installed by unpackaged files for now. if test -z "$PKGFORMAT"; then @@ -11171,7 +11172,6 @@ the root of your Qt installation by exporting QT5DIR before running "configure". PKG_CHECK_MODULES(QT5_GLIB,[glib-2.0 >= 2.4], [ QT5_HAVE_GLIB=1 - AC_DEFINE(QT5_HAVE_GLIB,1) ], AC_MSG_WARN([[No Glib found, Qt5 support will not use native file pickers!]]) ) @@ -12710,9 +12710,6 @@ AC_CONFIG_HEADERS([config_host/config_liblangtag.h]) AC_CONFIG_HEADERS([config_host/config_libnumbertext.h]) AC_CONFIG_HEADERS([config_host/config_locales.h]) AC_CONFIG_HEADERS([config_host/config_mpl.h]) -AC_CONFIG_HEADERS([config_host/config_qt5.h]) -AC_CONFIG_HEADERS([config_host/config_kde5.h]) -AC_CONFIG_HEADERS([config_host/config_gtk3_kde5.h]) AC_CONFIG_HEADERS([config_host/config_oox.h]) AC_CONFIG_HEADERS([config_host/config_options.h]) AC_CONFIG_HEADERS([config_host/config_options_calc.h]) |