summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-05-10popt: Reset long argument handling before iterating to next argumentHEADmasterBryan Kadzban1-0/+2
From the LFS mailing list looking into why check-cmd-options fails using the bundled popt: poptGetNextOption, after it invokes the callback for --define-variable=a=b (the operation of which sets the longArg local variable), does not reset longArg to NULL. So on the next time through its loop (after invoking the --define-variable callback, before invoking the --atleast-pkgconfig-version callback), on line 389 of popt.c, sets con->os->nextArg to longArg (the old "a=b" string). What it should do is set nextArg to nextCharArg (the next item on the command line). This happens if longArg is NULL. http://linuxfromscratch.org/pipermail/lfs-dev/2011-September/065065.html Freedesktop #9584
2012-05-10glib: Keep a few more programs from being installed or generatedDan Nicholson4-59/+42
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-05-10glib: Update snapshot to 2.32.2Dan Nicholson42-234/+370
A libelf pkg-config check creeped in, but it's only used in gio so we can remove the libelf check completely.
2012-05-10Document a couple more pkg-config optionsDan Nicholson1-1/+12
2012-05-10Fix errors in man page source cause missing contentLawrence A. Murakami1-1/+3
Freedesktop #29011
2012-05-10Unify handling of operator and command line option version checkingDan Nicholson3-29/+128
The code for --exact/atleast/max-version was taking a different path than the handling of operators like =/>=/<=. Make the long option versions override the operators and take place during the standard package checking stage. This also means that --print-errors is respected. Fixes Freedesktop #8653
2012-05-10Add autoconf macros to help packagers install .pc filesDan Nicholson1-0/+40
Some distros and users have unusual installation needs that don't conform to the standard $libdir/pkgconfig and $datadir/pkgconfig pathways. Help packagers support these users with the macros PKG_INSTALLDIR and PKG_NOARCH_INSTALLDIR. These are simple macros that provide the configure parameters --with-pkgconfigdir and --with-noarch-pkgconfigdir to allow users to override the standard locations. Freedesktop #48743
2012-05-05Revert "Print out \r\n on windows, not just \n"Dieter Verfaillie1-4/+0
This reverts commit 25e8ca84acd7fc604fbc59213587887d5119d51a. This was working around a bug with mingw/msys shell which seems to be fixed now. Freedesktop #17053
2012-04-21Document building with the internal glib copyDan Nicholson1-4/+7
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 Nicholson2-7/+26
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.
2012-04-21glib: Avoid pkg-config usage in bundled libraryDan Nicholson3-25/+53
The whole exercise of carrying an internal copy of glib to avoid the circular dependency is moot if it's still using pkg-config.
2012-04-21glib: Don't build GRegex or distribute pcreDan Nicholson5-82/+163
In order to avoid the bundled pcre in our bundled glib, just remove and disable the GRegex API. We don't currently need this in pkg-config anyway.
2012-04-21glib: Set automake to foreign so it doesn't bomb on missing filesDan Nicholson3-2/+15
2012-04-21glib: Don't install anything from the bundled libraryDan Nicholson3-45/+140
All we want is the libglib.la convenience library. The -version-info is removed since it causes warnings.
2012-04-21glib: Remove as many unneeded files as possibleDan Nicholson6-211/+370
We just want to be able to build glib from the within the pkg-config tree. Everything else is just extra weight and is better used from an actual glib checkout. Unnecessary files include: * documentation * translations * tests * ChangeLogs * non-autotools win32 build files * various other build and/or internal files
2012-04-21glib: Bundle snapshot of glib-2.0Dan Nicholson255-0/+207331
Add a snapshot of the current stable version of glib, glib-2.32.0. Since we only need the glib library, a lot of files are removed. See the README and update-glib.sh files in glib-patches for details.
2012-04-21glib: Add a script to take a snapshot of glib-2.0Dan Nicholson3-0/+126
Grab a snapshot of a tag from a local glib checkout, remove a bunch of files and apply some patches. The idea is to make the snapshot of glib be repeatable.
2012-04-16Remove unused roff macros causing problems on old groff/nroffDan Nicholson1-19/+0
The DW and EW roff macros had been used to suppress warnings around the documentation on the now removed Windows registry keys. These macro definitions are unneeded and cause problems with older groff and nroff versions. Numerous patches exist around the web to remove them. I confirmed this with an old nroff from the Heirloom project. Fixes Freedesktop #5214
2011-09-20Fix typo in configure.ac which led to confusing error messages from configureTollef Fog Heen1-1/+1
2011-05-16Document how to build with circular build-deps.Tollef Fog Heen1-1/+9
Freedesktop #37266
2011-05-15Drop AM_MAINTAINER_MODEpkg-config-0.26Tollef Fog Heen1-1/+0
2011-05-15Run distcheck against installed poptTollef Fog Heen1-0/+1
2011-05-15Document changes for 0.26, bump versionTollef Fog Heen2-1/+17
2011-05-15Allow documented environment variables in autoconfEnrico Scholz1-1/+2
It might be useful to write something like sdkflags=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server` in configure.ac macros. Unfortunately, this will be blocked because 'PKG_CONFIG_SYSROOT' is a forbidden m4 pattern. This patch extends the list of allowed pattern by the names of documented pkg-config environment variables.
2011-05-15Only treat real files (or symlinks to real files) as .pc filesTollef Fog Heen1-7/+11
Ignore any dangling symlinks. Thanks to Ciaran Anscomb for patch inspiration. Fixes Freedesktop #23922
2011-05-15Ignore emacs backup filesTollef Fog Heen1-0/+1
2011-05-15Drop dead codeTollef Fog Heen3-109/+0
2011-05-15Document specifying paths to .pc filesTollef Fog Heen1-0/+4
Thanks to Binki for the patch Freedesktop #32622
2011-04-14Escape slashes in paths passed to mingw-gccРуслан Ижбулатов2-1/+11
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 McVittie3-33/+84
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-13Add _LIBDIR to m4_pattern_allow tooTollef Fog Heen1-1/+1
Fixes Debian #398901
2011-04-13Allow $() through unescaped.Tollef Fog Heen3-3/+5
$(foo) is used for make escapes, so allow them through. Freedesktop #33920
2011-04-13Handle --exist working and --cflags or --libs failingTollef Fog Heen1-3/+4
--exists no longer does a full depth traversal, which means we need to pay attention to the exit status when calling pkg-config --libs and --cflags. If those fail, we run with --cflags and --libs to get the error message before printing it out. Fixes Freedesktop #36039
2011-04-13Mention that auto* recommends building .pc files at build timeTollef Fog Heen1-2/+5
Fixes Freedesktop #32094
2011-04-13Rename configure.in to configure.acTollef Fog Heen1-0/+0
2011-04-13Fix C99-ismHauke Fath1-3/+5
Old NetBSD versions don't have a C99 compiler, so get rid a C99ism for their benefit.
2011-04-13Man page syntax and spelling fixes.Ville Skyttä1-8/+8
2011-04-13Stop shipping an embedded glibTollef Fog Heen22-4251/+13
Drop the embedded glib, the associated patches and adjust build scripts appropriately.
2010-09-01Drop support for legacy -config scriptsTollef Fog Heen3-353/+4
We used to call gnome-config, gtk-config, glib-config and so on, which was useful in the beginning of pkg-config. This hasn't served any practical purpose in recent years, so drop the support.
2010-08-19Add some []s before dnlTollef Fog Heen1-2/+2
Autoconf 2.66 has some problems with missing []s before dnls, causing the expanded text to be garbled. Fixes #29056
2010-06-17Force generation of libtool script so it can be used reliablyDan Nicholson2-0/+3
We want to use the libtool script to determine if indirect dependencies should be listed. LT_OUTPUT forces the script to be created immediately so that the test can be run reliably. This is borrowed from glib's configure.in.
2010-06-16Add test to exercise broken command option handlingDan Nicholson2-1/+35
The ancient bundled popt mishandles some cases of option parsing. http://lists.freedesktop.org/archives/pkg-config/2010-March/000508.html Add a test program to exercise it. This should encourage people to use an external popt until we have a better fix.
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-06-09Greatly simplify autogen.sh and fix configure skippingDan Nicholson1-75/+6
There is really no reason to manually vet and run all the autotools. That's what autoreconf is for. It has the added bonus that it will descend to the glib subdirectory and rebuild the autotools there. The handling of configure is also fixed as the previous --no-configure code was completely broken. This is basically the xorg autogen.sh, so we can be pretty confident it'll work as advertised.
2010-05-28Bump version number to 0.25pkg-config-0.25Tollef Fog Heen1-1/+1
2010-05-28Document 0.25 changesTollef Fog Heen1-0/+13