diff -ruNp pkgconfig-0.15.0~/ChangeLog pkgconfig-0.15.0/ChangeLog --- pkgconfig-0.15.0~/ChangeLog 2003-01-16 21:07:37.000000000 +0000 +++ pkgconfig-0.15.0/ChangeLog 2004-02-02 12:18:31.000000000 +0000 @@ -0,0 +1,28 @@ +2004-01-27 Scott James Remnant + + Improve pkg-config's configure instructure and bring it bang + up to date. + + * pkg.m4: Complete rewrite. + (PKG_PROG_PKG_CONFIG): if PKG_CONFIG not defined, find the + pkg-config in the path or $host-pkg-config if cross-compiling, + check that is of at least version 0.9.0 or one given. + (_PKG_CONFIG): internal macro to call pkg-config. + (PKG_CHECK_MODULES): same semantics as the previous incarnation + except you can prevent pkg-config from being called by defining + xxx_CFLAGS and xxx_LIBS yourself, additionally all results are + cached. + * pkg-configize.in: New script to place pkg.m4 in the software's + AC_CONFIG_MACRO_DIR directory, the new way of doing things. + * pkg-configize.1: Manual page for the new script. + * Makefile.am (m4dir): Redefined to be $pkgdatadir/m4. + (aclocaldir): Defined to be the old $datadir/aclocal location. + (aclocal_DATA): Place a copy of pkg.m4 here, until it goes away. + (bin_SCRIPTS): Add pkg-configize. + (EXTRA_DIST): Add pkg-configize. + (CLEANFILES): Add pkg-configize. + (pkg-configize): Generate pkg-configize from pkg-configize.in by + calling config.status to expand AC_SUBST variables. + (man_MANS): Install the new manual page. + * configure.in: AC_SUBST pkgdatadir, defined correctly. + diff -ruNp pkgconfig-0.15.0~/pkg.m4 pkgconfig-0.15.0/pkg.m4 --- pkgconfig-0.15.0~/pkg.m4 2002-02-03 17:16:48.000000000 +0000 +++ pkgconfig-0.15.0/pkg.m4 2004-02-02 12:13:58.000000000 +0000 @@ -1,57 +1,109 @@ - -dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) -dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page -dnl also defines GSTUFF_PKG_ERRORS on error -AC_DEFUN(PKG_CHECK_MODULES, [ - succeeded=no - - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - AC_MSG_CHECKING(for $2) - - if $PKG_CONFIG --exists "$2" ; then - AC_MSG_RESULT(yes) - succeeded=yes - - AC_MSG_CHECKING($1_CFLAGS) - $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` - AC_MSG_RESULT($$1_CFLAGS) - - AC_MSG_CHECKING($1_LIBS) - $1_LIBS=`$PKG_CONFIG --libs "$2"` - AC_MSG_RESULT($$1_LIBS) - else - $1_CFLAGS="" - $1_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - ifelse([$4], ,echo $$1_PKG_ERRORS,) - fi - - AC_SUBST($1_CFLAGS) - AC_SUBST($1_LIBS) - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi - - if test $succeeded = yes; then - ifelse([$3], , :, [$3]) - else - ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) - fi -]) - - +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# +# Copyright (C) 2004 Red Hat Inc. +# Written by Scott James Remnant . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# serial 1 + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_ifval([$1], [$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi + +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test "x$ac_cv_env_[]$1[]_set" = "xset"; then + pkg_cv_[]$1=$ac_cv_env_[]$1[]_value +elif test -n "$PKG_CONFIG"; then + if $PKG_CONFIG --exists "$3" >/dev/null 2>&1; then + pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + else + pkg_failed=yes + fi +else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1[]_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1[]_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_CACHE_CHECK([for $1[]_CFLAGS], [pkg_cv_[]$1[]_CFLAGS], + [_PKG_CONFIG([$1[]_CFLAGS], [cflags], [[$2]])]) +AC_CACHE_CHECK([for $1[]_LIBS], [pkg_cv_[]$1[]_LIBS], + [_PKG_CONFIG([$1[]_LIBS], [libs], [[$2]])]) + +if test $pkg_failed = yes; then + # --errors-to-stdout seems to not do anything ;-) + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD + + ifelse([$4], , [AC_MSG_ERROR(dnl +[[The library requirements ($2) were not met. +You may need to adjust or set the PKG_CONFIG_PATH environment variable +if your libraries are in unusual places so pkg-config can find them. + +Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables +to avoid the need to call pkg-config.]])], + [$4]) +elif test $pkg_failed = untried; then + ifelse([$4], , [AC_MSG_FAILURE(dnl +[[The pkg-config script could not be found or is too old. +Make sure it is in your PATH or set the PKG_CONFIG environment variable +to the full path to pkg-config. + +Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables +to avoid the need to call pkg-config. + +To get pkg-config, see .]])], + [$4]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + ifelse([$3], , :, [$3]) +fi[]dnl +])# PKG_CHECK_MODULES diff -ruNp pkgconfig-0.15.0~/pkg-configize.in pkgconfig-0.15.0/pkg-configize.in --- pkgconfig-0.15.0~/pkg-configize.in 1970-01-01 01:00:00.000000000 +0100 +++ pkgconfig-0.15.0/pkg-configize.in 2004-02-02 12:14:51.000000000 +0000 @@ -0,0 +1,221 @@ +#!/bin/sh +# Copyright (C) 2004 Red Hat Inc. +# Written by Scott James Remnant . +# +# Loosely based (at least in spirit) on libtoolize.in +# Copyright (C) 2003, 2004 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Usage: pkg-configize [OPTION]... +# +# Prepare a package to use pkg-config. +# +# -c, --copy copy files rather than symlinking them +# --debug enable verbose shell tracing +# -n, --dry-run print commands rather than running them +# --help display this message and exit +# -q, --quiet work silently +# -v, --verbose verbosely report processing +# +# You must run pkg-configize from the top-level source directory of +# your software. + +copy_opt=false +dry_run_opt=false +quiet_opt=false +verbose_opt=false + +prefix=@prefix@ +datadir=@datadir@ +pkgdatadir=@pkgdatadir@ +pkgmacrodir="$pkgdatadir/m4" + +macro_files=pkg.m4 + +: ${CP="cp -f"} +: ${RM="rm -f"} +: ${LN_S="ln -s"} +: ${MKDIR="mkdir"} + +# Parse arguments +while [ $# -gt 0 ]; do + case $1 in + --copy | -c) + copy_opt=true + shift + ;; + --debug) + set -x + shift + ;; + --dry-run | -n) + dry_run_opt=true + shift + ;; + --quiet | -q) + quiet_opt=true + shift + ;; + --verbose | -v) + verbose_opt=true + shift + ;; + -[cnqv]*) + opt=$(echo $1 | sed -e '1s/^-\(.\).*$/-\1/;q') + rest=$(echo $1 | sed -e '1s/^-.\(.*\)$/-\1/;q') + shift + set -- "$opt" "$rest" ${1+"$@"} + ;; + --help) + sed -e '/^# Usage:/,/^$/{s/^# //;s/^# *//;p};d' <$0 + exit 0 + ;; + --) + shift + break + ;; + -*) + echo "unrecognized option \`$1'" 1>&2 + echo "Try \`$0 --help\' for more information." 1>&2 + exit 1 + ;; + *) + echo "too many arguments" 1>&2 + echo "Try \`$0 --help\' for more information." 1>&2 + exit 1 + ;; + esac +done + +if $dry_run_opt; then + CP="echo $CP" + RM="echo $RM" + LN_S="echo $LN_S" + MKDIR="echo $MKDIR" +fi + +if $copy_opt; then + copy="$CP" +else + copy="$LN_S" +fi + +mkdir_p () +{ + my_dir=$1 + my_dirs= + + while test ! -d "$my_dir"; do + my_dirs="$my_dir $my_dirs" + case $my_dir in */*) ;; *) break ;; esac + my_dir=$(echo "$my_dir" | sed -e 's,/[^/]*$,,') + done + [ ! -n "$my_dirs" ] || $MKDIR $my_dirs +} + +# Where's the configure source? +$verbose_opt && echo "Checking for configure.ac or configure.in." +[ -f configure.ac ] && configure_ac=configure.ac +[ -f configure.in ] && configure_ac=configure.in +if [ -z "$configure_ac" ]; then + echo "pkg-configize must be run from the top-level src directory." 1>&2 + exit 1 +fi + +# Really Autoconf? +$verbose_opt && echo "Checking $configure_ac calls AC_INIT" +ac_init=$(sed -e 's/#.*$//;s/^dnl .*$//;s/ dnl .*$//;/AC_INIT/{p};d' \ + $configure_ac) +if [ -z "$ac_init" ]; then + echo "$configure_ac: no call to AC_INIT" 1>&2 + exit 1 +fi + +# What else should we be looking in? +$verbose_opt && echo "Looking for other m4 sources" +[ -f acinclude.m4 ] && acinclude_m4=acinclude.m4 +[ -f aclocal.m4 ] && aclocal_m4=aclocal.m4 +if [ -n "$aclocal_m4" ]; then + m4_included=$(sed -e 's/#.*$//;s/^dnl .*$//;s/ dnl .*$//; + /m4_include/{ + s/^.*m4_include([[ ]*\([^])]*\).*$/\1/;p + }; + d' $configure_ac $aclocal_m4 $acinclude_m4) +fi +m4_sources="$configure_ac $aclocal_m4 $acinclude_m4 $m4_included" +$verbose_opt && echo "found: $m4_sources" + +# Are they using pkg-config? +$verbose_opt && echo "Checking source uses pkg-config" +ac_calls=$(sed -e 's/#.*$//;s/^dnl .*$//;s/ dnl .*$//; + /PKG_PROG_PKG_CONFIG/{p}; + /PKG_CHECK_MODULES/{p}; + d' $m4_sources) +if [ -z "$ac_calls" ]; then + echo "$configure_ac: not using pkg-config" 1>&2 + exit 1 +fi + +# Where do we put pkg.m4? +$verbose_opt && echo "Looking for macro directory location" +ac_macro_dir=$(sed -e 's/#.*$//;s/^dnl .*$//;s/ dnl .*$//; + /AC_CONFIG_MACRO_DIR/{ + s/^.*AC_CONFIG_MACRO_DIR([[ ]*\([^])]*\).*$/\1/;q + }; + d' $m4_sources) +if [ -z "$ac_macro_dir" ] && [ -f Makefile.am ]; then + $verbose_opt && echo "looking in Makefile.am" + aclocal_args=$(sed -e '/^[ ]*ACLOCAL_[A-Z_]*FLAGS[ ]*=/{ + s/^[^=]*=[ ]*//;q};d' Makefile.am) + _ac_macro_dir_is_next=false + for arg in $aclocal_args; do + if $_ac_macro_dir_is_next; then + ac_macro_dir="$arg" + break + fi + if [ "x$arg" = "x-I" ]; then + _ac_macro_dir_is_next=true + else + _ac_macro_dir_is_next=false + fi + done +fi +[ -z "$ac_macro_dir" ] && ac_macro_dir=. +$verbose_opt && echo "found: $ac_macro_dir" + +# Copy our m4 file into the right place +exit_status=0 +$quiet_opt || [ "$ac_macro_dir" = "." ] \ + || echo "putting macros in AC_CONFIG_MACRO_DIR \`$ac_macro_dir'." +mkdir_p $ac_macro_dir +for macro_file in $macro_files; do + $RM "$ac_macro_dir/$macro_file" + $quiet_opt || echo "copying file \`$macro_file'" + if $copy "$pkgmacrodir/$macro_file" "$ac_macro_dir/$macro_file"; then + : + else + echo "could not copy \`$pkgmacrodir/macro_file' to" \ + "\`$ac_macro_dir/$macro_file'" 1>&2 + exit_status=1 + fi +done + +exit $exit_status diff -ruNp pkgconfig-0.15.0~/README pkgconfig-0.15.0/README --- pkgconfig-0.15.0~/README 2002-09-06 21:00:08.000000000 +0100 +++ pkgconfig-0.15.0/README 2004-02-02 12:17:00.000000000 +0000 @@ -6,20 +6,26 @@ gnome-specific but gnome.org was a conve To use pkg-config, do something like the following in your configure.in - PKG_CHECK_MODULES(GNOME, gtk > 1.2.8 gnomeui >= 1.2.0) - AC_SUBST(GNOME_CFLAGS) - AC_SUBST(GNOME_LIBS) + PKG_CHECK_MODULES([GNOME], [gtk > 1.2.8 gnomeui >= 1.2.0]) This puts the neccesary include flags to compile/link something against libgnomeui and all its dependencies in $(GNOME_CFLAGS), and the -L/-l flags -for linking in $(GNOME_LIBS) +for linking in $(GNOME_LIBS). + +Users can define the PKG_CONFIG environment variable to point at the +right one, or if they cross-compile and have a correctly named pkg-config +(eg. arm-linux-pkg-config) in their PATH that will be used in preference. + +Users can also define the GNOME_CFLAGS and GNOME_LIBS environment variables +if they think they know better, pkg-config will not be called if they do +that. The "gtk > 1.2.8" part is only neccesary if you want to specifically check if libgtk is version 1.2.8 or higher. Otherwise, the flags for gtk will be included automatically, since libgnomeui depends on gtk. So you could just say: - PKG_CHECK_MODULES(GNOME, gnomeui) + PKG_CHECK_MODULES([GNOME], [gnomeui]) for any version of gnomeui. diff -ruNp pkgconfig-0.15.0~/pkg-config.1 pkgconfig-0.15.0/pkg-config.1 --- pkgconfig-0.15.0~/pkg-config.1 2003-01-16 21:07:09.000000000 +0000 +++ pkgconfig-0.15.0/pkg-config.1 2004-02-02 12:16:31.000000000 +0000 @@ -252,12 +252,12 @@ files. .SH AUTOCONF MACROS .TP -.I "PKG_CHECK_MODULES(VARIABLEBASE,MODULELIST[,ACTION-IF-FOUND,[ACTION-IF-NOT-FOUND]])" +.I "PKG_CHECK_MODULES(VARIABLE-PREFIX,MODULES[,ACTION-IF-FOUND,[ACTION-IF-NOT-FOUND]])" The macro PKG_CHECK_MODULES can be used in \fIconfigure.in\fP to check whether modules exist. A typical usage would be: .nf - PKG_CHECK_MODULES(MYSTUFF, gtk+-2.0 >= 1.3.5 libxml = 1.8.4) + PKG_CHECK_MODULES([MYSTUFF], [gtk+-2.0 >= 1.3.5 libxml = 1.8.4]) .fi This would result in MYSTUFF_LIBS and MYSTUFF_CFLAGS substitution @@ -269,11 +269,10 @@ error messages if you specify your own A However, it will set the variable MYSTUFF_PKG_ERRORS, which you can use to display what went wrong. -If you want to use MYSTUFF_LIBS and MYSTUFF_CFLAGS as Makefile.am -variables (i.e. $(MYSTUFF_LIBS)) then you have to add -AC_SUBST(MYSTUFF_LIBS) to your configure.in so automake can find the -variable. You don't need to do this if you use the @MYSTUFF_LIBS@ -syntax in your Makefile.am instead of $(MYSTUFF_LIBS). +.I "PKG_PROG_PKG_CONFIG([MIN-VERSION])" + +Defines the PKG_CONFIG variable to the best pkg-config available, +useful if you need pkg-config but don't want to use PKG_CHECK_MODULES. .SH METADATA FILE SYNTAX To add a library to the set of packages \fIpkg-config\fP knows about, diff -ruNp pkgconfig-0.15.0~/pkg-configize.1 pkgconfig-0.15.0/pkg-configize.1 --- pkgconfig-0.15.0~/pkg-configize.1 1970-01-01 01:00:00.000000000 +0100 +++ pkgconfig-0.15.0/pkg-configize.1 2004-02-02 12:13:49.000000000 +0000 @@ -0,0 +1,55 @@ +.\" +.\" pkg-configize manual page. +.\" (C) Red Hat, Inc. based on gnome-config man page (C) Miguel de Icaza (miguel@gnu.org) +.\" +.TH pkg-configize 1 +.SH NAME +pkg-configiize \- add pkg-config support to your package +.SH SYNOPSIS +.PP +.B pkg-configize +[\-\-help] [\-\-copy] [\-\-debug] [\-\-dry\-run] +[\-\-quiet] [\-\-verbose] +.SH DESCRIPTION + +The \fIpkg-configize\fP program provides a standard way to add +pkg-config support to your package. + +.SH OPTIONS +The following options are supported: +.TP +.I "--help" +Displays a help message and terminates. + +.TP +.I "--copy", "-c" +Copy files from the \fIpkg-config\fP macro directory rather than +creating symlinks. + +.TP +.I "--debug" +Enable verbose shell tracing. + +.TP +.I "--dry-run", "-n" +Don't run commands that modify the file system, just print them out. + +.TP +.I "--quiet", "-q" +Works silently. + +.TP +.I "--verbose" or "-v" +Verbosely reports what it is doing. + +.PP +You must run \fIpkg-configize\fP from the top-level source directory +of your package. + +.SH AUTHOR + +\fIpkg-configize\fP was written by Scott James Remnant. + +.SH BUGS +Plenty. + diff -ruNp pkgconfig-0.15.0~/configure.in pkgconfig-0.15.0/configure.in --- pkgconfig-0.15.0~/configure.in 2003-01-16 21:07:31.000000000 +0000 +++ pkgconfig-0.15.0/configure.in 2004-02-02 12:13:49.000000000 +0000 @@ -48,4 +48,8 @@ AC_FUNC_ALLOCA AC_CHECK_FUNCS(setresuid setreuid,break) AC_CHECK_HEADERS([dirent.h unistd.h sys/wait.h]) +# pkg-configize.in needs this +pkgdatadir='${datadir}'"/${PACKAGE}" +AC_SUBST([pkgdatadir]) + AC_OUTPUT([Makefile]) diff -ruNp pkgconfig-0.15.0~/Makefile.am pkgconfig-0.15.0/Makefile.am --- pkgconfig-0.15.0~/Makefile.am 2002-09-12 21:47:07.000000000 +0100 +++ pkgconfig-0.15.0/Makefile.am 2004-02-02 12:13:49.000000000 +0000 @@ -7,13 +7,19 @@ included_glib_includes = -I./glib-1.2.8 pkg_config_LDADD=glib-1.2.8/libglib.la endif -m4dir = $(datadir)/aclocal +m4dir = $(pkgdatadir)/m4 m4_DATA = pkg.m4 -man_MANS = pkg-config.1 -EXTRA_DIST = $(m4_DATA) $(man_MANS) README.win32 +# One day, this will go away +aclocaldir = $(datadir)/aclocal +aclocal_DATA = pkg.m4 + +man_MANS = pkg-config.1 pkg-configize.1 +EXTRA_DIST = $(m4_DATA) $(man_MANS) README.win32 pkg-configize.in +CLEANFILES = pkg-configize bin_PROGRAMS = pkg-config +bin_SCRIPTS = pkg-configize INCLUDES=-DPKGLIBDIR="\"$(pkglibdir)\"" $(included_glib_includes) @@ -34,3 +40,7 @@ pkg_config_SOURCES= \ poptint.h \ poptparse.c +pkg-configize: $(srcdir)/pkg-configize $(top_builddir)/config.status + CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_COMMANDS= $(SHELL) \ + $(top_builddir)/config.status + chmod a+x $@ diff -ruNp pkgconfig-0.15.0~/configure pkgconfig-0.15.0/configure --- pkgconfig-0.15.0~/configure 2003-01-16 21:09:17.000000000 +0000 +++ pkgconfig-0.15.0/configure 2004-02-02 12:13:49.000000000 +0000 @@ -5904,6 +5904,10 @@ fi done +# pkg-configize.in needs this +pkgdatadir='${datadir}'"/${PACKAGE}" + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -6076,6 +6080,7 @@ s%@GLIB_LIBS@%$GLIB_LIBS%g s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g s%@subdirs@%$subdirs%g s%@ALLOCA@%$ALLOCA%g +s%@pkgdatadir@%$pkgdatadir%g CEOF EOF diff -ruNp pkgconfig-0.15.0~/Makefile.in pkgconfig-0.15.0/Makefile.in --- pkgconfig-0.15.0~/Makefile.in 2003-01-16 21:09:56.000000000 +0000 +++ pkgconfig-0.15.0/Makefile.in 2004-02-02 12:13:49.000000000 +0000 @@ -76,38 +76,30 @@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ STRIP = @STRIP@ VERSION = @VERSION@ -@USE_INSTALLED_GLIB_TRUE@included_glib_includes = @USE_INSTALLED_GLIB_TRUE@@GLIB_CFLAGS@ -@USE_INSTALLED_GLIB_FALSE@included_glib_includes = @USE_INSTALLED_GLIB_FALSE@-I./glib-1.2.8 -@USE_INSTALLED_GLIB_TRUE@pkg_config_LDADD = @USE_INSTALLED_GLIB_TRUE@@GLIB_LIBS@ -@USE_INSTALLED_GLIB_FALSE@pkg_config_LDADD = @USE_INSTALLED_GLIB_FALSE@glib-1.2.8/libglib.la -@USE_INSTALLED_GLIB_FALSE@SUBDIRS = @USE_INSTALLED_GLIB_FALSE@glib-1.2.8 +pkgdatadir = @pkgdatadir@ +@USE_INSTALLED_GLIB_TRUE@included_glib_includes = @GLIB_CFLAGS@ +@USE_INSTALLED_GLIB_FALSE@included_glib_includes = -I./glib-1.2.8 +@USE_INSTALLED_GLIB_TRUE@pkg_config_LDADD = @GLIB_LIBS@ +@USE_INSTALLED_GLIB_FALSE@pkg_config_LDADD = glib-1.2.8/libglib.la +@USE_INSTALLED_GLIB_FALSE@SUBDIRS = glib-1.2.8 -m4dir = $(datadir)/aclocal +m4dir = $(pkgdatadir)/m4 m4_DATA = pkg.m4 -man_MANS = pkg-config.1 -EXTRA_DIST = $(m4_DATA) $(man_MANS) README.win32 +# One day, this will go away +aclocaldir = $(datadir)/aclocal +aclocal_DATA = pkg.m4 + +man_MANS = pkg-config.1 pkg-configize.1 +EXTRA_DIST = $(m4_DATA) $(man_MANS) README.win32 pkg-configize.in +CLEANFILES = pkg-configize bin_PROGRAMS = pkg-config +bin_SCRIPTS = pkg-configize INCLUDES = -DPKGLIBDIR="\"$(pkglibdir)\"" $(included_glib_includes) -pkg_config_SOURCES = \ - pkg.h \ - pkg.c \ - partial-glib.h \ - partial-glib.c \ - parse.h \ - parse.c \ - main.c \ - findme.c \ - findme.h \ - popt.c \ - popt.h \ - poptconfig.c \ - popthelp.c \ - poptint.h \ - poptparse.c +pkg_config_SOURCES = pkg.h pkg.c partial-glib.h partial-glib.c parse.h parse.c main.c findme.c findme.h popt.c popt.h poptconfig.c popthelp.c poptint.h poptparse.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -128,6 +120,8 @@ poptconfig.$(OBJEXT) popthelp.$(OBJEXT) @USE_INSTALLED_GLIB_FALSE@glib-1.2.8/libglib.la @USE_INSTALLED_GLIB_TRUE@pkg_config_DEPENDENCIES = pkg_config_LDFLAGS = +SCRIPTS = $(bin_SCRIPTS) + CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -137,7 +131,7 @@ man1dir = $(mandir)/man1 MANS = $(man_MANS) NROFF = nroff -DATA = $(m4_DATA) +DATA = $(aclocal_DATA) $(m4_DATA) DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ Makefile.am Makefile.in NEWS acconfig.h aclocal.m4 config.guess \ @@ -147,9 +141,12 @@ missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best DIST_SUBDIRS = glib-1.2.8 +DEP_FILES = .deps/findme.P .deps/main.P .deps/parse.P \ +.deps/partial-glib.P .deps/pkg.P .deps/popt.P .deps/poptconfig.P \ +.deps/popthelp.P .deps/poptparse.P SOURCES = $(pkg_config_SOURCES) OBJECTS = $(pkg_config_OBJECTS) @@ -157,9 +154,9 @@ all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .obj .s $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -224,9 +221,6 @@ uninstall-binPROGRAMS: rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done -.c.o: - $(COMPILE) -c $< - # FIXME: We should only use cygpath when building on Windows, # and only if it is available. .c.obj: @@ -249,9 +243,6 @@ distclean-compile: maintainer-clean-compile: -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< @@ -272,6 +263,25 @@ pkg-config$(EXEEXT): $(pkg_config_OBJECT @rm -f pkg-config$(EXEEXT) $(LINK) $(pkg_config_LDFLAGS) $(pkg_config_OBJECTS) $(pkg_config_LDADD) $(LIBS) +install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + if test -f $$p; then \ + echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + else if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + else :; fi; fi; \ + done + +uninstall-binSCRIPTS: + @$(NORMAL_UNINSTALL) + list='$(bin_SCRIPTS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + done + install-man1: $(mkinstalldirs) $(DESTDIR)$(man1dir) @list='$(man1_MANS)'; \ @@ -311,6 +321,25 @@ uninstall-man: @$(NORMAL_UNINSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-man1 +install-aclocalDATA: $(aclocal_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(aclocaldir) + @list='$(aclocal_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(aclocaldir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(aclocaldir)/$$p; \ + else if test -f $$p; then \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(aclocaldir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(aclocaldir)/$$p; \ + fi; fi; \ + done + +uninstall-aclocalDATA: + @$(NORMAL_UNINSTALL) + list='$(aclocal_DATA)'; for p in $$list; do \ + rm -f $(DESTDIR)$(aclocaldir)/$$p; \ + done + install-m4DATA: $(m4_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(m4dir) @@ -408,7 +437,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)) mostlyclean-tags: @@ -457,6 +486,11 @@ distdir: $(DISTFILES) -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -478,6 +512,37 @@ distdir: $(DISTFILES) fi; \ done +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-recursive dvi-am: @@ -489,30 +554,33 @@ installcheck: installcheck-recursive all-recursive-am: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive -install-exec-am: install-binPROGRAMS +install-exec-am: install-binPROGRAMS install-binSCRIPTS install-exec: install-exec-recursive -install-data-am: install-man install-m4DATA +install-data-am: install-man install-aclocalDATA install-m4DATA install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive -uninstall-am: uninstall-binPROGRAMS uninstall-man uninstall-m4DATA +uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-man \ + uninstall-aclocalDATA uninstall-m4DATA uninstall: uninstall-recursive -all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h +all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) config.h all-redirect: all-recursive-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 \ + $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) \ + $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(aclocaldir) \ $(DESTDIR)$(m4dir) mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) @@ -521,18 +589,18 @@ distclean-generic: maintainer-clean-generic: mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \ mostlyclean-compile mostlyclean-libtool \ - mostlyclean-tags mostlyclean-generic + mostlyclean-tags mostlyclean-depend mostlyclean-generic mostlyclean: mostlyclean-recursive clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-libtool \ - clean-tags clean-generic mostlyclean-am + clean-tags clean-depend clean-generic mostlyclean-am clean: clean-recursive distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am + distclean-libtool distclean-tags distclean-depend \ + distclean-generic clean-am -rm -f libtool distclean: distclean-recursive @@ -540,8 +608,8 @@ distclean: distclean-recursive maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -553,21 +621,30 @@ mostlyclean-binPROGRAMS distclean-binPRO maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ -clean-libtool maintainer-clean-libtool install-man1 uninstall-man1 \ -install-man uninstall-man uninstall-m4DATA install-m4DATA \ -install-data-recursive uninstall-data-recursive install-exec-recursive \ +clean-libtool maintainer-clean-libtool uninstall-binSCRIPTS \ +install-binSCRIPTS install-man1 uninstall-man1 install-man \ +uninstall-man uninstall-aclocalDATA install-aclocalDATA \ +uninstall-m4DATA install-m4DATA install-data-recursive \ +uninstall-data-recursive install-exec-recursive \ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ all-recursive check-recursive installcheck-recursive info-recursive \ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \ -install-exec-am install-exec install-data-am install-data install-am \ -install uninstall-am uninstall all-redirect all-am all installdirs-am \ +distclean-tags clean-tags maintainer-clean-tags distdir \ +mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend info-am info dvi-am dvi check check-am \ +installcheck-am installcheck all-recursive-am install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs-am \ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean +pkg-configize: $(srcdir)/pkg-configize $(top_builddir)/config.status + CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_COMMANDS= $(SHELL) \ + $(top_builddir)/config.status + chmod a+x $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: