summaryrefslogtreecommitdiff
path: root/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
2012-05-10Make sure dist is only run --with-internal-glibDan Nicholson1-0/+9
Since there's no DIST_CONFIGURE_FLAGS, the best we can do to not require glib's configure to always be run is to error on dist when we haven't configured --with-internal-glib. This is a hack, but I think it's slightly nicer than overriding dist and re-running configure with different options than were specified by the user.
2012-05-10Conditionally add glib to DIST_SUBDIRS to fix distcleanDan Nicholson1-0/+4
The glib configure script takes a long time to run, so we want to avoid it in the default case where we're using the system's glib. Unfortunately, that means we can't add it unconditionally to DIST_SUBDIRS since distclean will not always find Makefiles when it descends into glib. Make glib only be part of DIST_SUBDIRS when we've configured it. This will require a different hack to make sure dist always includes glib.
2012-05-10Revert "Make sure glib subdir is configure before dist"Dan Nicholson1-10/+0
This reverts commit 1860fc8036800683c04958f81c88558d08b6847e. distclean breaks if glib is in DIST_SUBDIRS but we haven't actually generated the glib Makefiles by running glib's configure.
2012-04-21Make sure glib subdir is configure before distDan Nicholson1-0/+10
We want to distribute the glib subdir, but we want to avoid configuring it for the default build case where the system glib is used. Override the standard dist target so that we can reconfigure with --with-internal-glib if necessary. I think the target should be compatible with the original dist. This is pretty hacky and may need to be reverted if it breaks dist.
2012-04-21Use a bundled glib2 to avoid circular dependencyDan Nicholson1-1/+5
It's nice to say that glib is a base library and you should have it installed to build pkg-config, but it makes bootstrapping pkg-config really annoying since it introduces a circular dependency. Let's be nice to our users and bundle a copy to avoid this situation. The default is still to use the system's glib, but the internal copy can be used by passing --with-internal-glib to configure. The latest stable copy of glib is included and will be updated periodically with their stable releases. The top level autogen.sh is running recursively through glib. If this becomes an issue, we can switch autoreconf to --no-recursive and then descend to glib and run its autogen.sh script. Since this is default off, its integration will probably not be tested often. Therefore, it's forcefully turned on during distcheck to make sure to test it out before distributing a tarball.
2011-05-15Run distcheck against installed poptTollef Fog Heen1-0/+1
2011-04-14Escape slashes in paths passed to mingw-gccРуслан Ижбулатов1-0/+9
Avoids Msys path mangling that turns *nix paths (such as /usr/include) into DOS-style absolute paths (such as c:/mingw/msys/1.0/include). Allows mingw-built pkg-config to pass check-cflags.
2011-04-13Add --with-system-include-path etc.Simon McVittie1-1/+5
Instead of hard-coding /usr/include, we now use the environment variable PKG_CONFIG_SYSTEM_INCLUDE_PATH, defaulting to the argument of ./configure --with-system-include-path, which in turn defaults to /usr/include. Similarly, PKG_CONFIG_SYSTEM_LIBRARY_PATH defaults to /usr/lib or /usr/lib:/usr/lib64 as appropriate. (As currently implemented, this causes a behaviour change on Win32 - the option -I/usr/include will now be filtered out.) The intended usage is for Debian to configure pkg-config with --with-system-include-path=/usr/include/$(DEB_HOST_GNU_TYPE):/usr/include and the corresponding library path, for multiarch support (<http://bugs.debian.org/482884>). Based on work by Colin Walters <walters@verbum.org>
2011-04-13Stop shipping an embedded glibTollef Fog Heen1-8/+1
Drop the embedded glib, the associated patches and adjust build scripts appropriately.
2010-06-15Build pkg-config before descending to check directoryDan Nicholson1-2/+2
To ensure that pkg-config has been built and updated before running the test suite, complete the top directory before descending to the check directory.
2010-05-23Distcheck fixespkg-config-0.24Tollef Fog Heen1-5/+3
Various small fixes to make distcheck pass
2010-05-09Optionally use an external popt libraryDan Nicholson1-1/+8
The one imported into pkg-config has seen very little maintenance, so let's give users the option to use the upstream version. The default is to use the included sources, but it can search for the system library using --with-installed-popt.
2010-05-09Move popt to subdirectory and make a convenience library of itDan Nicholson1-10/+6
This keeps a cleaner separation of the pkg-config sources and the imported popt sources.
2010-05-08Include an introductory guide to pkg-configDan Nicholson1-0/+2
The pkg-config(1) manual includes a lot of details behind pkg-config, but not the background and usage patterns. This guide tries to provide users and developers with a starting point for pkg-config.
2009-03-302009-03-30 Tollef Fog Heen <tfheen@err.no>Tollef Fog Heen1-2/+0
* partial-glib.[ch]: Get rid of those, they are no longer in use.
2007-12-292007-12-29 Tollef Fog Heen <tfheen@err.no>Tollef Fog Heen1-3/+3
* Update to glib 1.2.10, adjust lots of the glib patches. Gnome #81847.
2007-02-252007-02-25 Tollef Fog Heen <tfheen@err.no>Tollef Fog Heen1-1/+2
* Makefile.am: Add support for using the system glib. Thanks to Peter Breitenlohner for the bug and the patch. Freedesktop #9708 * configure.in: Add support for using the system glib. * glib-patches/no-dist-distclean-files.diff, glib-patches/automake-warning.diff, glib-patches/autoconf-warning.diff: Get rid of some warnings when configuring glib.
2005-12-28Only use -Wall and gcc-only flags with gcc.Tollef Fog Heen1-1/+1
2005-12-28 Tollef Fog Heen <tfheen@err.no> * configure.in, Makefile.am: Only use -Wall and other gcc-only flags when we don't have a set of CFLAGS already set and we're using gcc. Freedesktop #4888.
2005-08-27Add default CFLAGSTollef Fog Heen1-0/+1
2005-08-27 Tollef Fog Heen <tfheen@err.no> * Makefile.am (AM_CFLAGS): Add default CFLAGS
2005-07-142005-03-29 Tollef Fog Heen <tfheen@err.no>Arch Librarian1-1/+1
Author: tfheen Date: 2005-03-29 07:09:37 GMT 2005-03-29 Tollef Fog Heen <tfheen@err.no> * check/check-cflags, check/check-define-variable, check/check-libs, check/common, check/Makefile.am, check/simple.pc: Add simple test framework and begin writing tests. * Makefile.am, configure.in: Make in check/ as well.
2005-07-142005-03-18 Tollef Fog Heen <tfheen@err.no>Arch Librarian1-1/+1
Author: tfheen Date: 2005-03-26 14:59:26 GMT 2005-03-18 Tollef Fog Heen <tfheen@err.no> * main.c (main): Use add_search_dirs for both the compile-time defined pc_path and the run-time defined PKG_CONFIG_PATH. * pkg.h: Add prototype for add_search_dirs. * pkg.c (add_search_dirs): Add new function which takes a delimiter-separated list as input and add_search_dir's it. (package_init): Remove knowledge about which dirs should be initially added. Moved this to main.c(main) * ChangeLog: Add emacs variables to set the date to this ChangeLog's standard format * Makefile.am (INCLUDES): Pass PKG_CONFIG_PCPATH on to main.c * configure.in: Add --with-pc-path to define the default search path for .pc files. (Freedesktop #119, #648)
2005-07-142002-09-13 Tor Lillqvist <tml@iki.fi>Arch Librarian1-2/+2
Author: tml Date: 2002-09-12 20:47:07 GMT 2002-09-13 Tor Lillqvist <tml@iki.fi> * Makefile.am (USE_INSTALLED_GLIB): Seems that the automake version used by Havoc doesn't recognize pkg_config_CFLAGS and pkg_config_LDFLAGS, thus failing builds on Win32 directly from the tarball. Set included_glib_includes and pkg_config_LDADD instead, then, like in the !USE_INSTALLED_GLIB branch. * findme.c (X_OK): If X_OK undefined, define as 1, always, not only if G_OS_WIN32, which is never defined here. Fixes a corner case on Win32 with MSYS and mingw where configure as included in the release tarball for some reason doesn't find unistd.h.
2005-07-142001-10-21 Tor Lillqvist <tml@iki.fi>Arch Librarian1-1/+1
Author: tml Date: 2001-10-21 18:40:38 GMT 2001-10-21 Tor Lillqvist <tml@iki.fi> * Makefile.am (EXTRA_DIST): Distribute README.win32. * README.win32: Describe the behaviour in more detail.
2005-07-142001-09-30 Tor Lillqvist <tml@iki.fi>Arch Librarian1-2/+8
Author: tml Date: 2001-09-29 21:05:25 GMT 2001-09-30 Tor Lillqvist <tml@iki.fi> Changes for "pure" Win32 (without Cygwin or similar) support. The most important differences compared to pkg-config on Unix are: We don't use hardcoded PKGLIBDIR paths but deduce the installation prefix at runtime. Use the normal GLib DLL, not a private copy. Yes, this does introduce a circular dependency, but that can be worked around. * README.win32: New file. * configure.in: Check for Win32. If so, define USE_INSTALLED_GLIB, and don't configure in the included glib-1.2.8. Set GLIB_CFLAGS and GLIB_LIBS assuming that GLib is installed in the same location pkgconfig will be. Check for dirent.h, unistd.h and sys/wait.h headers. * Makefile.am: If USE_INSTALLED_GLIB, use the GLIB_* values set above, and don't make in the glib-1.2.8 subdir. * autogen.sh: Use perl -p -i.bak, works better on Win32 (and Cygwin). * *.c: Conditionalize inclusions of unistd.h and sys/wait.h. * findme.c: Define X_OK on Win32 if necessary. * parse.c * popthelp.c: Minor Win32 portability ifdefs. * parse.c: No need to include <windows.h>. * pkg.c: Don't hardcode PKGLIBDIR, but use g_win32_get_package_installation_directory() to deduce it. (scan_dir): Make a temp copy of dirname with potential superfluous trailing slash removed. The Win32 opendir implementation doesn't always like those. * pkg.h: If USE_INSTALLED_GLIB, include <glib.h> instead of partial-glib.h. * popt.c (execCommand): Don't compile on Win32. * poptconfig.c (configLine): Don't bother with the "exec" stuff on Win32, too complex to port, at least for now. (poptReadDefaultConfig) Don't bother compiling on Win32, this function isn't even called.
2005-07-14importArch Librarian1-0/+30
Author: hp Date: 2001-06-05 16:39:09 GMT import
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-28 16:06:40 +0000