Remove wrong link to picture
[gpg4win.git] / configure.ac
index f6a2b81..bf7bb4a 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
@@ -248,6 +248,13 @@ if test -n "$GPGEX_ADD_HOST"; then
     AC_CHECK_TOOLS(STRIP_EX, ${GPGEX_ADD_HOST}-strip)
 fi
 
+if test -z "$GPG4WIN_PARALLEL"; then
+    JOBS=$(nproc 2>/dev/null || echo 1)
+    GPG4WIN_PARALLEL=-j$JOBS
+    AC_MSG_NOTICE([Using autodetected $JOBS make jobs. You can override this by setting GPG4WIN_PARALLEL.])
+fi
+AC_SUBST(GPG4WIN_PARALLEL)
+
 missing_tools=
 for i in DLLTOOL MAKE UNZIP TAR MKDIR CP RM STOW MAKENSIS ZCAT TEXI2DVI \
          DVIPDF CONVERT SHA1SUM MSGFMT BUILD_CC; do
@@ -257,55 +264,10 @@ for i in DLLTOOL MAKE UNZIP TAR MKDIR CP RM STOW MAKENSIS ZCAT TEXI2DVI \
    fi
 done
 
-# GpgOL and GpgEx need the runtime libaries
-# The default path should probably be more generic
-changequote(,)dnl
-gcc_major_minor=$($CC --version \
-                  | awk 'NR==1 {split($NF,a,"."); print a[1] "." a[2]}')
-changequote([,])dnl
-
-libgcc_dll=no
-AC_ARG_WITH([libgcc_s_sjlj-1-dll],
-           AC_HELP_STRING([--with-libgcc_s_sjlj-1-dll=FILE],
-                          [use the libgcc_s_sjlj-1 DLL]),
-           [libgcc_dll=$withval])
-
-if test "$libgcc_dll" = "no"; then
-  file="/usr/lib/gcc/$host/$gcc_major_minor/libgcc_s_sjlj-1.dll"
-  if test -r "$file"; then
-    libgcc_dll="$file"
-  fi
-fi
-if test "$libgcc_dll" = "no"; then
-  missing_opt_tools="libgcc_s_sjlj-1.dll $missing_opt_tools"
-else
-  if test -r "$libgcc_dll"; then
-    cp $libgcc_dll src/libgcc_s_sjlj-1.dll-x
-  else
-    missing_opt_tools="libgcc_s_sjlj-1.dll $missing_opt_tools"
-  fi
-fi
-
-libstdcpp_dll=no
-AC_ARG_WITH([libstdc++-6-dll],
-           AC_HELP_STRING([--with-libstdc++-6-dll=FILE],
-                          [use the libstd++-6 DLL]),
-           [libstdcpp_dll=$withval])
-if test "$libstdcpp_dll" = "no"; then
-  file="/usr/lib/gcc/$host/$gcc_major_minor/libstdc++-6.dll"
-  if test -r "$file"; then
-    libstdcpp_dll="$file"
-  fi
-fi
-if test "$libstdcpp_dll" = "no"; then
-  missing_opt_tools="libstdc++-6.dll $missing_opt_tools"
-else
-  if test -r "$libstdcpp_dll"; then
-    cp $libstdcpp_dll src/libstdc++-6.dll-x
-  else
-    missing_opt_tools="libstdc++-6.dll $missing_opt_tools"
- fi
-fi
+# Additional runtime libraries from mingw.
+GPG4WIN_RUNTIME_LIBRARY(libgcc_s_sjlj-1)
+GPG4WIN_RUNTIME_LIBRARY(libstdc++-6)
+GPG4WIN_RUNTIME_LIBRARY(libwinpthread-1)
 
 AC_CHECK_PROGS(GLIB_GENMARSHAL, glib-genmarshal)
 AC_CHECK_PROGS(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
@@ -350,10 +312,11 @@ 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], [libiconv gtk+])
-GPG4WIN_SPKG([gpgme], [libgpg-error glib])
+GPG4WIN_SPKG([pinentry], [qtbase libiconv gtk+])
+GPG4WIN_SPKG([gpgme], [libgpg-error glib qtbase])
 GPG4WIN_SPKG([gpgol], [gpgme libassuan])
 GPG4WIN_SPKG([gpgex], [libassuan])
 GPG4WIN_SPKG([paperkey])
@@ -367,17 +330,42 @@ GPG4WIN_SPKG([gettext], [libiconv])
 GPG4WIN_SPKGEX([libgpg-error])
 GPG4WIN_SPKGEX([libassuan], [libgpg-error])
 GPG4WIN_SPKGEX([gpgex], [libassuan])
+GPG4WIN_SPKGEX([gpgme], [libgpg-error libassuan])
+GPG4WIN_SPKGEX([gpgol], [gpgme])
 
 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_BPKG_GNUWIN32([qt], [dbus])
-GPG4WIN_BPKG_BINSRC([kleopatra], [gpgme qt oxygen-icons])
+GPG4WIN_SPKG([qtbase], [libpng])
+GPG4WIN_SPKG([qttools], [qtbase])
+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], [gnupg-w32 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([karchive], [qtbase qttools extra-cmake-modules])
+GPG4WIN_KDEPKG([kiconthemes], [qtsvg kconfigwidgets karchive])
+GPG4WIN_KDEPKG([kxmlgui], [kiconthemes kconfigwidgets kitemviews])
+GPG4WIN_KDEPKG([libkleo], [gpgmepp kmime kwidgetsaddons kwindowsystem kcompletion kconfig gpgme])
 
 GPG4WIN_FINALIZE
 
@@ -400,7 +388,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
 
 
@@ -414,6 +410,7 @@ AC_CONFIG_FILES(doc/Makefile)
 AC_CONFIG_FILES(doc/logo/Makefile)
 AC_CONFIG_FILES(doc/manual/Makefile doc/manual/version.tex)
 AC_CONFIG_FILES(src/dictionaries/Makefile)
+AC_CONFIG_FILES(src/toolchain.cmake)
 AC_OUTPUT
 
 # Throw a warning if optional tools are missing
@@ -430,10 +427,15 @@ if test -n "$missing_opt_tools"; then
     done
 fi
 
-echo "
+echo -n "
         $PACKAGE_NAME-$PACKAGE_VERSION prepared for make
 
         Revision: ${GIT_REVISION}  (${GIT_REVISION_DEC})
-        Platform: $host
-        Additional gpgEx platform: ${GPGEX_ADD_HOST}
+        32bit platform: $host
+        64bit platform: ${GPGEX_ADD_HOST}
 "
+if test -n "$JOBS"; then
+    echo "        make jobs: ${JOBS}"
+else
+    echo ""
+fi