[libexif-cvs] libexif libexif-uninstalled.pc.in, NONE, 1.1 libexif.pc.in, 1.2, 1.3 .cvsignore, 1.9, 1.10 Makefile.am, 1.42, 1.43 configure.ac, 1.20, 1.21

[Hans U. N. <hu...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv26100

Modified Files:
	.cvsignore Makefile.am configure.ac 
Added Files:
	libexif-uninstalled.pc.in libexif.pc.in 
Log Message:
new place for *.pc.in

--- NEW FILE: libexif-uninstalled.pc.in ---
# Include stuff requires a system which can do symlinks.

Name: libexif
Description: Library for easy access to EXIF data
Version: @VERSION@
Libs: ${pcfiledir}/libexif/libexif.la
Cflags: -I${pcfiledir}/@srcdir@/libexif

Index: .cvsignore
===================================================================
RCS file: /cvsroot/libexif/libexif/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -d -r1.9 -r1.10
--- .cvsignore	26 Mar 2005 18:07:53 -0000	1.9
+++ .cvsignore	17 May 2007 14:57:25 -0000	1.10
@@ -1,4 +1,5 @@
 m4
+auto-m4
 intl
 autom4te.cache
 configure.scan

--- NEW FILE: libexif.pc.in ---
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

Name: libexif
Description: Library for easy access to EXIF data
Requires:
Version: @VERSION@
Libs: -L${libdir} -lexif -lm
Cflags: -I${includedir}

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/Makefile.am,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -d -r1.42 -r1.43
--- Makefile.am	10 May 2007 15:12:58 -0000	1.42
+++ Makefile.am	17 May 2007 14:57:25 -0000	1.43
@@ -6,6 +6,14 @@ endif
 
 EXTRA_DIST = @PACKAGE_TARNAME@.spec autogen.sh $(README_W32_XDIST)
 
+pkgconfigdir = $(libdir)/pkgconfig
+
+pkgconfig_DATA = libexif.pc
+EXTRA_DIST    += libexif.pc.in
+
+noinst_DATA = libexif-uninstalled.pc
+EXTRA_DIST += libexif-uninstalled.pc.in
+
 ACLOCAL_AMFLAGS = -I auto-m4 -I m4m
 
 doc_DATA = README AUTHORS NEWS ChangeLog ABOUT-NLS COPYING

Index: configure.ac
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.ac,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -d -r1.20 -r1.21
--- configure.ac	10 May 2007 15:44:15 -0000	1.20
+++ configure.ac	17 May 2007 14:57:25 -0000	1.21
@@ -178,8 +178,18 @@ AC_CONFIG_FILES([ 
   doc/Makefile
   doc/Doxyfile
   doc/Doxyfile-internals
-  libexif/libexif.pc
+  libexif.pc
+  libexif-uninstalled.pc
   binary/Makefile
+], [
+	# Symlink to enable proper #include <exif/foo.h> on uninstalled
+	# libexif source tree. Move the header files once the source
+	# is out of CVS and in SVN, git, bzr, whatever.
+	if test -e "${srcdir}/libexif/exif"; then
+		: # do nothing
+	else
+		(cd ${srcdir}/libexif && ${LN_S} exif .)
+	fi
 ])
 AC_OUTPUT