diff options
| author | s_alexander <s_alexander@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-09-07 17:45:32 +0000 |
|---|---|---|
| committer | s_alexander <s_alexander@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-09-07 17:45:32 +0000 |
| commit | d165a085eecd9f0d2e9d603de269941d1d30c620 (patch) | |
| tree | ac704b1d31c4f64ffe0f12bd2e85a9c7cd743e3d /us_maker_edition/configure.ac | |
| parent | 985ce77618c8c73c80d3fe48b122eb0bc2586629 (diff) | |
| download | usdx-d165a085eecd9f0d2e9d603de269941d1d30c620.tar.gz usdx-d165a085eecd9f0d2e9d603de269941d1d30c620.tar.xz usdx-d165a085eecd9f0d2e9d603de269941d1d30c620.zip | |
update configure to find libpng 1.4
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2633 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'us_maker_edition/configure.ac')
| -rw-r--r-- | us_maker_edition/configure.ac | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/us_maker_edition/configure.ac b/us_maker_edition/configure.ac index c609c460..fdd3d2cf 100644 --- a/us_maker_edition/configure.ac +++ b/us_maker_edition/configure.ac @@ -154,8 +154,16 @@ fi # check for libraries # ----------------------------------------- -# libpng -PKG_HAVE([libpng], [libpng12], yes) +# find libpng +# pkgconfig name for 1.2 is "libpng12", for 1.4 "libpng" +PKG_HAVE([libpng], [libpng12], no) +if [[ x$libpng_HAVE = xyes ]]; then + PKG_VERSION([libpng], [libpng12]) +else + # check for the generic .pc file + PKG_HAVE([libpng], [libpng >= 1.2], yes) + PKG_VERSION([libpng], [libpng >= 1.2]) +fi # find sdl PKG_HAVE([sdl], [sdl], yes) |