diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | Makefile.am | 3 | ||||
-rw-r--r-- | configure.ac | 12 | ||||
-rw-r--r-- | m4/Makefile.am | 1 | ||||
-rw-r--r-- | src/main/Makefile.am | 2 |
5 files changed, 18 insertions, 3 deletions
@@ -1,3 +1,6 @@ | |||
1 | Mon Jan 1 19:10:40 MST 2007 | ||
2 | Added pkgconfig support. | ||
3 | |||
1 | Thu Dec 28 20:22:20 MST 2006 | 4 | Thu Dec 28 20:22:20 MST 2006 |
2 | Fixed bug in splitextractor, addressing also Mantis #1125. | 5 | Fixed bug in splitextractor, addressing also Mantis #1125. |
3 | 6 | ||
diff --git a/Makefile.am b/Makefile.am index eaa5425..7e5a2ca 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -17,3 +17,6 @@ dist-hook: | |||
17 | rm -f $(distdir)/src/plugins/printable/pept.c | 17 | rm -f $(distdir)/src/plugins/printable/pept.c |
18 | 18 | ||
19 | ACLOCAL_AMFLAGS = -I m4 | 19 | ACLOCAL_AMFLAGS = -I m4 |
20 | |||
21 | pkgconfigdatadir = $(prefix)/lib/pkgconfig | ||
22 | pkgconfigdata_DATA = libextractor.pc | ||
diff --git a/configure.ac b/configure.ac index f42b990..8c5771a 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,8 +1,9 @@ | |||
1 | # Process this file with autoconf to produce a configure script. | 1 | # Process this file with autoconf to produce a configure script. |
2 | AC_PREREQ(2.57) | 2 | AC_PREREQ(2.57) |
3 | AC_INIT([libextractor], [0.5.16], [bug-libextractor@gnu.org]) | 3 | LIBRARY_VERSION=0.5.17 |
4 | AC_INIT([libextractor], [0.5.17], [bug-libextractor@gnu.org]) | ||
4 | AC_REVISION($Revision: 1.67 $) | 5 | AC_REVISION($Revision: 1.67 $) |
5 | AM_INIT_AUTOMAKE([libextractor], [0.5.16]) | 6 | AM_INIT_AUTOMAKE([libextractor], [0.5.17]) |
6 | AM_CONFIG_HEADER(src/include/config.h) | 7 | AM_CONFIG_HEADER(src/include/config.h) |
7 | 8 | ||
8 | AH_TOP([#define _GNU_SOURCE 1]) | 9 | AH_TOP([#define _GNU_SOURCE 1]) |
@@ -388,7 +389,6 @@ AC_ARG_ENABLE(exiv2, | |||
388 | exiv2=1]) | 389 | exiv2=1]) |
389 | AM_CONDITIONAL(HAVE_EXIV2, test x$exiv2 != x0) | 390 | AM_CONDITIONAL(HAVE_EXIV2, test x$exiv2 != x0) |
390 | AC_DEFINE_UNQUOTED([HAVE_EXIV2], $exiv2, [We use EXIV2]) | 391 | AC_DEFINE_UNQUOTED([HAVE_EXIV2], $exiv2, [We use EXIV2]) |
391 | |||
392 | ABI_GSF | 392 | ABI_GSF |
393 | 393 | ||
394 | AC_SUBST(CPPFLAGS) | 394 | AC_SUBST(CPPFLAGS) |
@@ -396,7 +396,13 @@ AC_SUBST(LDFLAGS) | |||
396 | AC_SUBST(XTRA_CPPLIBS) | 396 | AC_SUBST(XTRA_CPPLIBS) |
397 | AC_SUBST(LIBEXT) | 397 | AC_SUBST(LIBEXT) |
398 | 398 | ||
399 | LIBEXTRACTOR_VERSION="0.5.17" | ||
400 | datadir= | ||
401 | AX_CREATE_PKGCONFIG_INFO([libextractor.pc],,[-lextractor],[Metadata extraction library],,) | ||
402 | |||
399 | AC_CONFIG_FILES([Makefile po/Makefile.in m4/Makefile | 403 | AC_CONFIG_FILES([Makefile po/Makefile.in m4/Makefile |
404 | |||
405 | |||
400 | doc/Makefile | 406 | doc/Makefile |
401 | src/Makefile | 407 | src/Makefile |
402 | src/include/Makefile | 408 | src/include/Makefile |
diff --git a/m4/Makefile.am b/m4/Makefile.am index 7b3b890..a074bef 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am | |||
@@ -1,6 +1,7 @@ | |||
1 | EXTRA_DIST = \ | 1 | EXTRA_DIST = \ |
2 | ac_python_devel.m4 \ | 2 | ac_python_devel.m4 \ |
3 | abi-gsf.m4 \ | 3 | abi-gsf.m4 \ |
4 | ax_create_pkgconfig_info.m4 \ | ||
4 | python.m4 \ | 5 | python.m4 \ |
5 | codeset.m4 \ | 6 | codeset.m4 \ |
6 | gettext.m4 \ | 7 | gettext.m4 \ |
diff --git a/src/main/Makefile.am b/src/main/Makefile.am index cb9f3db..356fd5b 100644 --- a/src/main/Makefile.am +++ b/src/main/Makefile.am | |||
@@ -72,3 +72,5 @@ test_binary_SOURCES = \ | |||
72 | test_binary_LDADD = \ | 72 | test_binary_LDADD = \ |
73 | $(top_builddir)/src/main/libextractor.la | 73 | $(top_builddir)/src/main/libextractor.la |
74 | 74 | ||
75 | |||
76 | |||