28c23ce8db
* configure.ac: Remove definition and substitution of LIBGPGMEPP_LT_CURRENT, LIBGPGMEPP_LT_AGE, LIBGPGMEPP_LT_REVISION. Remove "cpp" from available_languages and from default_languages. Remove checks for C++ 11 and for support of visibility attribute. Remove substitution of GPGME_CPP_CFLAGS. Remove definition and substitution of GPGMEPP_PKGCONFIG_LIBS, GPGMEPP_PKGCONFIG_CFLAGS, GPGMEPP_PKGCONFIG_HOST. Remove generation of files in lang/cpp. * lang/Makefile.am (DIST_SUBDIRS): Remove cpp. * lang/cpp/.gitignore, lang/cpp/AUTHORS, lang/cpp/COPYING, lang/cpp/COPYING.LESSER, lang/cpp/COPYING.LIB, lang/cpp/ChangeLog, lang/cpp/INSTALL, lang/cpp/NEWS, lang/cpp/autogen.rc, lang/cpp/autogen.sh, lang/cpp/configure.ac: New. * lang/cpp/Makefile.am (EXTRA_DIST): Add autogen.sh, autogen.rc, VERSION. (RELEASE_ARCHIVE_SUFFIX, ACLOCAL_AMFLAGS, dist-hook, distcheck-hook, .PHONY, gen_start_date, gen-ChangeLog, RELEASE_NAME, release, sign-release): New (copied from top-level Makefile.am). * lang/cpp/build-aux/compile, lang/cpp/build-aux/config.guess, lang/cpp/build-aux/config.sub, lang/cpp/build-aux/depcomp, lang/cpp/build-aux/install-sh, lang/cpp/build-aux/libtool-patch.sed, lang/cpp/build-aux/ltmain.sh, lang/cpp/build-aux/missing: New. * m4/ax_cxx_compile_stdcxx.m4: Move to... * lang/cpp/m4/ax_cxx_compile_stdcxx.m4: ...here. * m4/ax_gcc_func_attribute.m4: Move to... * lang/cpp/m4/ax_gcc_func_attribute.m4: ...here. * lang/cpp/m4/gpg-error.m4, lang/cpp/m4/gpgme.m4, lang/cpp/m4/libtool.m4, lang/cpp/m4/ltoptions.m4, lang/cpp/m4/ltsugar.m4, lang/cpp/m4/ltversion.m4, lang/cpp/m4/lt~obsolete.m4: New. * lang/cpp/src/GpgmeppConfig-w32.cmake.in.in, lang/cpp/src/GpgmeppConfig.cmake.in.in: Remove @LIBASSUAN_LIBS@ from INTERFACE_LINK_LIBRARIES of Gpgmepp target. * lang/cpp/src/Makefile.am (AM_CPPFLAGS): Replace include paths of gpgme relative to top_builddir with @GPGME_CFLAGS@. Remove @LIBASSUAN_CFLAGS@. (libgpgmepp_la_LIBADD): Replace relative paths of libgpgme.la with @GPGME_LIBS@. Remove @LIBASSUAN_LIBS@. * lang/cpp/tests/Makefile.am (LDADD): Replace relative paths of libgpgme.la with @GPGME_LIBS@. (AM_CPPFLAGS): Replace include paths of gpgme relative to top_builddir with @GPGME_CFLAGS@. Remove @LIBASSUAN_CFLAGS@. Remove -DTOP_SRCDIR. -- This makes building and distributing GpgME++ independent of the sources of gpgme. Many of the new files are copied from gpgme to make GpgME++ a self-contained package. A later commit re-adds the possibility to build GpgME++ as nested package together with gpgme. GnuPG-bug-id: 7110
124 lines
4.3 KiB
Plaintext
124 lines
4.3 KiB
Plaintext
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
|
|
#
|
|
# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
|
|
# Written by Gary V. Vaughan, 2004
|
|
#
|
|
# This file is free software; the Free Software Foundation gives
|
|
# unlimited permission to copy and/or distribute it, with or without
|
|
# modifications, as long as this notice is preserved.
|
|
|
|
# serial 6 ltsugar.m4
|
|
|
|
# This is to help aclocal find these macros, as it can't see m4_define.
|
|
AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
|
|
|
|
|
|
# lt_join(SEP, ARG1, [ARG2...])
|
|
# -----------------------------
|
|
# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
|
|
# associated separator.
|
|
# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
|
|
# versions in m4sugar had bugs.
|
|
m4_define([lt_join],
|
|
[m4_if([$#], [1], [],
|
|
[$#], [2], [[$2]],
|
|
[m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
|
|
m4_define([_lt_join],
|
|
[m4_if([$#$2], [2], [],
|
|
[m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
|
|
|
|
|
|
# lt_car(LIST)
|
|
# lt_cdr(LIST)
|
|
# ------------
|
|
# Manipulate m4 lists.
|
|
# These macros are necessary as long as will still need to support
|
|
# Autoconf-2.59 which quotes differently.
|
|
m4_define([lt_car], [[$1]])
|
|
m4_define([lt_cdr],
|
|
[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
|
|
[$#], 1, [],
|
|
[m4_dquote(m4_shift($@))])])
|
|
m4_define([lt_unquote], $1)
|
|
|
|
|
|
# lt_append(MACRO-NAME, STRING, [SEPARATOR])
|
|
# ------------------------------------------
|
|
# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
|
|
# Note that neither SEPARATOR nor STRING are expanded; they are appended
|
|
# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
|
|
# No SEPARATOR is output if MACRO-NAME was previously undefined (different
|
|
# than defined and empty).
|
|
#
|
|
# This macro is needed until we can rely on Autoconf 2.62, since earlier
|
|
# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
|
|
m4_define([lt_append],
|
|
[m4_define([$1],
|
|
m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
|
|
|
|
|
|
|
|
# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
|
|
# ----------------------------------------------------------
|
|
# Produce a SEP delimited list of all paired combinations of elements of
|
|
# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
|
|
# has the form PREFIXmINFIXSUFFIXn.
|
|
# Needed until we can rely on m4_combine added in Autoconf 2.62.
|
|
m4_define([lt_combine],
|
|
[m4_if(m4_eval([$# > 3]), [1],
|
|
[m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
|
|
[[m4_foreach([_Lt_prefix], [$2],
|
|
[m4_foreach([_Lt_suffix],
|
|
]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
|
|
[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
|
|
|
|
|
|
# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
|
|
# -----------------------------------------------------------------------
|
|
# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
|
|
# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
|
|
m4_define([lt_if_append_uniq],
|
|
[m4_ifdef([$1],
|
|
[m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
|
|
[lt_append([$1], [$2], [$3])$4],
|
|
[$5])],
|
|
[lt_append([$1], [$2], [$3])$4])])
|
|
|
|
|
|
# lt_dict_add(DICT, KEY, VALUE)
|
|
# -----------------------------
|
|
m4_define([lt_dict_add],
|
|
[m4_define([$1($2)], [$3])])
|
|
|
|
|
|
# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
|
|
# --------------------------------------------
|
|
m4_define([lt_dict_add_subkey],
|
|
[m4_define([$1($2:$3)], [$4])])
|
|
|
|
|
|
# lt_dict_fetch(DICT, KEY, [SUBKEY])
|
|
# ----------------------------------
|
|
m4_define([lt_dict_fetch],
|
|
[m4_ifval([$3],
|
|
m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
|
|
m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
|
|
|
|
|
|
# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
|
|
# -----------------------------------------------------------------
|
|
m4_define([lt_if_dict_fetch],
|
|
[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
|
|
[$5],
|
|
[$6])])
|
|
|
|
|
|
# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
|
|
# --------------------------------------------------------------
|
|
m4_define([lt_dict_filter],
|
|
[m4_if([$5], [], [],
|
|
[lt_join(m4_quote(m4_default([$4], [[, ]])),
|
|
lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
|
|
[lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
|
|
])
|