summaryrefslogtreecommitdiff
path: root/m4macros
Commit message (Collapse)AuthorAgeFilesLines
* m4macros: Set a serial numberSimon McVittie2018-04-061-0/+4
| | | | | | | | | | | When a project has a bundled copy of our macro included in tarball source releases, typically in a m4/ or aclocal/ directory, aclocal uses the serial number to determine whether the system copy in /usr/share/aclocal is newer or older than the bundled copy. Without a serial number, the bundled copy will always be used and will not be overwritten, even if it is outdated. Signed-off-by: Simon McVittie <smcv@debian.org>
* m4macros: Use PKG_PROG_PKG_CONFIGwip/smcv/ac-path-tool-2Simon McVittie2018-03-261-13/+6
| | | | Signed-off-by: Simon McVittie <smcv@debian.org>
* m4macros: Fix underquoting in AC_PATH_TOOLwip/smcv/ac-path-toolSimon McVittie2018-03-261-2/+2
| | | | | | | While these lines are being changed anyway, they might as well be more correct. Signed-off-by: Simon McVittie <smcv@debian.org>
* AM_PATH_GTK_3_0: Use AC_PATH_TOOL to find pkg-configHelmut Grohne2018-03-261-2/+2
| | | | | | | | | | | AM_PATH_GTK_3_0 uses AC_PATH_PROG for finding pkg-config. Unfortunately, that will find the build architecture pkg-config which in turn will miss the host architecture gtk+3.0. What must be used here is the host architecture pkg-config and that is found with AC_PATH_TOOL. Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=894069 Reviewed-by: Simon McVittie <smcv@debian.org> Fixes: #133
* Typo fixesMatthias Clasen2016-03-101-1/+1
| | | | Fix s/occurence/occurrence in many places.
* Fix a memory leak in gtk-3.0.m4 fileDhiru Kholia2015-11-031-7/+4
| | | | | | | | This fix is inspired by, https://git.gnome.org/browse/glib/tree/m4macros/glib-2.0.m4 https://bugzilla.gnome.org/show_bug.cgi?id=757221
* Deprecate GTK_CHECK_BACKEND in favour of PKG_CHECK_MODULESSimon McVittie2014-08-211-1/+1
| | | | | | | | This is easy to do with pkg-config too. Bug: https://bugzilla.gnome.org/show_bug.cgi?id=641638 Bug-Debian: https://bugs.debian.org/756476 Reviewed-by: Matthias Clasen
* Deprecate AM_PATH_GTK_3_0 in favour of PKG_CHECK_MODULESSimon McVittie2014-08-211-1/+1
| | | | | | | | That's what GNOME applications use. Bug: https://bugzilla.gnome.org/show_bug.cgi?id=641638 Bug-Debian: https://bugs.debian.org/756476 Reviewed-by: Matthias Clasen
* Avoid "pkg-config --atleast-version"Simon McVittie2014-08-091-4/+5
| | | | | | | | | | | | | AM_PATH_GTK_3_0([3.4], [], [], [gthread]) results in calling "pkg-config --atleast-version 3.4 gtk+-3.0 gthread-2.0". With pkg-config 0.28, that test fails, because the version of gthread-2.0 is smaller than 3.4. This appears to be a behaviour change since 0.26, but matches what the documentation said in 0.26. Bug: https://bugzilla.gnome.org/show_bug.cgi?id=641638 Bug-Debian: https://bugs.debian.org/756476 Reviewed-by: Matthias Clasen <mclasen@redhat.com>
* m4: Fix GTK_CHECK_BACKEND() to also check for a minimum versionEmmanuele Bassi2011-02-171-19/+10
| | | | | | This should make the macro slightly more useful. Update the documentation mentioning the macro as well.
* Allow checking for GDK backendsEmmanuele Bassi2011-02-161-0/+32
| | | | | | | | | | | | | | | | Now that a single shared object can contain multiple backends we also need to provide a simple way for third party code to verify that the copy of GDK they are linking to supports their backend. The simplest way to verify is an m4 macro, GTK_CHECK_BACKEND(), shipped with the gtk+ m4 macros. The usage is pretty basic: GTK_CHECK_BACKEND([x11], [gtk_has_x11=yes], [gtk_has_x11=no]) AM_CONDITIONAL(BUILD_X11_CODE, test "x$gtk_has_x11" = "xno") https://bugzilla.gnome.org/show_bug.cgi?id=642479
* Consistently use PKG_CONFIG in macrosAnders F Björklund2011-01-181-1/+1
|
* One forgotten renameMatthias Clasen2010-05-112-11/+11
|
* Fix a typoJavier Jardón2009-11-071-1/+1
| | | | | | This was introduced in commit 72b69e0094db5ac1f9bf38bea429b45bf2e449e3 Reported by BugByteMan here: http://mail.gnome.org/archives/gtk-devel-list/2009-November/msg00014.html
* Don't run system("touch conf.gtktest") in the AM_PATH_GTK_2_0 macroPaolo Bonzini2009-11-031-1/+1
| | | | | | | | | Just use the C library instead to create the file. Helps building using Wine. Not that I think we want to endorse that way to build GTK+ for Windows, proper cross-compiling surely probably more sense, but accepting this minimal patch doesn't hurt. From bug #590017. Signed-off-by: Tor Lillqvist <tml@iki.fi>
* Add git.mk to generate .gitignore filesBehdad Esfahbod2009-05-041-0/+2
| | | | Add four new doc templates that were not in repository.
* Remove all .cvsignore files.Michael Natterer2007-12-131-2/+0
| | | | svn path=/trunk/; revision=19169
* call g_test_init() from gtk_test_init().15:39:40 Tim Janik2007-11-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2007-11-22 15:39:40 Tim Janik <timj@imendio.com> * gtk/gtktestutils.c: call g_test_init() from gtk_test_init(). * gtk/tests/testing.c: use g_test_add_func() to register tests and use g_test_run() to run the tests to integrate with the testing framework. * gtk/tests/Makefile.am: removed exemplary testing rules. * Makefile.am, gtk/tests/Makefile.am, gtk/Makefile.am: * gtk/xdgmime/Makefile.am, gtk/theme-bits/Makefile.am: * tests/Makefile.am, docs/reference/gdk-pixbuf/Makefile.am: * docs/reference/gdk/Makefile.am, docs/reference/gtk/Makefile.am: * docs/reference/Makefile.am, docs/tools/Makefile.am: * docs/tutorial/Makefile.am, docs/faq/Makefile.am, docs/Makefile.am: * gdk-pixbuf/pixops/Makefile.am, gdk-pixbuf/Makefile.am: * demos/gtk-demo/Makefile.am, demos/Makefile.am: * modules/input/Makefile.am, modules/printbackends/file/Makefile.am: * modules/printbackends/test/Makefile.am, modules/printbackends/Makefile.am: * modules/printbackends/cups/Makefile.am, modules/printbackends/lpr/Makefile.am: * modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am: * modules/engines/ms-windows/Theme/Makefile.am: * modules/engines/ms-windows/Makefile.am: * modules/engines/Makefile.am, modules/engines/pixbuf/Makefile.am: * modules/Makefile.am, m4macros/Makefile.am, perf/Makefile.am: * contrib/Makefile.am, contrib/gdk-pixbuf-xlib/Makefile.am: * gdk/directfb/Makefile.am, gdk/linux-fb/Makefile.am: * gdk/quartz/Makefile.am, gdk/win32/rc/Makefile.am: * gdk/win32/Makefile.am, gdk/x11/Makefile.am, gdk/Makefile.am: include $(top_srcdir)/Makefile.decl, adapted EXTRA_DIST assignments. svn path=/trunk/; revision=19033
* Add some quotes around ***. (#130073, Uwe Zeisberger)Owen Taylor2004-02-241-1/+1
| | | | | | | Tue Feb 24 17:35:59 2004 Owen Taylor <otaylor@redhat.com> * m4macros/gtk-2.0.m4: Add some quotes around ***. (#130073, Uwe Zeisberger)
* quote AC_DEFUN macro names so automake 1.8 won't whine at us.Manish Singh2004-01-281-1/+1
| | | | | | | Tue Jan 27 18:45:47 2004 Manish Singh <yosh@gimp.org> * m4macros/gtk-2.0.m4: quote AC_DEFUN macro names so automake 1.8 won't whine at us.
* Fix versioning to avoid changing the soname!Owen Taylor2002-05-061-3/+3
| | | | | | | | | | | | | | | | | Mon May 6 12:17:14 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Fix versioning to avoid changing the soname! [ merge from stable ] * Makefile.am (EXTRA_DIST): Add ChangeLog.pre-2-0 (#78641) * m4macros/gtk-2.0.m4: save CFLAGS/LIBS properly when compiling "what went wrong" test case. (#79329) * m4macros/gtk-2.0.m4: Remove reference to editing pkg-config script. (From Jim Gettys)
* Update version to 2.0.0Owen Taylor2002-03-051-1/+1
| | | | | | | | | | | | | | | | Tue Mar 5 15:47:54 2002 Owen Taylor <otaylor@redhat.com> * configure.in test/makefile.msc **.pc.in **/*.am: Update version to 2.0.0 * gtk/Makefile.am (MAINTAINERCLEANFILES): Add stamp files. * configure.in (GDK_PIXBUF_VERSION): Require GLib 2.0.0, Pango, Atk, 1.0.0. * m4macros/gtk-2.0.m4: Default to 2.0.0 as the minimum version.
* lowercase configure --help output.Sven Neumann2002-03-031-1/+1
| | | | | | 2002-03-03 Sven Neumann <sven@gimp.org> * m4macros/gtk-2.0.m4: lowercase configure --help output.
* Don't try to use pkg-config when we didn't find it. (#62944, Eric Lemings)Owen Taylor2001-10-291-10/+13
| | | | | | | | | | Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com> * m4macros/gtk-2.0.m4: Don't try to use pkg-config when we didn't find it. (#62944, Eric Lemings) * m4macros/gtk-2.0.m4: Fix problem with spaces around = sign in assignment. (#63209, Arkadiusz Miskiewicz)
* shut up CVSSven Neumann2001-06-131-0/+2
|
* subst GLIB_GENMARSHAL, GOBJECT_QUERY, GLIB_MKENUMS variablesHavoc Pennington2001-06-072-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2001-06-07 Havoc Pennington <hp@redhat.com> * m4macros/glib-2.0.m4: subst GLIB_GENMARSHAL, GOBJECT_QUERY, GLIB_MKENUMS variables * gmodule-2.0.pc.in: add gmodule_supported variable * glib-2.0.pc.in: add glib_genmarshal, gobject_query, glib_mkenums variables * configure.in: put G_MODULE_SUPPORTED value into .pc files * autogen.sh: support AUTOGEN_SUBDIR_MODE * Makefile.am: add -uninstalled.pc.in to EXTRA_DIST 2001-06-07 Havoc Pennington <hp@redhat.com> * pango/Makefile.am: add libpango.la to _DEPENDENCIES for the other libs * configure.in: use AM_PATH_GLIB_2_0 * autogen.sh: support AUTOGEN_SUBDIR_MODE * Makefile.am: dist the .pc.in files 2001-06-07 Havoc Pennington <hp@redhat.com> * atk/Makefile.am: use @GLIB_GENMARSHAL@ so we can use uninstalled glib-genmarshal * configure.in: rearrange the library checks to support uninstalled linking * autogen.sh: add support for AUTOGEN_SUBDIR_MODE * atk-uninstalled.pc.in: new file, allows linking to uninstalled ATK in giant GTK tarball 2001-06-07 Havoc Pennington <hp@redhat.com> * tests/Makefile.am: add missing -I flag * gtk/Makefile.am: use @GLIB_MKENUMS@, @GLIB_GENMARSHAL@, etc. * configure.in: use pkg-config to see if GModule is supported; fix to properly turn on included loaders when GModule isn't supported; don't use AC_CHECK_LIB when libs are not installed yet * autogen.sh: add support for AUTOGEN_SUBDIR_MODE * Makefile.am (SUBDIRS): add m4macros subdir * gtk/Makefile.am: $(srcdir)/foo targets must be $(srcdir)/foo in dependencies also.
* Fix up to refer to GTK+, not to GLib; fix some wording problems. (ComparedOwen Taylor2001-04-131-73/+68
| | | | | | | | Thu Apr 12 17:41:17 2001 Owen Taylor <otaylor@redhat.com> * gtk-2.0.m4: Fix up to refer to GTK+, not to GLib; fix some wording problems. (Compared to version from Johannes Stezenbach to check correctness.)
* Pass pkg-config options before the other args so it works even ifAlexander Larsson2001-04-111-5/+5
| | | | | | | | 2001-04-11 Alexander Larsson <alexl@redhat.com> * gtk-2.0.m4: Pass pkg-config options before the other args so it works even if POSIXLY_CORRECT is set.
* Updated.Owen Taylor2001-04-031-99/+90
| | | | | | | | | | | | | | | | | | | | | Tue Apr 3 13:55:37 2001 Owen Taylor <otaylor@redhat.com> * NEWS: Updated. * configure.in: Remove support for uninstalled glib. * gtk/gtkdnd.c (gtk_drag_highlight_expose): Return FALSE as so as not to stop emission. * gtk-config-2.0.in: Exit with an error message that gtk-config-2.0 is no longer supported. * Makefile.am gtk/Makefile.am tests/*: Moved all tests into tests, change build order to build modules before gtk/. * modules/input/Makefile.am: Move gtk-query-immodules-2.0 invocation to here.
* Really release 1.3.1GTK_1_3_1Owen Taylor2000-07-151-27/+27
| | | | | | | | | Fri Jul 14 20:30:25 2000 Owen Taylor <otaylor@redhat.com> * Really release 1.3.1 * gtk-config-2.0.in gtk-2.0.m4: Fix up to correspond to new include structure.
* Move gtk-config to gtk-config-2.0 move gtk_.m4 to gtk-2.0.m4Owen Taylor2000-07-141-0/+194
Fri Jul 14 12:22:49 2000 Owen Taylor <otaylor@redhat.com> * configure.in Makefile.am gtk-config.m4 gtk.m4: Move gtk-config to gtk-config-2.0 move gtk_.m4 to gtk-2.0.m4 * Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am gdk/Makefile.am demos/Makefile.am: Change library names to libgtk-1.3.la, etc, so that we can distinguish gtk-1.2 and gtk-2.0 on the linkline. * Makefile.am gtk/Makefile.am gdk-pixbuf/Makefile.am gdk/Makefile.am gdk/x11/Makfile.am Move include files into /usr/include/gtk-2.0, /usr/lib/gtk-2.0/include/ * autogen.sh acconfig.h configure.in gtk/gtkmain.c gtk/gtkintl.h: Change package for gettext from gtk+ to gtk20. Put hack in autogen.sh to modify po/Makefile.in.in after gettextize to make this possible. * gtk+.spec: Some updates, not tested. * gdk-pixbuf/Makefile.am: Move loaders into $(libdir)/gtk-2.0/$(GTK_VERSION)/loaders. * gtk/Makefile.am gtk/gtkrc.c: Move RC file locations $(sysconfdir)/gtk-2.0 ~/.gtkrc-2.0; theme subdir to THEMENAME/gtk-2.0/. Move engine directory to $(libdir)/gtk-2.0/$(GTK_VERSION)/engines.