--- gd-2.0.33/config/gdlib-config.in.pom 2004-10-27 16:22:07.000000000 +0200 +++ gd-2.0.33/config/gdlib-config.in 2006-05-24 15:42:32.000000000 +0200 @@ -7,9 +7,10 @@ # installation directories prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ +libdir=`pkg-config gdlib --variable=libdir` includedir=@includedir@ bindir=@bindir@ +ldflags=`pkg-config gdlib --variable=ldflags` usage() { @@ -68,7 +69,7 @@ echo @GDLIB_REVISION@ ;; --ldflags) - echo @LDFLAGS@ + echo $ldflags ;; --libs) echo @LIBS@ @@ -83,7 +84,7 @@ echo "GD library @VERSION@" echo "includedir: $includedir" echo "cflags: -I@includedir@" - echo "ldflags: @LDFLAGS@" + echo "ldflags: $ldflags" echo "libs: @LIBS@" echo "libdir: $libdir" echo "features: @FEATURES@" --- /dev/null 2006-05-22 08:57:38.164651760 +0200 +++ gd-2.0.33/config/gdlib.pc.in 2006-05-24 15:42:32.000000000 +0200 @@ -0,0 +1,14 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +bindir=@bindir@ +ldflags=@LDFLAGS@ + + +Name: gd-devel +Description: A graphics library for quick creation of PNG or JPEG images +Version: @VERSION@ +Requires: +Libs: @LIBS@ +Cflags: -I@includedir@ --- gd-2.0.33/configure.pom 2006-05-24 15:42:32.000000000 +0200 +++ gd-2.0.33/configure 2006-05-24 15:42:32.000000000 +0200 @@ -12688,7 +12688,7 @@ Support for pthreads: $acx_pthread_ok " >&6 - ac_config_files="$ac_config_files Makefile config/Makefile config/gdlib-config test/Makefile" + ac_config_files="$ac_config_files Makefile config/Makefile config/gdlib-config config/gdlib.pc test/Makefile" cat >confcache <<\_ACEOF @@ -13250,6 +13250,7 @@ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "config/Makefile" ) CONFIG_FILES="$CONFIG_FILES config/Makefile" ;; "config/gdlib-config" ) CONFIG_FILES="$CONFIG_FILES config/gdlib-config" ;; + "config/gdlib.pc" ) CONFIG_FILES="$CONFIG_FILES config/gdlib.pc" ;; "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.hin" ;; --- gd-2.0.33/Makefile.in.pom 2004-11-04 00:14:44.000000000 +0100 +++ gd-2.0.33/Makefile.in 2006-05-24 15:42:47.000000000 +0200 @@ -317,6 +317,7 @@ ACLOCAL_AMFLAGS = -I config SUBDIRS = config test bin_SCRIPTS = bdftogd config/gdlib-config +pkgconf_CFILE = config/gdlib.pc EXTRA_DIST = README-JPEG.TXT README.TXT configure.pl bdftogd demoin.png err.out index.html install-item makefile.sample readme.jpn entities.html entities.tcl include_HEADERS = gd.h gdfx.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h gdfonts.h gdfontt.h entities.h lib_LTLIBRARIES = libgd.la @@ -528,6 +529,15 @@ rm -f "$(DESTDIR)$(bindir)/$$f"; \ done +install-pkgconfigCF: + $(mkdir_p) "$(DESTDIR)$(libdir)/pkgconfig" + echo " cp $(pkgconf_CFILE) $(DESTDIR)$(libdir)/pkgconfig/gdlib.pc" + cp $(pkgconf_CFILE) $(DESTDIR)$(libdir)/pkgconfig/gdlib.pc + +uninstall-pkgconfigCF: + echo " rm $(DESTDIR)$(libdir)/pkgconfig/gdlib.pc" + rm $(DESTDIR)$(libdir)/pkgconfig/gdlib.pc + mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -949,7 +959,7 @@ install-data-am: install-includeHEADERS -install-exec-am: install-binPROGRAMS install-binSCRIPTS \ +install-exec-am: install-binPROGRAMS install-binSCRIPTS install-pkgconfigCF \ install-libLTLIBRARIES install-info: install-info-recursive @@ -978,7 +988,7 @@ ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ +uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-pkgconfigCF\ uninstall-includeHEADERS uninstall-info-am \ uninstall-libLTLIBRARIES