From 97aac9d4fb2a2b8ff5f2849b4d0b8c19590e7984 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sat, 30 Jul 2016 16:28:59 +0200 Subject: search-dialog UI: install both UI files to avoid distcheck failure in po folder using --with-gtk=2.0/3.0 will only install one UI file if WITH_GTK3 is used, for ui_DATA in make file. ui_DATA is in EXTRA_DIST but will only have one UI file, defined by WITH_GTK3 check. --- configure.ac | 2 -- pluma/dialogs/Makefile.am | 8 +------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 26da2bce..190e59e1 100644 --- a/configure.ac +++ b/configure.ac @@ -173,8 +173,6 @@ case "$with_gtk" in esac AC_SUBST(GTK_API_VERSION) -AM_CONDITIONAL([WITH_GTK3],[test "$with_gtk" = "3.0"]) - PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""]) PKG_CHECK_MODULES(PLUMA, [ libxml-2.0 >= 2.5.0 diff --git a/pluma/dialogs/Makefile.am b/pluma/dialogs/Makefile.am index 239e94fe..bdeb4cec 100755 --- a/pluma/dialogs/Makefile.am +++ b/pluma/dialogs/Makefile.am @@ -21,17 +21,11 @@ libdialogs_la_SOURCES = \ pluma-search-dialog.h \ pluma-search-dialog.c -if WITH_GTK3 -ui_DATA = \ - pluma-encodings-dialog.ui \ - pluma-preferences-dialog.ui \ - pluma-search-dialog-gtk3.ui -else ui_DATA = \ pluma-encodings-dialog.ui \ pluma-preferences-dialog.ui \ + pluma-search-dialog-gtk3.ui \ pluma-search-dialog.ui -endif EXTRA_DIST = $(ui_DATA) -- cgit v1.2.1