Checks for libpng
This commit is contained in:
Alfredo Beaumont
parent
d40ee265c9
commit
d619f20818
2 changed files with 103 additions and 3 deletions
87
configure
vendored
87
configure
vendored
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.ac Revision: 1.50 .
|
||||
# From configure.ac Revision: 1.52 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59 for Battle for Wesnoth 0.7.10-CVS.
|
||||
#
|
||||
|
|
@ -312,7 +312,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SDL_CONFIG GNOME_CONFIG GNOME1_DESKTOP KDE_CONFIG KDE_DESKTOP KDE_ICON SDL_LIBS SDL_IMAGE_LIBS SDL_MIXER_LIBS SDL_NET_LIBS SDL_TTF_LIBS CPP EGREP SDL_CFLAGS LIBOBJS DATADIR STATIC_TRUE STATIC_FALSE SERVER_TRUE SERVER_FALSE EDITOR_TRUE EDITOR_FALSE TOOLS_TRUE TOOLS_FALSE KDE_TRUE KDE_FALSE GNOME1_TRUE GNOME1_FALSE GNOME2_TRUE GNOME2_FALSE GCC_TRUE GCC_FALSE WZIP_TRUE WZIP_FALSE MANUAL_FILES DATA_FILES FONT_FILES IMAGE_FILES MUSIC_FILES SOUND_FILES UTIL_FILES LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SDL_CONFIG PNG_CONFIG PNG_CFLAGS PNG_LIBS LIBPNG_TRUE LIBPNG_FALSE GNOME_CONFIG GNOME1_DESKTOP KDE_CONFIG KDE_DESKTOP KDE_ICON SDL_LIBS SDL_IMAGE_LIBS SDL_MIXER_LIBS SDL_NET_LIBS SDL_TTF_LIBS CPP EGREP SDL_CFLAGS LIBOBJS DATADIR STATIC_TRUE STATIC_FALSE SERVER_TRUE SERVER_FALSE EDITOR_TRUE EDITOR_FALSE TOOLS_TRUE TOOLS_FALSE KDE_TRUE KDE_FALSE GNOME1_TRUE GNOME1_FALSE GNOME2_TRUE GNOME2_FALSE GCC_TRUE GCC_FALSE WZIP_TRUE WZIP_FALSE MANUAL_FILES DATA_FILES FONT_FILES IMAGE_FILES MUSIC_FILES SOUND_FILES UTIL_FILES LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -3362,6 +3362,77 @@ indicating your platform, the version of configure script and the problem." >&2;
|
|||
|
||||
fi
|
||||
|
||||
# libpng-config
|
||||
|
||||
for ac_prog in libpng-config libpng12-config
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_path_PNG_CONFIG+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
case $PNG_CONFIG in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_PNG_CONFIG="$PNG_CONFIG" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_path_PNG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
PNG_CONFIG=$ac_cv_path_PNG_CONFIG
|
||||
|
||||
if test -n "$PNG_CONFIG"; then
|
||||
echo "$as_me:$LINENO: result: $PNG_CONFIG" >&5
|
||||
echo "${ECHO_T}$PNG_CONFIG" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
test -n "$PNG_CONFIG" && break
|
||||
done
|
||||
test -n "$PNG_CONFIG" || PNG_CONFIG="none"
|
||||
|
||||
|
||||
if test "x$PNG_CONFIG" = "xnone"; then
|
||||
pngfound=no
|
||||
{ echo "$as_me:$LINENO: WARNING: *** LIBPNG not found." >&5
|
||||
echo "$as_me: WARNING: *** LIBPNG not found." >&2;}
|
||||
else
|
||||
pngfound=yes
|
||||
PNG_CFLAGS=`$PNG_CONFIG --cflags`
|
||||
PNG_LIBS=`$PNG_CONFIG --libs`
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if test x$pngfound = xyes; then
|
||||
LIBPNG_TRUE=
|
||||
LIBPNG_FALSE='#'
|
||||
else
|
||||
LIBPNG_TRUE='#'
|
||||
LIBPNG_FALSE=
|
||||
fi
|
||||
|
||||
|
||||
# Check for SDL version. Taken from sdl.m4
|
||||
|
||||
# Check whether --enable-sdltest or --disable-sdltest was given.
|
||||
|
|
@ -7215,6 +7286,13 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
|
|||
Usually this means the macro was only invoked conditionally." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
if test -z "${LIBPNG_TRUE}" && test -z "${LIBPNG_FALSE}"; then
|
||||
{ { echo "$as_me:$LINENO: error: conditional \"LIBPNG\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&5
|
||||
echo "$as_me: error: conditional \"LIBPNG\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
if test -z "${STATIC_TRUE}" && test -z "${STATIC_FALSE}"; then
|
||||
{ { echo "$as_me:$LINENO: error: conditional \"STATIC\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&5
|
||||
|
|
@ -7857,6 +7935,11 @@ s,@CCDEPMODE@,$CCDEPMODE,;t t
|
|||
s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
|
||||
s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
|
||||
s,@SDL_CONFIG@,$SDL_CONFIG,;t t
|
||||
s,@PNG_CONFIG@,$PNG_CONFIG,;t t
|
||||
s,@PNG_CFLAGS@,$PNG_CFLAGS,;t t
|
||||
s,@PNG_LIBS@,$PNG_LIBS,;t t
|
||||
s,@LIBPNG_TRUE@,$LIBPNG_TRUE,;t t
|
||||
s,@LIBPNG_FALSE@,$LIBPNG_FALSE,;t t
|
||||
s,@GNOME_CONFIG@,$GNOME_CONFIG,;t t
|
||||
s,@GNOME1_DESKTOP@,$GNOME1_DESKTOP,;t t
|
||||
s,@KDE_CONFIG@,$KDE_CONFIG,;t t
|
||||
|
|
|
|||
19
configure.ac
19
configure.ac
|
|
@ -35,6 +35,23 @@ indicating your platform, the version of configure script and the problem.])
|
|||
|
||||
fi
|
||||
|
||||
# libpng-config
|
||||
|
||||
AC_PATH_PROGS([PNG_CONFIG], [libpng-config libpng12-config], [none])
|
||||
|
||||
if test "x$PNG_CONFIG" = "xnone"; then
|
||||
pngfound=no
|
||||
AC_MSG_WARN([*** LIBPNG not found.])
|
||||
else
|
||||
pngfound=yes
|
||||
PNG_CFLAGS=`$PNG_CONFIG --cflags`
|
||||
PNG_LIBS=`$PNG_CONFIG --libs`
|
||||
fi
|
||||
|
||||
AC_SUBST([PNG_CFLAGS])
|
||||
AC_SUBST([PNG_LIBS])
|
||||
AM_CONDITIONAL([LIBPNG], [test x$pngfound = xyes])
|
||||
|
||||
# Check for SDL version. Taken from sdl.m4
|
||||
|
||||
AC_ARG_ENABLE([sdltest],
|
||||
|
|
@ -264,7 +281,7 @@ AC_CHECK_HEADER([SDL_ttf.h],
|
|||
[],
|
||||
[AC_MSG_ERROR([*** SDL_ttf include files not found!
|
||||
You should install development package.])])
|
||||
|
||||
|
||||
CPPFLAGS=$OLD_CPPFLAGS
|
||||
CXXFLAGS=$OLD_CXXFLAGS
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue