summaryrefslogtreecommitdiff
path: root/m4macros
Commit message (Collapse)AuthorAgeFilesLines
* m4macros: Increment serial number of glib-2.0.m4wip/autoconf-serialSimon McVittie2021-01-271-1/+1
| | | | | | | | | aclocal's ability to compare the version of macros and use the latest version relies on the serial number being incremented on every change, or at least on every functional change. Fixes: 6f26637e "m4macros: replace obsolete macros AC_TRY_RUN and AC_TRY_LINK in glib-2.0.m4" Signed-off-by: Simon McVittie <smcv@collabora.com>
* m4macros: replace obsolete macros AC_TRY_RUN and AC_TRY_LINK in glib-2.0.m4Simon Marchi2021-01-251-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Running autoconf 2.70 with -Wall,error on a configure.ac that uses AM_PATH_GLIB_2_0 gives: configure.ac:261: warning: The macro `AC_TRY_RUN' is obsolete. configure.ac:261: You should run autoupdate. ./lib/autoconf/general.m4:2996: AC_TRY_RUN is expanded from... /usr/share/aclocal/glib-2.0.m4:11: AM_PATH_GLIB_2_0 is expanded from... configure.ac:261: the top level configure.ac:261: warning: The macro `AC_TRY_LINK' is obsolete. configure.ac:261: You should run autoupdate. ./lib/autoconf/general.m4:2919: AC_TRY_LINK is expanded from... /usr/share/aclocal/glib-2.0.m4:11: AM_PATH_GLIB_2_0 is expanded from... configure.ac:261: the top level Run autoupdate on glib-2.0.m4 to change AC_TRY_RUN and AC_TRY_LINK into the suggested alternative, and adjust the formatting a little bit. The macros used in the alternative existed for long enough that there shouldn't be a problem with backwards compatibility. Signed-off-by: Simon Marchi <simon.marchi@polymtl.ca>
* tree: Fix various typos and outdated terminologyPhilip Withnall2020-06-121-12/+12
| | | | | | | | | | | | | | | | | | | | | | | This was mostly machine generated with the following command: ``` codespell \ --builtin clear,rare,usage \ --skip './po/*' --skip './.git/*' --skip './NEWS*' \ --write-changes . ``` using the latest git version of `codespell` as per [these instructions](https://github.com/codespell-project/codespell#user-content-updating). Then I manually checked each change using `git add -p`, made a few manual fixups and dropped a load of incorrect changes. There are still some outdated or loaded terms used in GLib, mostly to do with git branch terminology. They will need to be changed later as part of a wider migration of git terminology. If I’ve missed anything, please file an issue! Signed-off-by: Philip Withnall <withnall@endlessm.com>
* build: Drop autotools supportPhilip Withnall2019-01-152-14/+0
| | | | | | | | | | | | So long, and thanks for everything. We’re a Meson-only shop now. glib-2-58 will remain the last stable GLib release series which is buildable using autotools. We continue to install autoconf macros for autotools-using projects which depend on GLib; they are stable API. Signed-off-by: Philip Withnall <withnall@endlessm.com>
* m4macros: Fix detection of glib-2.0 aloneSimon McVittie2018-10-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We unconditionally appended ">= $min_glib_version" to the modules to look for, even though we had already included "glib-2.0 >= $min_glib_version" in our list. When requesting additional modules, this was fine, for example AM_PATH_GLIB_2_0([2.58], [:], [:], [gobject gio]) ended up asking pkg-config for glib-2.0 >= 2.58 gobject-2.0 gio-2.0 >= 2.58 which is redundant (since they all share a version number) but otherwise OK. However, AM_PATH_GLIB_2_0([2.58], [:], [:], []) ended up asking pkg-config for glib-2.0 >= 2.58 >= 2.58 which is not OK; the second ">=" was parsed as a bizarrely-named package to check for, and obviously few people have ">=.pc" installed. Signed-off-by: Simon McVittie <smcv@collabora.com> Fixes: 4bb16f48 "m4macros: Allow information from pkg-config to be overridden"
* m4macros: Allow information from pkg-config to be overriddenSimon McVittie2018-10-042-22/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | By using PKG_CHECK_VAR, we declare $GLIB_COMPILE_SCHEMAS, $GLIB_GENMARSHAL, $GOBJECT_QUERY, $GLIB_MKENUMS and $GLIB_COMPILE_RESOURCES as Autoconf "precious variables" with AC_ARG_VAR, similar to $PKG_CONFIG and $CC, so that they can be put on a configure command line: ./configure GLIB_COMPILE_RESOURCES=my-glib-compile-resources If they are set to a non-empty value, PKG_CHECK_VAR will use that instead of auto-detecting from pkg-config, so that builders can override them, for example when cross-compiling. Similarly, use the standard PKG_CHECK_MODULES macro to get GLib's CFLAGS and LIBS. It's possible that most of the rest of each macro can also disappear, but for the moment I've given them the benefit of the doubt. This does result in printing "checking for GLIB" twice (once for PKG_CHECK_MODULES and once for GLib's custom checks), but if you're using Autotools, you probably don't have a strong objection to overly verbose output. Signed-off-by: Simon McVittie <smcv@collabora.com>
* build: Add #serial lines to m4 filesPhilip Withnall2017-10-264-1/+13
| | | | | | | | | | | This helps prevent outdated copies of the m4 files being used if multiple copies are available in the search path. See https://www.gnu.org/software/automake/manual/html_node/Serials.html Signed-off-by: Philip Withnall <withnall@endlessm.com> https://bugzilla.gnome.org/show_bug.cgi?id=765552
* build: Fix -Wstrict-prototypes warning in glib-2.0.m4Philip Withnall2017-10-261-1/+1
| | | | | | Signed-off-by: Philip Withnall <withnall@endlessm.com> https://bugzilla.gnome.org/show_bug.cgi?id=705331
* build: Include gettext libraries for static compilation on Mac OS XPhilip Withnall2017-04-031-1/+48
| | | | | | | | | | When compiling statically against the system-provided gettext on Mac OS X, GLib needs to be linked against CoreFramework, which provides some functions used by gettext. Fix this by including the necessary macro magic from upstream gettext. https://bugzilla.gnome.org/show_bug.cgi?id=725894
* Deprecate GLIB_GNU_GETTEXT macro, use upstream gettext insteadJavier Jardón2016-01-111-2/+3
| | | | https://bugzilla.gnome.org/show_bug.cgi?id=624186
* Revert "Use upstream gettext instead the glib one"Javier Jardón2016-01-101-10/+1
| | | | | | | | | | | | | This causes several problems: - Compilation in FreeBSD with --enable-gtk-doc broke - Modules that still use the AM_GLIB_GNU_GETTEXT macro doesnt compile anymore because /usr/share/glib-2.0/gettext is not filled with the correct files, as this was done in the glib custom po/Makefile.in.in See https://bugzilla.gnome.org/show_bug.cgi?id=622991 This reverts commit e5c752371c7fb1343eff27b5f1d0bcbef4e333b9.
* Use upstream gettext instead the glib oneJavier Jardón2016-01-091-1/+10
| | | | https://bugzilla.gnome.org/show_bug.cgi?id=622991
* Revert "gsettings m4: check for .xml in src/builddir"Colin Walters2013-12-231-1/+1
| | | | | | | | | | | | | | This reverts commit b3593693d918f0ae97094f6712d817180b8eea6a. See: https://bugzilla.gnome.org/show_bug.cgi?id=712171#c3 See: https://bugzilla.gnome.org/show_bug.cgi?id=712171#c4 Tested using both srcdir == builddir and srcdir != builddir in hotssh. Conflicts: m4macros/gsettings.m4 https://bugzilla.gnome.org/show_bug.cgi?id=712630
* Remove alleged support for last-millennium UnixesDan Winship2013-11-201-4/+1
| | | | | | | | | | | Remove workarounds for NeXTStep (last released in 1995), SunOS (1994), HP-UX 9.x (1992) and 10.x (1995), OSF/1 / Digital UNIX / Tru64 UNIX 4.x (1999), and AIX 4.x (1999). HP-UX 11 implements dlopen(), so dropping support for earlier versions also lets us remove the HP-UX-specific gmodule-dld. https://bugzilla.gnome.org/show_bug.cgi?id=710519
* gsettings.m4: @GSETTINGS_RULES@: Support srcdir != builddir with ↵Colin Walters2013-11-181-1/+1
| | | | | | | | | | | | nonrecursive make In hotssh I use nonrecursive make. gnome-continuous uses srcdir != builddir by default. @GSETTINGS_RULES@ will then attempt to touch a nonexistent path. This patch fixes that. https://bugzilla.gnome.org/show_bug.cgi?id=712171
* configure: test(1) uses = to test for string equalityPatrick Welche2013-11-071-1/+1
| | | | https://bugzilla.gnome.org/show_bug.cgi?id=711600
* Rework the build system for a new tests approachRyan Lortie2013-05-312-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perform a substantial cleanup of the build system with respect to building and installing testcases. First, Makefile.decl has been renamed glib.mk and substantially expanded. We intend to add more stuff here in the future, like canned rules for mkenums, marshallers, resources, etc. By default, tests are no longer compiled as part of 'make'. They will be built when 'make check' is run. The old behaviour can be obtained with --enable-always-build-tests. --disable-modular-tests is gone (because tests are no longer built by default). There is no longer any way to cause 'make check' to be a no-op, but that's not very useful anyway. A new glibtests.m4 file is introduced. Along with glib.mk, this provides for consistent handling of --enable-installed-tests and --enable-always-build-tests (mentioned above). Port our various test-installing Makefiles to the new framework. This patch substantially improves the situation in the toplevel tests/ directory. Things are now somewhat under control there. There were some tests being built that weren't even being run and we run those now. The long-running GObject performance tests in this directory have been removed from 'make check' because they take too long. As an experiment, 'make check' now runs the testcases on win32 builds, by default. We can't run them under gtester (since it uses a pipe to communicate with the subprocess) so just toss them in TESTS. Most of them are passing on win32. Things are not quite done here, but this patch is already a substantial improvement. More to come.
* m4macros/glib-gettext.m4: Don't use AC_HEADER_STDCAdrian Bunk2013-05-151-1/+0
| | | | | | | AC_HEADER_STDC is obsolete (pre-C89 headers are no longer an issue), and the resulting STDC_HEADERS define is anyway not used. https://bugzilla.gnome.org/show_bug.cgi?id=700263
* configure: Enable set of standard -Werror=foo flagsColin Walters2012-11-021-0/+288
| | | | | | | | | | | | | | | | | | | We're not going to depend on gnome-common (I assume) so this patch nicks the systemd macro to test for compiler flags, and uses it to set a similar set of -Werror=foo as the gnome-common one does. See https://bugzilla.gnome.org/show_bug.cgi?id=608953 See https://mail.gnome.org/archives/desktop-devel-list/2012-July/msg00100.html If we're going to be setting more strict compiler flags for GNOME, we should really ensure GLib builds with them first, as it's kind of the model citizen. In particular, you can see several times that downstreams such as Debian have come in and fixed -Wformat-security bugs. We should never let those get into tarballs, or even commits. https://bugzilla.gnome.org/show_bug.cgi?id=687385
* Add GLIB_COMPILE_RESOURCES to glib m4 macrosAlexander Larsson2012-01-131-0/+3
|
* Fix DATADIRNAME on OpenBSD.Antoine Jacoutot2011-10-041-0/+4
| | | | | | On OpenBSD translation files are always installed under PREFIX/share/locale, there is no such thing as PREFIX/lib/locale; according to that, set DATADIRNAME to "share".
* m4macros/gsettings.m4: Use AS_HELP_STRING instead the deprecated AC_HELP_STRINGJavier Jardón2011-05-161-1/+1
|
* Improve .gitignoreRyan Lortie2011-03-311-0/+1
|
* Fix gsettings enum rule to work with non-srcdir buildsChristian Persch2010-12-121-1/+1
| | | | Bug #635007.
* gsettings.m4: Fix rules to work when there are no schemasDan Winship2010-11-041-3/+5
| | | | | | | | | If there are no schemas, don't try to install "" at install time. (In particular, automake conditionals don't work properly with @-expanded rules, so if you conditionally build a schema, you'll still unconditionally get the install rule.) https://bugzilla.gnome.org/show_bug.cgi?id=633381
* gsettings m4: Use --strict for checkingRyan Lortie2010-10-261-1/+1
| | | | | | | | | | | A while ago we allowed glib-compile-schemas to return a 'success' status in the case that just one schema file contained errors. Of course, this is the exact opposite of what we want in the case that we are checking schema validity at compile time. Use the --strict flag for that case. This closes #633115.
* Bug 627126 - gsettings schemas on FreeBSDRyan Lortie2010-10-041-14/+2
| | | | | | | | | | | Rewrite the install rule for GSettings schemas to not depend on an obscure chunk of non-portable sed that nobody understands the purpose of. Instead, use make's VPATH feature to resolve the paths of the files that need to be installed. No need to depend on the .valid targets here since automake already ensures that 'make all' is complete before 'make install' is permitted to run.
* glib-2.0.m4: Use unsigned variables for version numbersBenjamin Otte2010-09-231-4/+4
| | | | | | When using signed, we get complaints from gcc about comparing signed to unsigned with -Wsign-compare. And combined with -Werror in users' CFLAGS it breaks configure runs.
* Update the Git ignore filesEmmanuele Bassi2010-08-031-0/+5
|
* rename configure.in to configure.acRyan Lortie2010-07-131-2/+2
|
* gsettings.m4: add support for enumsRyan Lortie2010-06-301-6/+12
|
* Bug 622565 - compile-schemas fails when no schemasRyan Lortie2010-06-281-1/+1
| | | | | | | | | | | | | | Neutralise and deprecate the --uninstall option in the schema compiler and remove it from gsettings.m4. Make the new default behaviour a compromise between the old default behaviour and the previous --uninstall option: - never return a failure code if no schema files are found - issue a warning instead - remove the gschemas.compiled file if it exists
* Conditional gsettings.m4 support, AC_PATH_PROGRyan Lortie2010-06-181-2/+4
| | | | | | Add new support for conditional enabling of GSettings (as per bug #616718) and use AC_PATH_PROG instead of AC_PATH_TOOL (as per bug #621172).
* Let GLIB_SETTINGS macro use glib-compile-schemas from PATH when cross compilingHib Eris2010-06-151-1/+6
| | | | See bug #621172
* gsettings m4: check for .xml in src/builddirRyan Lortie2010-05-271-1/+1
| | | | | | | This checks for the .gschema.xml file in the srcdir and builddir and runs the schema validation on which one it finds. This handles non-srcdir builds in both cases: .gschema.xml is in the tarball and .gschema.xml is generated.
* add .SECONDARY: rule to preserve generated schemasRyan Lortie2010-05-211-0/+2
| | | | | | If the .gschema.xml file was generated as the result of an implicit make rule then make would 'rm' it after creating the validity stamp. This would cause 'make install' to fail.
* Add --uninstall option to glib-compile-schemasRyan Lortie2010-05-191-1/+1
| | | | | | | | | If --uninstall is given then don't give an error if the schema directory is empty. Instead, erase the gschemas.compiled file, if it exists. This is the right thing to do in the 'make uninstall' rule, where the schema directory could very well be left empty as a result. Modify gsettings.m4 to use this option.
* Bug 619038 - increase gsettings.m4 powerRyan Lortie2010-05-191-20/+51
| | | | handle schema checking, installation, uninstallation, cleaning
* Use the new option nameChristian Persch2010-05-151-1/+1
| | | | | It's --schema-file now, not --schema-files. Bug #616864.
* Fix issues with GSETTINGS_CHECK_RULEMatthias Clasen2010-05-141-3/+2
| | | | | | | | | Rename the --schema-files option to --schema-file, since it only accepts one file at a time. Change the GSETTINGS_CHECK_RULE to use it that way, too. And also make it work better with !srcdir builds. Bugs #616731 and #616864
* Make GSETTINGS_CHECK_RULE work in !srcdir buildsMatthias Clasen2010-05-081-1/+1
| | | | This problem was reported in bug 617823.
* Rename gschema-compile to glib-compile-schemasMatthias Clasen2010-04-231-4/+9
| | | | | And clean up the autofoo a bit: use an uppercase variable, check for pkg-config, check for presence of glib-compile-schemas.
* [gsettings] Change AM_GSETTINGS macro to GLIB_GSETTINGSJavier Jardón2010-04-231-2/+2
| | | | | | So we don't use Automake's macro namespace Fixes https://bugzilla.gnome.org/show_bug.cgi?id=616648
* Rename gsettingsschemaupdatecache to the more sane gschema_compileMatthias Clasen2010-04-211-2/+2
| | | | To follow existing glib pc variables for binaries.
* Add GSettings m4 macros helperBastien Nocera2010-04-212-1/+44
| | | | https://bugzilla.gnome.org/show_bug.cgi?id=616312
* Don't run system("touch conf.glibtest)" in the AM_PATH_GLIB_2_0 macroPaolo Bonzini2009-11-031-2/+1
| | | | | | | | Just use the C library instead to create the file. Helps building using Wine. Not that I think we want to endorse that, but accepting this minimal patch doesn't hurt. From bug #590016. Signed-off-by: Tor Lillqvist <tml@iki.fi>
* Bug 552861 – glib-2.0.m4 calls system(3) without storing its resultMatthias Clasen2008-10-101-1/+2
| | | | | | | | | | | | 2008-10-10 Matthias Clasen <mclasen@redhat.com> Bug 552861 – glib-2.0.m4 calls system(3) without storing its result * m4macros/glib-2.0.m4: Cosmetic change to make -Werror happy. Patch by Andreas Köhler svn path=/trunk/; revision=7584
* Remove AC_CANONICAL_HOST from GLIB_WITH_NLS again. (#385132)Matthias Clasen2008-01-271-2/+1
| | | | | | | | | | | 2008-01-27 Matthias Clasen <mclasen@redhat.com> * m4macros/glib-gettext.m4: Remove AC_CANONICAL_HOST from GLIB_WITH_NLS again. (#385132) svn path=/trunk/; revision=6388
* Support gio in AM_PATH_GLIB_2_0 (#509465)Dan Winship2008-01-151-2/+5
| | | | | | | | | | 2008-01-14 Dan Winship <danw@gnome.org> * m4macros/glib-2.0.m4: Support gio in AM_PATH_GLIB_2_0 (#509465) svn path=/trunk/; revision=6315
* initialize automake variables EXTRA_DIST and TEST_PROGS for unconditional21:06:47 Tim Janik2007-11-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2007-11-21 21:06:47 Tim Janik <timj@imendio.com> * Makefile.decl: initialize automake variables EXTRA_DIST and TEST_PROGS for unconditional appending via += in other makefiles. define recursive test targets: test, test-report, perf-report, full-report, as described here: http://mail.gnome.org/archives/gtk-devel-list/2007-November/msg00000.html * Makefile.am: * build/win32/vs8/Makefile.am, build/win32/dirent/Makefile.am: * build/win32/Makefile.am, build/Makefile.am: * docs/Makefile.am, docs/reference/Makefile.am: * docs/reference/glib/Makefile.am, docs/reference/gobject/Makefile.am: * gmodule/Makefile.am, tests/Makefile.am: * tests/refcount/Makefile.am, tests/gobject/Makefile.am: * glib/update-pcre/Makefile.am, glib/libcharset/Makefile.am: * glib/tests/Makefile.am, glib/pcre/Makefile.am: * glib/gnulib/Makefile.am, gobject/Makefile.am, m4macros/Makefile.am: * gthread/Makefile.am, glib/Makefile.am: include $(top_srcdir)/Makefile.decl, adapted EXTRA_DIST assignments. * glib/tests/Makefile.am: removed example testing rules. * glib/tests/testing.c: conditionalized performance and slow tests. * glib/gtestutils.h: * glib/gtestutils.c: work around g_test_config_vars not changing its exported value after value assignments, aparently due to symbol aliases. * glib/gtester.c: fixed off-by-one error which produced junk in logs. * configure.in: check for python >= 2.4 and provide $PYTHON for scripts. svn path=/trunk/; revision=5914
View Lorry Controller Status