aboutsummaryrefslogtreecommitdiffstats
path: root/src/gpgrt-config.in (unfollow)
Commit message (Collapse)AuthorFilesLines
2022-11-29gpgrt-config: Support a simple invocation.NIIBE Yutaka1-3/+73
* src/gpgrt-config.in (determine_gpgrt_libdir): New. -- GnuPG-bug-id: 6288 Signed-off-by: NIIBE Yutaka <[email protected]>
2022-08-25gpgrt-config: Strip system paths for --cflags and --libs.NIIBE Yutaka1-4/+10
* src/gpgrt-config.in: Strip -I and -L with system paths. -- This behavior is more compatible to pkg-config. GnuPG-bug-id: 6136 Signed-off-by: NIIBE Yutaka <[email protected]>
2021-09-10gpgrt-config: Fix behavior when PKG_CONFIG_LIBDIR="".NIIBE Yutaka1-1/+1
* src/gpgrt-config.in: Correctly detect the case. -- GnuPG-bug-id: 5595 Signed-off-by: NIIBE Yutaka <[email protected]>
2021-04-07build: Fix gpgrt-config for handling 'Requires' field.NIIBE Yutaka1-1/+2
* src/gpgrt-config.in (get_attr_l): Fix thinko for word split. -- GnuPG-bug-id: 5381 Reported-by: Jakub Jelen <[email protected]> Signed-off-by: NIIBE Yutaka <[email protected]>
2021-02-16build: Fix gpgrt-config.NIIBE Yutaka1-6/+1
* src/gpgrt-config.in: Remove delimiter variable. -- Fixes-commit: 7b81ec272b0c54ac893c09be4715b76e84c27b23 Signed-off-by: NIIBE Yutaka <[email protected]>
2020-08-03gpgrt-config: Fix handling 'Requires' field.NIIBE Yutaka1-6/+11
* src/gpgrt-config.in (get_attr_l): New. (all_required_config_files): Use get_attr_l. -- GnuPG-bug-id: 5010 Signed-off-by: NIIBE Yutaka <[email protected]>
2019-09-04gpgrt-config: Support Libs.private and Requires.private.NIIBE Yutaka1-0/+20
* src/gpgrt-config.in: Support Libs.private and Requires.private. Signed-off-by: NIIBE Yutaka <[email protected]>
2019-06-18build: Take care of POSIX shell path.NIIBE Yutaka1-1/+1
* configure.ac (INSTALLSHELLPATH): New. * src/Makefile.am: Change invocation of gpg-error-config-test.sh. * src/gpgrt-config.in (INSTALLSHELLPATH): To be substituted. * src/gpg-error-config-test.sh.in: Likewise. -- GnuPG-bug-id: 4574 Signed-off-by: NIIBE Yutaka <[email protected]>
2018-12-09gpgrt-config: Portability fix for use of expr.NIIBE Yutaka1-3/+3
* src/gpgrt-config (sysroot): Care about possible interpretation of minus sign be considered an option to a program. (MAIN): Don't use 'match' of expr but use ':' instead. -- Reported-by: Roman Bogorodskiy <[email protected]> Signed-off-by: NIIBE Yutaka <[email protected]>
2018-11-14gpgrt-config: Prepend PKG_CONFIG_LIBDIR to PKG_CONFIG_PATH.NIIBE Yutaka1-8/+23
* src/gpgrt-config: Handle empty PKG_CONFIG_LIBDIR config, which should ignore --libdir option. Otherwise, prepend PKG_CONFIG_LIBDIR (instead of appending) to PKG_CONFIG_PATH. -- Suggested-by: Andre Heinecke <[email protected]> Signed-off-by: NIIBE Yutaka <[email protected]>
2018-11-02gpgrt-config: Don't support variable reference in --libdir option.NIIBE Yutaka1-37/+5
* src/gpgrt-config: Simplify --libdir support, remove variable substituion. * src/gpg-error.m4: Expand possible ${prefix}, ${exec_prefix} in libdir. Simplify invocation of gpgrt-config. * src/gpgrt.m4: Likewise. -- The --libdir option for configure can include variable reference like --libdir='${exec_prefix}/lib/x86_64-linux-gnu', and this expression should be expanded (the variable should be substituted) beforehand to determine if there is gpg-error.pc file or not. Signed-off-by: NIIBE Yutaka <[email protected]>
2018-10-31gpgrt-config: Fix typo in the script.NIIBE Yutaka1-1/+1
* src/gpgrt-config: Add missing $ for libdir_option. Signed-off-by: NIIBE Yutaka <[email protected]>
2018-10-29gpgrt-config: Better architecture independent support.NIIBE Yutaka1-58/+73
* configure.ac: Don't generate gpgrt-config. * src/gpgrt-config: Rename from gpgrt-config.in. (--prefix, --exec-prefix, --libdir): Use --libdir to determine PKG_CONFIG_LIBDIR. * src/Makefile.am (EXTRA_DIST): Remove gpgrt-config.in. * src/gpg-error-config-test.sh: Fix for path to gpgrt-config. * src/gpg-error.m4: Provide --prefix, --exec-prefix, --libdir option from configure. Don't use CC because we have --libdir. Bump version date. * src/gpgrt.m4: Likewise. -- Considering multilib support as well as multiarch support, it is better to provide the information for PKG_CONFIG_LIBDIR by --libdir directly, instead of CC. Difficulty is that configure allows variable reference like: --libdir='${exec_prefix}/i386-linux' So, it should also support --prefix and --exec_prefix options. Signed-off-by: NIIBE Yutaka <[email protected]>
2018-10-26gpgrt-config: Clean up the implementation.NIIBE Yutaka1-25/+38
* src/gpgrt-config.in: Fix copyright notice. (--exists): Support new option of pkg-config. (--mt): Relax usage. (--api-version): Support old option. (default_module): New. (usage): Only show pkg-config compatible options. Signed-off-by: NIIBE Yutaka <[email protected]>
2018-10-25gpg-error-config: Keep old gpg-error-config implementation.NIIBE Yutaka1-0/+0
* configure.ac: Generate gpgrt-config from gpgrt-config.in. * src/gpgrt-config.in: Rename from src/gpg-error-config-new.in. * src/Makefile.am (bin_SCRIPTS): Add gpgrt-config. (EXTRA_DIST): Add gpgrt-config.in removing gpg-error-config-new.in. (BUILT_SOURCES, CLEANFILES): Remove gpgrt-config. (gpg-error-config): Always copy from gpg-error-config-old. * src/gpg-error-config-test.sh: Follow the rename. -- The gpgrt-config script is new implementation supporting *.pc file, while gpg-error-config keeps old single shell script. Signed-off-by: NIIBE Yutaka <[email protected]>
2018-10-24gpg-error-config: Get var/attr from the first package.NIIBE Yutaka1-2/+5
* src/gpg-error-config-new.in: Only get it from the first. Signed-off-by: NIIBE Yutaka <[email protected]>
2018-10-23gpg-error-config: Fix cross build support.NIIBE Yutaka1-7/+34
* configure.ac: Fix regexp matching multiarch environment. * src/gpg-error-config-new.in: Support standard cross build. Handle the case where $multiarch != $triplet. -- For standard cross build, use @exec_prefix@/$triplet/lib/pkgconfig. Signed-off-by: NIIBE Yutaka <[email protected]>
2018-10-22gpg-error-config: Support "auto", architecture independent script.NIIBE Yutaka1-0/+13
* configure.ac (pkg_config_libdir): Set it "auto" when it looks multiarch environment. * src/gpg-error-config-new.in: Automatically detects the triplet. -- The triplet detection mechanism is not sufficient. It's up to distributions to apply more changes (in distribution specific way). Signed-off-by: NIIBE Yutaka <[email protected]>
2018-10-17gpg-error-config: Fix PKG_CONFIG_LIBDIR support.NIIBE Yutaka1-2/+2
* configure.ac (pkg_config_libdir): New. * src/gpg-error-config-new.in: Use pkg_config_libdir. -- PKG_CONFIG_LIBDIR is not mere libdir but should include 'pkgconfig'. Signed-off-by: NIIBE Yutaka <[email protected]>
2018-10-16gpg-error-config: Support PKG_CONFIG_LIBDIR.NIIBE Yutaka1-1/+1
* src/gpg-error-config-new.in: Use PKG_CONFIG_LIBDIR if specified. -- This change allows a distribution (like Debian) offering <triplet>-gpg-error-config wrapper script which invokes gpg-error-config with host specific PKG_CONFIG_LIBDIR. Signed-off-by: NIIBE Yutaka <[email protected]>
2018-10-10gpg-error-config: Fix the place of *.pc (for multilib).NIIBE Yutaka1-3/+3
* src/Makefile.am (pkgconfigdir): It should be under libdir. * src/gpg-error-config-new.in: Likewise. -- Reported-by: Alon Bar-Lev <[email protected]> Signed-off-by: NIIBE Yutaka <[email protected]>
2018-10-10gpg-error-config: Add PKG_CONFIG_SYSROOT_DIR support.NIIBE Yutaka1-2/+32
* src/gpg-error-config-new.in (sysroot): New function. (want_cflags, want_libs): Use sysroot. * src/gpg-error-config-test.sh: Test with PKG_CONFIG_SYSROOT_DIR. -- PKG_CONFIG_SYSROOT_DIR is for cross build. Signed-off-by: NIIBE Yutaka <[email protected]>
2018-09-20gpg-error-config: Use expr to remove var in expression.NIIBE Yutaka1-1/+1
* src/gpg-error-config-new.in (remove_var_expr): Use expr. -- For OpenBSD's sh, it results "bad substitusion". Now, we use expr. Tested on OpenBSD 6.2. Signed-off-by: NIIBE Yutaka <[email protected]>
2018-09-20gpg-error-config: Fix a variable name for zsh.NIIBE Yutaka1-7/+7
* src/gpg-error-config-new.in (module_list): Rename from modules. -- For ZSH, "modules" is built-in variable name. Avoid such a use. Signed-off-by: NIIBE Yutaka <[email protected]>
2018-09-20gpg-error-config: Don't use local variables.NIIBE Yutaka1-136/+137
* src/gpg-error-config-new.in: Use global variables only. -- Since Korn Shell requires different syntax for function to declare local variables, and some OS use Korn Shell as /bin/sh, avoid non-portable use of "local". Signed-off-by: NIIBE Yutaka <[email protected]>
2018-09-20gpg-error-config: Avoid more space char.NIIBE Yutaka1-5/+5
* src/gpg-error-config-new.in: Don't put more space. Signed-off-by: NIIBE Yutaka <[email protected]>
2018-09-11Make gpg-error-config compatible to pkg-config.NIIBE Yutaka1-0/+541
* configure.ac (AC_CONFIG_FILES): Generate src/gpg-error.pc, as well as src/gpg-error-config-old and src/gpg-error-config-new. * src/Makefile.am (pkgconfigdir, pkgconfig_DATA): New. (EXTRA_DIST): Add gpg-error-config-new.in, gpg-error-config-test.sh, and gpg-error.pc.in. (CLEANFILES): Add gpg-error-config gpg-error-config-test.log. (TESTS): New. (gpg-error-config): New target. * src/gpg-error-config-new.in: New. * src/gpg-error-config-test.sh: New. * src/gpg-error.pc.in: New. * src/gpg-error.m4 (GPG_ERROR_MT_CFLAGS): Use --variable. (GPG_ERROR_MT_LIBS, gpg_error_config_host): Likewise. -- This change is to privide gpg-error.pc for pkg-config, so that developers can use pkg-config to configure their applications. The gpg-error-config script is also kept supported for applications which want to avoid dependency of pkg-config. Note that new gpg-error-config script uses gpg-error.pc as master data, so that it can keep compatibility to pkg-config easily. In the new gpg-error-config script, features are added to increase compatibility to pkg-config, like --variable option and multiple module support. However, it is not meant to oriented to be a full-fledged version of pkg-config, only a small set of features is supported. To be conservative, new gpg-error-config is checked at build time against old gpg-error-config. On the host which fails, old gpg-error-config will be installed with a warning. GnuPG-bug-id: 4085 Signed-off-by: NIIBE Yutaka <[email protected]>