aboutsummaryrefslogtreecommitdiff
path: root/nxcomp
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-08-09 06:43:17 +0200
committerMihai Moldovan <ionic@ionic.de>2017-08-09 06:43:17 +0200
commitb1b9194772dd45ce9c982d25383b2bb0c31f41ad (patch)
treeb95fcb44e2f0b7203eb78457646308c2df61485e /nxcomp
parent430ae6eb6c4659f3bd907ceb84b7b7bcaf65071b (diff)
parent4fd038dba6f9b4d87c0e14fa5ff59abbcd46e794 (diff)
downloadnx-libs-b1b9194772dd45ce9c982d25383b2bb0c31f41ad.tar.gz
nx-libs-b1b9194772dd45ce9c982d25383b2bb0c31f41ad.tar.bz2
nx-libs-b1b9194772dd45ce9c982d25383b2bb0c31f41ad.zip
Merge branch 'sunweaver-pr/find-libjpeg-without-pkgconfig' into 3.6.x
Attributes GH PR #499: https://github.com/ArcticaProject/nx-libs/pull/499
Diffstat (limited to 'nxcomp')
-rw-r--r--nxcomp/configure.ac8
1 files changed, 4 insertions, 4 deletions
diff --git a/nxcomp/configure.ac b/nxcomp/configure.ac
index 42407c6fd..4f2831c04 100644
--- a/nxcomp/configure.ac
+++ b/nxcomp/configure.ac
@@ -25,10 +25,6 @@ AC_SUBST([COMP_VERSION])
LT_COMP_VERSION=[`echo $COMP_VERSION | sed -r -e 's/^([0-9]+\.[0-9]+\.[0-9]+).*$/\1/' -e 's/\./:/g'`]
AC_SUBST([LT_COMP_VERSION])
-PKG_CHECK_MODULES(JPEG, libjpeg)
-PKG_CHECK_MODULES(PNG, libpng)
-PKG_CHECK_MODULES(Z, zlib)
-
# Upstream's pkg.m4 (since 0.27) offers this now, but define our own
# compatible version in case the local version of pkgconfig isn't new enough.
# https://bugs.freedesktop.org/show_bug.cgi?id=48743
@@ -39,6 +35,10 @@ m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR],
[],[with_pkgconfigdir='$(libdir)/pkgconfig'])
AC_SUBST([pkgconfigdir], [${with_pkgconfigdir}])])
+PKG_CHECK_MODULES([JPEG], [libjpeg], [], [LIBJPEG_FALLBACK_CHECK])
+PKG_CHECK_MODULES([PNG], [libpng], [], [])
+PKG_CHECK_MODULES([Z], [zlib], [], [])
+
AC_LANG([C++])
NX_COMPILER_BRAND
NX_COMPILER_FLAGS