|
From: <le...@pr...> - 2004-11-07 11:07:35
|
Update of /cvsroot/meshdb/src/geo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20213 Modified Files: Tag: leonard-dev Makefile.am configure.ac Added Files: Tag: leonard-dev libpng.m4 Log Message: move libpng tests to a separate file --- NEW FILE: libpng.m4 --- AC_DEFUN([CHECK_LIBPNG], [AC_ARG_WITH(libpng, AC_HELP_STRING([--with-libpng=PREFIX], [specify libpng installation]), ac_cv_use_libpng=$withval, ac_cv_use_libpng=auto) AC_CACHE_CHECK([libpng-config], [ac_cv_libpng_config], [if test "auto" = "$ac_cv_use_libpng"; then prog=libpng-config else prog="$ac_cv_use_libpng/bin/libpng-config" fi if $prog --version >/dev/null 2>/dev/null; then ac_cv_libpng_config=$prog else ac_cv_libpng_config=no fi]) if test "no" != "$ac_cv_libpng_config"; then CPPFLAGS="$CPPFLAGS `$ac_cv_libpng_config --cppflags`" CFLAGS="$CFLAGS `$ac_cv_libpng_config --cflags`" LDFLAGS="$LDFLAGS `$ac_cv_libpng_config --L_opts`" LDFLAGS="$LDFLAGS `$ac_cv_libpng_config --R_opts`" LIBS="$LIBS `$ac_cv_libpng_config --libs`" fi AC_CHECK_HEADER(png.h,, [AC_MSG_ERROR([unable to find required PNG headers])]) AC_SEARCH_LIBS(png_init_io,png,, [AC_MSG_ERROR([unable to find required PNG library])]) ]) Index: Makefile.am =================================================================== RCS file: /cvsroot/meshdb/src/geo/Attic/Makefile.am,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- Makefile.am 7 Nov 2004 09:49:42 -0000 1.1.2.1 +++ Makefile.am 7 Nov 2004 11:07:08 -0000 1.1.2.2 @@ -9,3 +9,4 @@ SUBDIRS += make-hgt-qt SUBDIRS += httphead +ACLOCAL_AMFLAGS = -I . Index: configure.ac =================================================================== RCS file: /cvsroot/meshdb/src/geo/Attic/configure.ac,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- configure.ac 7 Nov 2004 09:49:42 -0000 1.1.2.1 +++ configure.ac 7 Nov 2004 11:07:08 -0000 1.1.2.2 @@ -20,38 +20,8 @@ AC_HEADER_STDC AC_CHECK_HEADERS(err.h inttypes.h) - -#-- Portable network graphics - -AC_ARG_WITH(libpng, - AC_HELP_STRING([--with-libpng=PREFIX], - [specify libpng installation]), - ac_cv_use_libpng=$withval, - ac_cv_use_libpng=auto) -AC_CACHE_CHECK([libpng-config], - [ac_cv_libpng_config], - [if test "auto" = "$ac_cv_use_libpng"; then - prog=libpng-config - else - prog="$ac_cv_use_libpng/bin/libpng-config" - fi - if $prog --version >/dev/null 2>/dev/null; then - ac_cv_libpng_config=$prog - else - ac_cv_libpng_config=no - fi]) -if test "no" != "$ac_cv_libpng_config"; then - CPPFLAGS="$CPPFLAGS `$ac_cv_libpng_config --cppflags`" - CFLAGS="$CFLAGS `$ac_cv_libpng_config --cflags`" - LDFLAGS="$LDFLAGS `$ac_cv_libpng_config --L_opts`" - LDFLAGS="$LDFLAGS `$ac_cv_libpng_config --R_opts`" - LIBS="$LIBS `$ac_cv_libpng_config --libs`" -fi -AC_CHECK_HEADER(png.h,, - [AC_MSG_ERROR([unable to find required PNG headers])]) -AC_SEARCH_LIBS(png_init_io,png,, - [AC_MSG_ERROR([unable to find required PNG library])]) - AC_C_BIGENDIAN +CHECK_LIBPNG + AC_OUTPUT |