move pkgconfig files to a data/ subdir

1 files changed, 25 insertions, 30 deletions

diff --git a/configure.in b/configure.in
index 8de81a6..0c2d22c 100644
--- a/configure.in
+++ b/configure.in
@@ -111,98 +111,92 @@ AC_CHECK_HEADERS(math.h)
 ########################
 # Determine Dependencies
 ########################
-dnl first just make sure that our base requirements are met
-PKG_CHECK_MODULES(CAIROMM,
-                  [cairo >= 1.8.0
-                   sigc++-2.0])
+dnl base dependencies
+DEPS_PC="cairo >= 1.8.0
+         sigc++-2.0"
 
 dnl then check and add additional dependencies
 PKG_CHECK_MODULES(CAIROFT, cairo-ft, [HAS_FT=yes], [HAS_FT=no])
 if test x$HAS_FT = xyes; then
   INSTALLED_PC="$INSTALLED_PC cairomm-ft-1.0.pc"
-  CAIROMM_LIBS="$CAIROMM_LIBS $CAIROFT_LIBS"
-  CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROFT_CFLAGS"
+  DEPS_PC="$DEPS_PC cairo-ft"
 fi
 
 PKG_CHECK_MODULES(CAIROPDF, cairo-pdf, [HAS_PDF=yes], [HAS_PDF=no])
 if test x$HAS_PDF = xyes; then
   INSTALLED_PC="$INSTALLED_PC cairomm-pdf-1.0.pc"
-  CAIROMM_LIBS="$CAIROMM_LIBS $CAIROPDF_LIBS"
-  CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROPDF_CFLAGS"
+  DEPS_PC="$DEPS_PC cairo-pdf"
 fi
 
 PKG_CHECK_MODULES(CAIROPNG, cairo-png, [HAS_PNG=yes], [HAS_PNG=no])
 if test x$HAS_PNG = xyes; then
   INSTALLED_PC="$INSTALLED_PC cairomm-png-1.0.pc"
-  CAIROMM_LIBS="$CAIROMM_LIBS $CAIROPNG_LIBS"
-  CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROPNG_CFLAGS"
+  DEPS_PC="$DEPS_PC cairo-png"
 fi
 
 PKG_CHECK_MODULES(CAIROPS, cairo-ps, [HAS_PS=yes], [HAS_PS=no])
 if test x$HAS_PS = xyes; then
   INSTALLED_PC="$INSTALLED_PC cairomm-ps-1.0.pc"
-  CAIROMM_LIBS="$CAIROMM_LIBS $CAIROPS_LIBS"
-  CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROPS_CFLAGS"
+  DEPS_PC="$DEPS_PC cairo-ps"
 fi
 
 PKG_CHECK_MODULES(CAIROSVG, cairo-svg, [HAS_SVG=yes], [HAS_SVG=no])
 if test x$HAS_SVG = xyes; then
   INSTALLED_PC="$INSTALLED_PC cairomm-svg-1.0.pc"
-  CAIROMM_LIBS="$CAIROMM_LIBS $CAIROSVG_LIBS"
-  CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROSVG_CFLAGS"
+  DEPS_PC="$DEPS_PC cairo-svg"
 fi
 
 PKG_CHECK_MODULES(CAIROXLIB, cairo-xlib, [HAS_XLIB=yes], [HAS_XLIB=no])
 if test x$HAS_XLIB = xyes; then
   INSTALLED_PC="$INSTALLED_PC cairomm-xlib-1.0.pc"
-  CAIROMM_LIBS="$CAIROMM_LIBS $CAIROXLIB_LIBS"
-  CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROXLIB_CFLAGS"
+  DEPS_PC="$DEPS_PC cairo-xlib"
 fi
 
 PKG_CHECK_MODULES(CAIROXLIBXRENDER, cairo-xlib-xrender, [HAS_XLIBXRENDER=yes], [HAS_XLIBXRENDER=no])
 if test x$HAS_XLIBXRENDER = xyes; then
   INSTALLED_PC="$INSTALLED_PC cairomm-xlib-xrender-1.0.pc"
-  CAIROMM_LIBS="$CAIROMM_LIBS $CAIROXLIBXRENDER_LIBS"
-  CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROXLIBXRENDER_CFLAGS"
+  DEPS_PC="$DEPS_PC cairo-xlib-xrender"
 fi
 
 PKG_CHECK_MODULES(CAIROWIN32, cairo-win32, [HAS_WIN32=yes], [HAS_WIN32=no])
 if test x$HAS_WIN32 = xyes; then
   INSTALLED_PC="$INSTALLED_PC cairomm-win32-1.0.pc"
-  CAIROMM_LIBS="$CAIROMM_LIBS $CAIROWIN32_LIBS"
-  CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROWIN32_CFLAGS"
+  DEPS_PC="$DEPS_PC cairo-win32"
 fi
 
 PKG_CHECK_MODULES(CAIROWIN32FONT, cairo-win32-font, [HAS_WIN32FONT=yes], [HAS_WIN32FONT=no])
 if test x$HAS_WIN32FONT = xyes; then
   INSTALLED_PC="$INSTALLED_PC cairomm-win32-font-1.0.pc"
-  CAIROMM_LIBS="$CAIROMM_LIBS $CAIROWIN32FONT_LIBS"
-  CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROWIN32FONT_CFLAGS"
+  DEPS_PC="$DEPS_PC cairo-win32-font"
 fi
 
 PKG_CHECK_MODULES(CAIROQUARTZ, cairo-quartz, [HAS_QUARTZ=yes], [HAS_QUARTZ=no])
 if test x$HAS_QUARTZ = xyes; then
   INSTALLED_PC="$INSTALLED_PC cairomm-quartz-1.0.pc"
-  CAIROMM_LIBS="$CAIROMM_LIBS $CAIROQUARTZ_LIBS"
-  CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROQUARTZ_CFLAGS"
+  DEPS_PC="$DEPS_PC cairo-quartz"
 fi
 
 PKG_CHECK_MODULES(CAIROQUARTZFONT, cairo-quartz-font, [HAS_QUARTZFONT=yes], [HAS_QUARTZFONT=no])
 if test x$HAS_QUARTZFONT = xyes; then
   INSTALLED_PC="$INSTALLED_PC cairomm-quartz-font-1.0.pc"
-  CAIROMM_LIBS="$CAIROMM_LIBS $CAIROQUARTZFONT_LIBS"
-  CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROQUARTZFONT_CFLAGS"
+  DEPS_PC="$DEPS_PC cairo-quartz-font"
 fi
 
 PKG_CHECK_MODULES(CAIROQUARTZIMAGE, cairo-quartz-image, [HAS_QUARTZIMAGE=yes], [HAS_QUARTZIMAGE=no])
 if test x$HAS_QUARTZIMAGE = xyes; then
   INSTALLED_PC="$INSTALLED_PC cairomm-quartz-image-1.0.pc"
-  CAIROMM_LIBS="$CAIROMM_LIBS $CAIROQUARTZIMAGE_LIBS"
-  CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROQUARTZIMAGE_CFLAGS"
+  DEPS_PC="$DEPS_PC cairo-quartz-image"
 fi
 
+PKG_CHECK_MODULES(CAIROMM, [$DEPS_PC])
+
 AC_SUBST(INSTALLED_PC)
 
+CONFIG_PC=data/cairomm-1.0.pc
+for pc in $INSTALLED_PC; do
+  CONFIG_PC="$CONFIG_PC data/$pc"
+done
+
 
 AC_ARG_ENABLE(tests,
               AC_HELP_STRING([--enable-tests=yes|no],
@@ -287,6 +281,8 @@ AC_CONFIG_FILES(
   Makefile
   cairomm/Makefile
 
+  data/Makefile
+
   examples/Makefile
   examples/png_file/Makefile
   examples/pdf-surface/Makefile
@@ -296,8 +292,7 @@ AC_CONFIG_FILES(
 
   tests/Makefile
 
-  cairomm-1.0.pc
-  $INSTALLED_PC
+  $CONFIG_PC
 )
 
 AC_CONFIG_FILES([