diff options
| -rw-r--r-- | Makefile.fetch | 2 | ||||
| -rw-r--r-- | RepositoryExternal.mk | 8 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | external/Module_external.mk | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index 7dedf3b129a7..d2c073ebbc1e 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -131,7 +131,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,FREETYPE,FREETYPE_TARBALL) \ $(call fetch_Optional,EPOXY,EPOXY_TARBALL) \ $(call fetch_Optional,GLM,GLM_TARBALL) \ - $(call fetch_Optional,GPGME,GPGME_TARBALL) \ + $(call fetch_Optional,GPGMEPP,GPGME_TARBALL) \ $(call fetch_Optional,GRAPHITE,GRAPHITE_TARBALL) \ $(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \ $(call fetch_Optional,HSQLDB,HSQLDB_TARBALL) \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 48c687267a3e..258e0b605dda 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3393,11 +3393,11 @@ endif # ENABLE_BREAKPAD ifneq ($(SYSTEM_GPGMEPP),) -gb_ExternalProject__use_gpgme:= +gb_ExternalProject__use_gpgmepp:= gb_ExternalProject__use_libassuan:= gb_ExternalProject__use_libgpg-error:= -define gb_LinkTarget__use_gpgme +define gb_LinkTarget__use_gpgmepp $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $$(GPGMEPP_CFLAGS) \ @@ -3411,7 +3411,7 @@ endef else # NON-SYSTEM_GPGME -define gb_ExternalProject__use_gpgme +define gb_ExternalProject__use_gpgmepp $(call gb_ExternalProject_use_external_project,$(1),gpgme) endef @@ -3424,7 +3424,7 @@ $(call gb_ExternalProject_use_external_project,$(1),libgpg-error) endef -define gb_LinkTarget__use_gpgme +define gb_LinkTarget__use_gpgmepp $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \ $$(INCLUDE) \ diff --git a/configure.ac b/configure.ac index 7f2bfb7efa6e..8ffe7443d7a1 100644 --- a/configure.ac +++ b/configure.ac @@ -1761,7 +1761,7 @@ AC_ARG_WITH(system-poppler, AC_ARG_WITH(system-gpgmepp, AS_HELP_STRING([--with-system-gpgmepp], - [Use gpgme already on system]),, + [Use gpgmepp already on system]),, [with_system_gpgmepp="$with_system_libs"]) AC_ARG_WITH(system-apache-commons, @@ -10463,7 +10463,7 @@ if test "$_os" = "Linux"; then [AC_MSG_ERROR(gpgmepp not found or not functional)], []) else AC_MSG_RESULT([internal]) - BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGME" + BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP" GPG_ERROR_CFLAGS="-I${WORKDIR}/UnpackedTarball/libgpg-error/src" GPG_ERROR_LIBS="-L${WORKDIR}/UnpackedTarball/libgpg-error/src/.libs -lgpg-error" @@ -10471,7 +10471,7 @@ if test "$_os" = "Linux"; then LIBASSUAN_LIBS="-L${WORKDIR}/UnpackedTarball/libassuan/src/.libs -lassuan" fi fi -AC_SUBST(SYSTEM_GPGME) +AC_SUBST(SYSTEM_GPGMEPP) AC_SUBST(GPG_ERROR_CFLAGS) AC_SUBST(GPG_ERROR_LIBS) AC_SUBST(LIBASSUAN_CFLAGS) diff --git a/external/Module_external.mk b/external/Module_external.mk index d83560d35ed5..c0b2c7e30b51 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -42,7 +42,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,FREEHAND,libfreehand) \ $(call gb_Helper_optional,FREETYPE,freetype) \ $(call gb_Helper_optional,GLM,glm) \ - $(call gb_Helper_optional,GPGME,gpgme) \ + $(call gb_Helper_optional,GPGMEPP,gpgme) \ $(call gb_Helper_optional,GRAPHITE,graphite) \ $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ $(call gb_Helper_optional,HSQLDB,hsqldb) \ |