diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-08-09 06:43:17 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-08-09 06:43:17 +0200 |
| commit | b1b9194772dd45ce9c982d25383b2bb0c31f41ad (patch) | |
| tree | b95fcb44e2f0b7203eb78457646308c2df61485e /m4 | |
| parent | 430ae6eb6c4659f3bd907ceb84b7b7bcaf65071b (diff) | |
| parent | 4fd038dba6f9b4d87c0e14fa5ff59abbcd46e794 (diff) | |
| download | nx-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 'm4')
| -rw-r--r-- | m4/nx-macros.m4 | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/m4/nx-macros.m4 b/m4/nx-macros.m4 index 816bf4003..06217f075 100644 --- a/m4/nx-macros.m4 +++ b/m4/nx-macros.m4 @@ -303,3 +303,21 @@ rm -f conftest*]) FreeBSD= test "$nxconf_cv_freebsd" = yes && FreeBSD=yes ]) # NX_BUILD_ON_FreeBSD + +AC_DEFUN([LIBJPEG_FALLBACK_CHECK],[ +AC_MSG_CHECKING([for libjpeg shared libary file and headers]) +AC_CHECK_LIB([jpeg], [jpeg_destroy_compress], + [have_jpeg_lib=yes], [have_jpeg_lib=no]) +AC_CHECK_HEADERS([jpeglib.h], + [have_jpeg_headers=yes], [have_jpeg_headers=no]) + +if test x"$have_jpeg_lib" = "xyes" && test x"$have_jpeg_headers" = "xyes"; then + AC_MSG_RESULT([yes]) + JPEG_CFLAGS="" + JPEG_LIBS="-ljpeg" +else + AC_MSG_RESULT([no]) + AC_MSG_FAILURE([Could not find libjpeg on your system, make sure +the JPEG shared library and header files are installed.]) +fi +]) # LIBJPEG_FALLBACK_CHECK |