Add patches for gpgol and gpgex
[gpg4win.git] / configure.ac
index 19cd684..2a6f35e 100644 (file)
@@ -158,7 +158,7 @@ AC_ARG_ENABLE(light-installer,
     AC_HELP_STRING([--disable-light-installer],
                    [Do not create the light version of the installer]),
                     build_light_installer=$enableval,
-                    build_light_installer=yes)
+                    build_light_installer=no)
 AM_CONDITIONAL(BUILD_LIGHT_INSTALLER, test "$build_light_installer" = yes)
 
 # You can build a vanilla version of the installer, featuring only
@@ -168,7 +168,7 @@ AC_ARG_ENABLE(vanilla-installer,
     AC_HELP_STRING([--disable-vanilla-installer],
                    [Do not create the vanilla version of the installer]),
                     build_vanilla_installer=$enableval,
-                    build_vanilla_installer=yes)
+                    build_vanilla_installer=no)
 AM_CONDITIONAL(BUILD_VANILLA_INSTALLER, test "$build_vanilla_installer" = yes)
 
 # If you want to build only the light or vanilla installer, you may
@@ -312,6 +312,7 @@ GPG4WIN_SPKG([gtk+], [libiconv gettext pkgconfig atk pango dnl
                       glib gdk-pixbuf cairo])
 GPG4WIN_SPKG([libpng], [pkgconfig])
 
+GPG4WIN_SPKG([bzip2])
 GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
 GPG4WIN_SPKG([libassuan], [libgpg-error w32pth])
 GPG4WIN_SPKG([pinentry], [qtbase libiconv gtk+])
@@ -336,15 +337,34 @@ GPG4WIN_IPKG([compendium])
 
 # The GnuPG Package.
 GPG4WIN_BPKG_BINSRC([gnupg-w32])
+# See the script kde-l10n.sh how this package is created.
+GPG4WIN_BPKG_BINSRC([kde-l10n])
 
 # Qt related stuff.
-GPG4WIN_BPKG_GNUWIN32([dbus])
-GPG4WIN_BPKG_BINSRC([oxygen-icons])
-GPG4WIN_SPKG([qtbase], [dbus libpng])
+GPG4WIN_SPKG([qtbase], [libpng])
 GPG4WIN_SPKG([qttools], [qtbase])
-GPG4WIN_BPKG_BINSRC([kleopatra], [kconfig gpgme qtbase oxygen-icons])
+GPG4WIN_SPKG([qtwinextras], [qtbase])
+GPG4WIN_SPKG([qtsvg], [qtbase])
+GPG4WIN_SPKG([boost], [expat zlib bzip2])
+GPG4WIN_KDEPKG([breeze-icons], [extra-cmake-modules qtbase])
+GPG4WIN_KDEPKG([kleopatra], [breeze-icons kxmlgui libkleo kde-l10n kitemmodels])
 GPG4WIN_KDEPKG([extra-cmake-modules])
 GPG4WIN_KDEPKG([kconfig], [qtbase qttools extra-cmake-modules])
+GPG4WIN_KDEPKG([ki18n], [qtbase gettext qttools extra-cmake-modules])
+GPG4WIN_KDEPKG([gpgmepp], [boost qtbase gpgme extra-cmake-modules])
+GPG4WIN_KDEPKG([kwidgetsaddons], [kconfig qttools qtbase])
+GPG4WIN_KDEPKG([kcompletion], [kwidgetsaddons])
+GPG4WIN_KDEPKG([kwindowsystem], [qtbase qtwinextras])
+GPG4WIN_KDEPKG([kcoreaddons], [qtbase qttools])
+GPG4WIN_KDEPKG([kcodecs], [qtbase qttools])
+GPG4WIN_KDEPKG([kguiaddons], [qtbase qttools])
+GPG4WIN_KDEPKG([kmime], [kcodecs])
+GPG4WIN_KDEPKG([kconfigwidgets], [kwidgetsaddons kguiaddons ki18n kcodecs kconfig])
+GPG4WIN_KDEPKG([kitemviews], [qtbase qttools])
+GPG4WIN_KDEPKG([kitemmodels], [qtbase qttools])
+GPG4WIN_KDEPKG([kiconthemes], [qtsvg kconfigwidgets])
+GPG4WIN_KDEPKG([kxmlgui], [kiconthemes kconfigwidgets kitemviews])
+GPG4WIN_KDEPKG([libkleo], [gpgmepp kmime kwidgetsaddons kwindowsystem kcompletion kconfig gpgme])
 
 GPG4WIN_FINALIZE
 
@@ -367,7 +387,15 @@ if test -n "$gpg4win_dup_sources"; then
       tmp="$tmp
 $i"
     done
-    AC_MSG_ERROR([Packages with more that one source version:$tmp])
+    tmp2="
+You might remove them with:"
+    for i in $gpg4win_rm_candidates; do
+        if ! grep -q $(basename $i) packages/packages.current; then
+            tmp2="$tmp2
+rm $i"
+        fi
+    done
+    AC_MSG_ERROR([Packages with more that one source version:$tmp$tmp2])
 fi