diff options
| author | Jehan Pagès <jehan@zemarmot.net> | 2014-08-12 21:05:03 +0200 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2014-08-12 21:05:03 +0200 |
| commit | e62e18e1b318d6fa664d236723de3c06ae43e86b (patch) | |
| tree | 5e8e70ba9e0e408f285d5a3a80bea67477443053 /configure.ac | |
| parent | 572c60764bbbd2080bfd7a926c646ad20b467aea (diff) | |
poppler: use poppler-data pkg-config for both cmake and autotools builds
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 477b2f7e..ee20ed99 100644 --- a/configure.ac +++ b/configure.ac @@ -105,7 +105,12 @@ if test x$enable_relocatable = xyes; then fi fi -AC_DEFINE_DIR(POPPLER_DATADIR, "{datarootdir}/poppler", [Poppler data dir]) +dnl ##### Check for installed poppler-data. Use the same datarootdir as default otherwise. +PKG_CHECK_EXISTS(poppler-data, + [POPPLER_DATADIR=`$PKG_CONFIG --variable=poppler_datadir poppler-data` + AC_DEFINE_DIR(POPPLER_DATADIR, "{POPPLER_DATADIR}", [Poppler data dir])], + [AC_DEFINE_DIR(POPPLER_DATADIR, "{datarootdir}/poppler", [Poppler data dir])] + ) dnl ##### Checks for header files. AC_PATH_XTRA |