[librsvgmm] Generate and install a configuration header file



commit 61a3e7ab859ffab2c4d9a6e511ef5c14dc4a2544
Author: Daniel Elstner <danielk openismus com>
Date:   Thu Aug 27 09:57:11 2009 +0200

    Generate and install a configuration header file
    
    * librsvg/librsvgmmconfig.h.in: New header template.
    * configure.ac (AC_CONFIG_HEADERS): Add librsvg/librsvgmmconfig.h.
    (AM_INIT_AUTOMAKE): Lower version requirement to Automake 1.9.
    (MM_PREREQ): Raise version requirement to mm-common 0.6.1.
    * Makefile.am (nodist_librsvgmm_libinclude_HEADERS): Install the
    configuration header file.
    * librsvg/src/rsvg.hg: Add _CONFIGINCLUDE(librsvgmmconfig.h).

 .gitignore                   |    3 ++-
 Makefile.am                  |    5 ++++-
 configure.ac                 |    6 +++---
 librsvg/.gitignore           |    1 +
 librsvg/librsvgmmconfig.h.in |   10 ++++++++++
 librsvg/src/rsvg.hg          |    1 +
 6 files changed, 21 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4e371fe..900908a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,15 +3,16 @@
 .libs
 Makefile
 Makefile.in
+stamp-h?
 *.[ao]
 *.l[ao]
 /INSTALL
 /aclocal.m4
 /autom4te.cache
+/config*.lineno
 /config.log
 /config.status
 /configure
 /librsvgmm-*.tar.*
 /libtool
-/*.lineno
 /codegen/extradefs/generate_extra_defs
diff --git a/Makefile.am b/Makefile.am
index a0c228f..cf52545 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,9 +30,12 @@ doc_subdirs =
 endif
 SUBDIRS = $(src_subdirs) librsvg/librsvgmm $(doc_subdirs)
 
-dist_noinst_SCRIPTS = autogen.sh
+librsvgmm_libincludedir = $(libdir)/$(LIBRSVGMM_MODULE_NAME)/include
+nodist_librsvgmm_libinclude_HEADERS = librsvg/librsvgmmconfig.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = librsvg/$(LIBRSVGMM_MODULE_NAME).pc
 
+dist_noinst_SCRIPTS = autogen.sh
+
 include $(top_srcdir)/build/dist-changelog.am
diff --git a/configure.ac b/configure.ac
index 9db3b86..5a112bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,14 +21,14 @@ AC_PREREQ([2.62])
 AC_CONFIG_SRCDIR([librsvg/src/rsvg.hg])
 AC_CONFIG_AUX_DIR([build])
 AC_CONFIG_MACRO_DIR([build])
-AC_CONFIG_HEADERS([build/config.h])
+AC_CONFIG_HEADERS([build/config.h librsvg/librsvgmmconfig.h])
 
 # The ustar format supports longer filenames
-AM_INIT_AUTOMAKE([1.10 -Wno-portability check-news no-define nostdinc tar-pax])
+AM_INIT_AUTOMAKE([1.9 -Wno-portability check-news no-define nostdinc tar-pax])
 AM_MAINTAINER_MODE
 AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
 
-MM_PREREQ([0.4])
+MM_PREREQ([0.6.1])
 MM_INIT_MODULE([librsvgmm-2.0])
 
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
diff --git a/librsvg/.gitignore b/librsvg/.gitignore
index e40b761..eaa8d16 100644
--- a/librsvg/.gitignore
+++ b/librsvg/.gitignore
@@ -1,3 +1,4 @@
+/librsvgmmconfig.h
 /librsvgmm-*.pc
 /librsvgmm/rsvg.cc
 /librsvgmm/rsvg.h
diff --git a/librsvg/librsvgmmconfig.h.in b/librsvg/librsvgmmconfig.h.in
new file mode 100644
index 0000000..1a3d796
--- /dev/null
+++ b/librsvg/librsvgmmconfig.h.in
@@ -0,0 +1,10 @@
+/* This file is part of librsvgmm. */
+
+/* Major version number of librsvgmm. */
+#undef LIBRSVGMM_MAJOR_VERSION
+
+/* Micro version number of librsvgmm. */
+#undef LIBRSVGMM_MICRO_VERSION
+
+/* Minor version number of librsvgmm. */
+#undef LIBRSVGMM_MINOR_VERSION
diff --git a/librsvg/src/rsvg.hg b/librsvg/src/rsvg.hg
index e19eb44..f6036c3 100644
--- a/librsvg/src/rsvg.hg
+++ b/librsvg/src/rsvg.hg
@@ -17,6 +17,7 @@
  */
 
 _DEFS(librsvgmm,librsvg)
+_CONFIGINCLUDE(librsvgmmconfig.h)
 _PINCLUDE(glibmm/private/object_p.h)
 
 #include <cairomm/cairomm.h>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]