new place for *.pc.in

diff --git a/.gitignore b/.gitignore
index 9982605..6eed8a4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ _$*
 core
 # CVS default ignores end
 m4
+auto-m4
 intl
 autom4te.cache
 configure.scan

diff --git a/Makefile.am b/Makefile.am
index 8795878..0ec3d23 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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

diff --git a/configure.ac b/configure.ac
index 0fe670a..3871b4b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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
 

diff --git a/libexif-uninstalled.pc.in b/libexif-uninstalled.pc.in
new file mode 100644 (file)
index 0000000..cbd1e97
--- /dev/null
+++ b/libexif-uninstalled.pc.in
@@ -0,0 +1,7 @@
+# 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

diff --git a/libexif/libexif.pc.in b/libexif.pc.in
similarity index 100%
rename from libexif/libexif.pc.in
rename to libexif.pc.in

diff --git a/libexif/Makefile.am b/libexif/Makefile.am
index c7c587c..9b96370 100644 (file)
--- a/libexif/Makefile.am
+++ b/libexif/Makefile.am
@@ -62,9 +62,7 @@ libexifinclude_HEADERS =      \
        exif-utils.h            \
        _stdint.h
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libexif.pc
-EXTRA_DIST = libexif.pc.in libexif.sym
+EXTRA_DIST = libexif.sym
 
 DISTCLEANFILES = _stdint.h