Fix build with autotools.
`configure.ac` and `bootstrap.sh` are moved in the top directory. `bootstrap.sh` is completed to execute `libtoolize`. The list of files to clean is reduced. Other files can be cleaned with `make distclean`. `src/Makefile.am` is fixed for missing `gd_nnquant.c` dependency. `ACX_PTHREAD` macro is moved to a `m4` directory to make `configure.ac` easier to read. --HG-- branch : fix/autotools rename : src/bootstrap.sh => bootstrap.sh rename : src/configure.ac => configure.acmaster
Vincent Bernat
parent
91c4141950
commit
90087507e6
|
|
@ -0,0 +1,3 @@
|
|||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
SUBDIRS = src config test
|
||||
|
|
@ -8,23 +8,25 @@ ACLOCAL=${ACLOCAL:-aclocal}
|
|||
AUTOCONF=${AUTOCONF:-autoconf}
|
||||
AUTOHEADER=${AUTOHEADER:-autoheader}
|
||||
AUTOMAKE=${AUTOMAKE:-automake}
|
||||
LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
|
||||
|
||||
# might handle this differently
|
||||
AUTOMAKE_FLAGS="--add-missing --copy"
|
||||
|
||||
#
|
||||
CLEANFILES="Makefile Makefile.in aclocal.m4 autom4te.cache config.h config.log \
|
||||
config.status configure libtool config/Makefile config/Makefile.in \
|
||||
config/gdlib-config tests/Makefile tests/Makefile.in"
|
||||
CLEANFILES="Makefile.in aclocal.m4 autom4te.cache configure libtool config/Makefile.in \
|
||||
tests/Makefile.in src/Makefile.in"
|
||||
|
||||
#
|
||||
rm -rf ${CLEANFILES}
|
||||
|
||||
#
|
||||
if ${ACLOCAL} \
|
||||
if ${ACLOCAL} -I m4 \
|
||||
&& ${LIBTOOLIZE} --automake --copy --force \
|
||||
&& ${ACLOCAL} -I m4 \
|
||||
&& ${AUTOHEADER} \
|
||||
&& ${AUTOMAKE} ${AUTOMAKE_FLAGS} \
|
||||
&& ${AUTOCONF} && [ -f configure ]
|
||||
&& ${AUTOCONF} --force && [ -f configure ]
|
||||
then
|
||||
echo Now run configure and make
|
||||
else
|
||||
|
|
@ -1,6 +1,4 @@
|
|||
## Process this file with automake to produce Makefile.in -*-Makefile-*-
|
||||
AUTOMAKE_OPTIONS = foreign 1.7
|
||||
|
||||
EXTRA_DIST = gdlib-config.in
|
||||
|
||||
bin_SCRIPTS = gdlib-config
|
||||
|
|
|
|||
|
|
@ -0,0 +1,300 @@
|
|||
# Process this file with autoconf to produce a configure script.
|
||||
# Configure template for gd library
|
||||
|
||||
#
|
||||
AC_PREREQ(2.54)
|
||||
|
||||
#HEY! Change BOTH the version number and the GDLIB_REVISION setting!
|
||||
AC_INIT([GD], [2.1.0], [http://bugs.libgd.org])
|
||||
AC_CONFIG_SRCDIR([src/gd.c])
|
||||
AC_CONFIG_AUX_DIR(config)
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AC_CANONICAL_TARGET([])
|
||||
|
||||
GDLIB_MAJOR=2
|
||||
GDLIB_MINOR=1
|
||||
GDLIB_REVISION=0
|
||||
GDLIBNAME=gd
|
||||
#Expanded by tests later in this file. TBB 2.0.26
|
||||
#2.0.28: GIF is standard now. Doesn't depend on anything else,
|
||||
#so we always build it.
|
||||
FEATURES="GD_GIF GD_GIFANIM GD_OPENPOLYGON"
|
||||
AC_SUBST(FEATURES)
|
||||
|
||||
AC_SUBST(GDLIB_MAJOR)
|
||||
AC_SUBST(GDLIB_MINOR)
|
||||
AC_SUBST(GDLIB_REVISION)
|
||||
AC_SUBST(GDLIBNAME)
|
||||
|
||||
AM_INIT_AUTOMAKE([foreign -Wall -Werror])
|
||||
AC_CONFIG_HEADERS([config.h:config.hin])
|
||||
|
||||
AC_MSG_CHECKING([if we are building a Cygwin target])
|
||||
case "$target" in
|
||||
*-*-cygwin*) XTRA_LDFLAGS="-no-undefined"
|
||||
os_cygwin=yes
|
||||
;;
|
||||
*) XTRA_LDFLAGS=
|
||||
os_cygwin=no
|
||||
;;
|
||||
esac
|
||||
AC_MSG_RESULT([$os_cygwin])
|
||||
AC_SUBST([XTRA_LDFLAGS])
|
||||
|
||||
AC_PROG_CC
|
||||
AM_PROG_CC_STDC
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_LIBTOOL
|
||||
AC_PROG_LN_S
|
||||
AC_PROG_MAKE_SET
|
||||
#AC_PROG_RANLIB
|
||||
|
||||
dnl may be required for freetype and Xpm
|
||||
AC_PATH_X
|
||||
|
||||
if test -n "$x_includes" && test "x$x_includes" != xNONE ; then
|
||||
CPPFLAGS="$CPPFLAGS -I$x_includes"
|
||||
fi
|
||||
if test -n "$x_libraries" && test "x$x_libraries" != xNONE ; then
|
||||
LDFLAGS="$LDFLAGS -L$x_libraries"
|
||||
fi
|
||||
|
||||
AC_HEADER_STDC
|
||||
AC_CHECK_HEADERS([errno.h limits.h stddef.h stdlib.h string.h unistd.h])
|
||||
|
||||
AM_ICONV
|
||||
# if test -n "$LIBICONV" ; then
|
||||
# LIBS="$LIBS $LIBICONV"
|
||||
# fi
|
||||
|
||||
AC_CHECK_HEADERS(iconv.h,
|
||||
[AC_MSG_CHECKING(whether iconv.h defines iconv_t)
|
||||
AC_EGREP_HEADER([typedef.*iconv_t],iconv.h,
|
||||
[AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_ICONV_T_DEF, 1,
|
||||
[Define if <iconv.h> defines iconv_t.])],
|
||||
AC_MSG_RESULT(no))])
|
||||
|
||||
# Checks for typedefs, structures, and compiler characteristics.
|
||||
#AC_C_CONST
|
||||
#AC_TYPE_SIZE_T
|
||||
|
||||
# Checks for library functions.
|
||||
#AC_FUNC_ERROR_AT_LINE
|
||||
#AC_FUNC_MALLOC
|
||||
#AC_FUNC_REALLOC
|
||||
#AC_FUNC_VPRINTF
|
||||
#AC_CHECK_FUNCS([floor memset sqrt strchr strdup strtol])
|
||||
|
||||
dnl do we need to specify -lm explicitly?
|
||||
AC_CHECK_FUNC(sin,,[AC_CHECK_LIB(m,sin)])
|
||||
|
||||
dnl zlib is required
|
||||
AC_CHECK_LIB(z,deflate,
|
||||
[LIBS="-lz $LIBS"
|
||||
AC_DEFINE(HAVE_LIBZ, 1, [ Define if you have zlib. ])],
|
||||
[AC_MSG_WARN([zlib is required - see http://www.gzip.org/zlib/])])
|
||||
|
||||
dnl libpng is required
|
||||
AC_ARG_WITH(png,dnl
|
||||
[ --with-png=DIR where to find the png library],,
|
||||
withval=yes)
|
||||
|
||||
# libpng12.so is a nightmare. We have to test separately for
|
||||
# libpng12-config and libpng-config. If we find libpng12-config,
|
||||
# we don't look for the other, which will just be a symlink to it,
|
||||
# confusing autoconf into thinking the library itself will be named -lpng,
|
||||
# which it won't be. Awful. This code will suffice unless the libpng
|
||||
# authors decide to do this AGAIN. Which I really hope they won't. TBB
|
||||
|
||||
if test "$withval" != no; then
|
||||
if test -d "$withval"; then
|
||||
if test -e "$withval/bin/libpng12-config"; then
|
||||
LIBPNG12_CONFIG="$withval/bin/libpng12-config"
|
||||
fi
|
||||
if test -e "$withval/bin/libpng-config"; then
|
||||
LIBPNG_CONFIG="$withval/bin/libpng-config"
|
||||
fi
|
||||
else
|
||||
AC_PATH_PROG([LIBPNG12_CONFIG], [libpng12-config])
|
||||
AC_PATH_PROG([LIBPNG_CONFIG], [libpng-config])
|
||||
fi
|
||||
|
||||
if test -n "$LIBPNG12_CONFIG"; then
|
||||
libpng_CPPFLAGS=`$LIBPNG12_CONFIG --cflags`
|
||||
# should be --ldopts, but it's currently broken
|
||||
libpng_LDFLAGS=`$LIBPNG12_CONFIG --ldflags`
|
||||
libpng_LDFLAGS=`echo " $libpng_LDFLAGS" | sed 's/ -l[[^ ]][[^ ]]*//g'`
|
||||
elif test -n "$LIBPNG_CONFIG"; then
|
||||
libpng_CPPFLAGS=`$LIBPNG_CONFIG --cflags`
|
||||
# should be --ldopts, but it's currently broken
|
||||
libpng_LDFLAGS=`$LIBPNG_CONFIG --ldflags`
|
||||
libpng_LDFLAGS=`echo " $libpng_LDFLAGS" | sed 's/ -l[[^ ]][[^ ]]*//g'`
|
||||
fi
|
||||
|
||||
AC_CHECK_HEADERS(png.h,,
|
||||
[AC_CHECK_HEADERS(libpng/png.h,
|
||||
[CPPFLAGS="$CPPFLAGS $libpng_CPPFLAGS/libpng"],
|
||||
[CPPFLAGS="$_cppflags"])])
|
||||
|
||||
_ldflags="$LDFLAGS"
|
||||
LDFLAGS="$libpng_LDFLAGS $LDFLAGS"
|
||||
|
||||
#TBB: png12's png_create_read_struct is just as good
|
||||
if test -n "$LIBPNG12_CONFIG"; then
|
||||
AC_CHECK_LIB(png12,png_create_read_struct,
|
||||
[LIBS="-lpng12 $LIBS"
|
||||
FEATURES="GD_PNG $FEATURES"
|
||||
AC_DEFINE(HAVE_LIBPNG, 1, [ Define if you have the png library. ])])
|
||||
fi
|
||||
# could be reached here in some case like the FreeBSD port of libpng;
|
||||
# libpng12-config but '-lpng' (not '-lpng12').
|
||||
#2.0.23: should be = not ==
|
||||
if test "$ac_cv_lib_png12_png_create_read_struct" = yes; then
|
||||
ac_cv_lib_png_png_create_read_struct=yes
|
||||
else
|
||||
AC_CHECK_LIB(png,png_create_read_struct,
|
||||
[LIBS="-lpng $LIBS"
|
||||
FEATURES="GD_PNG $FEATURES"
|
||||
AC_DEFINE(HAVE_LIBPNG, 1, [ Define if you have the png library. ])],
|
||||
[LDFLAGS="$_ldflags"])
|
||||
fi
|
||||
else
|
||||
ac_cv_lib_png_png_create_read_struct=no
|
||||
fi
|
||||
|
||||
if test "$ac_cv_lib_png_png_create_read_struct" != yes; then
|
||||
AC_MSG_WARN([libpng is required - see http://www.libpng.org/pub/png/])
|
||||
fi
|
||||
|
||||
dnl FreeType configure tests snarfed from libwmf ..
|
||||
AC_ARG_WITH(freetype,dnl
|
||||
[ --with-freetype=DIR where to find the freetype 2.x library],
|
||||
[if test "$withval" != no; then
|
||||
if test "$withval" != yes; then
|
||||
FREETYPE_DIR=$withval
|
||||
fi
|
||||
fi])
|
||||
|
||||
if test "$withval" != no; then
|
||||
|
||||
if test -n "$FREETYPE_DIR"; then
|
||||
AC_PATH_PROG(FREETYPE_CONFIG,freetype-config,,[$FREETYPE_DIR/bin:$PATH])
|
||||
else
|
||||
AC_PATH_PROG(FREETYPE_CONFIG,freetype-config)
|
||||
fi
|
||||
|
||||
if test -n "$FREETYPE_CONFIG"; then
|
||||
if test -n "$FREETYPE_DIR"; then
|
||||
libft_INCLUDES="`$FREETYPE_CONFIG --cflags` -I$FREETYPE_DIR/include"
|
||||
else
|
||||
libft_INCLUDES=`$FREETYPE_CONFIG --cflags`
|
||||
fi
|
||||
libft_LDFLAGS=`$FREETYPE_CONFIG --libs`
|
||||
libft_LDFLAGS=`echo " $libft_LDFLAGS" |sed 's/ -l[[^ ]][[^ ]]*//g'`
|
||||
else
|
||||
if test -n "$FREETYPE_DIR"; then
|
||||
libft_INCLUDES="-I$FREETYPE_DIR/include/freetype2 -I$FREETYPE_DIR/include"
|
||||
libft_LDFLAGS="-L$FREETYPE_DIR/lib"
|
||||
else
|
||||
libft_INCLUDES=""
|
||||
libft_LDFLAGS=""
|
||||
fi
|
||||
fi
|
||||
|
||||
_cppflags="$CPPFLAGS"
|
||||
_ldflags="$LDFLAGS"
|
||||
CPPFLAGS="$libft_INCLUDES $CPPFLAGS"
|
||||
LDFLAGS="$libft_LDFLAGS $LDFLAGS"
|
||||
SAVE_FEATURES=$FEATURES
|
||||
AC_CHECK_LIB(freetype,FT_Init_FreeType,
|
||||
[LIBS="-lfreetype $LIBS"
|
||||
FEATURES="GD_FREETYPE $FEATURES"
|
||||
AC_DEFINE(HAVE_LIBFREETYPE, 1, [ Define if you have the freetype library. ])],
|
||||
[LDFLAGS="$_ldflags"
|
||||
AC_MSG_WARN([not found - disabling freetype support])
|
||||
FEATURES=$SAVE_FEATURES])
|
||||
|
||||
#TBB: 2.0.26: newer gd versions require ft2build.h
|
||||
AC_CHECK_HEADERS(ft2build.h,,
|
||||
[AC_MSG_RESULT([no])
|
||||
FEATURES=$SAVE_FEATURES
|
||||
ac_cv_lib_freetype_FT_Init_FreeType=no
|
||||
CPPFLAGS="$_cppflags"])
|
||||
|
||||
else
|
||||
ac_cv_lib_freetype_FT_Init_FreeType=no
|
||||
fi
|
||||
|
||||
dnl check for libfontconfig by default
|
||||
AC_ARG_WITH(fontconfig,dnl
|
||||
[ --with-fontconfig=DIR where to find the fontconfig library],
|
||||
[if test -d "$withval"; then
|
||||
LDFLAGS="$LDFLAGS -L$withval/lib"
|
||||
CPPFLAGS="$CPPFLAGS -I$withval/include"
|
||||
fi],
|
||||
withval=yes)
|
||||
|
||||
if test "$withval" != no; then
|
||||
AC_CHECK_LIB(fontconfig,FcInit,
|
||||
[LIBS="-lfontconfig $LIBS"
|
||||
FEATURES="GD_FONTCONFIG $FEATURES"
|
||||
AC_DEFINE(HAVE_LIBFONTCONFIG, 1, [ Define if you have the fontconfig library. ])])
|
||||
else
|
||||
ac_cv_lib_fontconfig_FcInit=no
|
||||
fi
|
||||
|
||||
dnl check for libjpeg by default
|
||||
AC_ARG_WITH(jpeg,dnl
|
||||
[ --with-jpeg=DIR where to find the jpeg library],
|
||||
[if test -d "$withval"; then
|
||||
LDFLAGS="$LDFLAGS -L$withval/lib"
|
||||
CPPFLAGS="$CPPFLAGS -I$withval/include"
|
||||
fi],
|
||||
withval=yes)
|
||||
|
||||
if test "$withval" != no; then
|
||||
AC_CHECK_LIB(jpeg,jpeg_set_defaults,
|
||||
[LIBS="-ljpeg $LIBS"
|
||||
FEATURES="GD_JPEG $FEATURES"
|
||||
AC_DEFINE(HAVE_LIBJPEG, 1, [ Define if you have the jpeg library. ])])
|
||||
else
|
||||
ac_cv_lib_jpeg_jpeg_set_defaults=no
|
||||
fi
|
||||
|
||||
dnl check for libXpm by default
|
||||
AC_ARG_WITH(xpm,dnl
|
||||
[ --with-xpm=DIR where to find the xpm library],
|
||||
[if test -d "$withval"; then
|
||||
LDFLAGS="$LDFLAGS -L$withval/lib"
|
||||
CPPFLAGS="$CPPFLAGS -I$withval/include"
|
||||
fi],
|
||||
withval=yes)
|
||||
|
||||
if test "$withval" != no; then
|
||||
AC_CHECK_LIB(Xpm,XpmReadFileToXpmImage,
|
||||
[LIBS="-lXpm -lX11 $LIBS"
|
||||
FEATURES="GD_XPM $FEATURES"
|
||||
AC_DEFINE(HAVE_LIBXPM, 1, [ Define if you have the Xpm library. ])],,
|
||||
[-lX11])
|
||||
else
|
||||
ac_cv_lib_Xpm_XpmReadFileToXpmImage=no
|
||||
fi
|
||||
|
||||
ACX_PTHREAD()
|
||||
|
||||
dnl report configuration
|
||||
AC_MSG_RESULT([
|
||||
** Configuration summary for $PACKAGE $VERSION:
|
||||
|
||||
Support for PNG library: $ac_cv_lib_png_png_create_read_struct
|
||||
Support for JPEG library: $ac_cv_lib_jpeg_jpeg_set_defaults
|
||||
Support for Freetype 2.x library: $ac_cv_lib_freetype_FT_Init_FreeType
|
||||
Support for Fontconfig library: $ac_cv_lib_fontconfig_FcInit
|
||||
Support for Xpm library: $ac_cv_lib_Xpm_XpmReadFileToXpmImage
|
||||
Support for pthreads: $acx_pthread_ok
|
||||
])
|
||||
|
||||
AC_CONFIG_FILES([Makefile src/Makefile config/Makefile config/gdlib-config test/Makefile])
|
||||
|
||||
AC_OUTPUT
|
||||
|
|
@ -1,90 +1,3 @@
|
|||
# Process this file with autoconf to produce a configure script.
|
||||
# Configure template for gd library
|
||||
|
||||
#
|
||||
AC_PREREQ(2.54)
|
||||
|
||||
#HEY! Change BOTH the version number and the GDLIB_REVISION setting!
|
||||
AC_INIT([GD], [2.1.0], [http://bugs.libgd.org])
|
||||
AC_CONFIG_SRCDIR([gd.c])
|
||||
AC_CONFIG_AUX_DIR(config)
|
||||
AC_CANONICAL_TARGET([])
|
||||
|
||||
GDLIB_MAJOR=2
|
||||
GDLIB_MINOR=1
|
||||
GDLIB_REVISION=0
|
||||
GDLIBNAME=gd
|
||||
#Expanded by tests later in this file. TBB 2.0.26
|
||||
#2.0.28: GIF is standard now. Doesn't depend on anything else,
|
||||
#so we always build it.
|
||||
FEATURES="GD_GIF GD_GIFANIM GD_OPENPOLYGON"
|
||||
AC_SUBST(FEATURES)
|
||||
|
||||
AC_SUBST(GDLIB_MAJOR)
|
||||
AC_SUBST(GDLIB_MINOR)
|
||||
AC_SUBST(GDLIB_REVISION)
|
||||
AC_SUBST(GDLIBNAME)
|
||||
|
||||
AM_INIT_AUTOMAKE()
|
||||
AC_CONFIG_HEADERS([config.h:config.hin])
|
||||
|
||||
AC_MSG_CHECKING([if we are building a Cygwin target])
|
||||
case "$target" in
|
||||
*-*-cygwin*) XTRA_LDFLAGS="-no-undefined"
|
||||
os_cygwin=yes
|
||||
;;
|
||||
*) XTRA_LDFLAGS=
|
||||
os_cygwin=no
|
||||
;;
|
||||
esac
|
||||
AC_MSG_RESULT([$os_cygwin])
|
||||
AC_SUBST([XTRA_LDFLAGS])
|
||||
|
||||
AC_PROG_CC
|
||||
AM_PROG_CC_STDC
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_LIBTOOL
|
||||
AC_PROG_LN_S
|
||||
AC_PROG_MAKE_SET
|
||||
#AC_PROG_RANLIB
|
||||
|
||||
dnl may be required for freetype and Xpm
|
||||
AC_PATH_X
|
||||
|
||||
if test -n "$x_includes" && test "x$x_includes" != xNONE ; then
|
||||
CPPFLAGS="$CPPFLAGS -I$x_includes"
|
||||
fi
|
||||
if test -n "$x_libraries" && test "x$x_libraries" != xNONE ; then
|
||||
LDFLAGS="$LDFLAGS -L$x_libraries"
|
||||
fi
|
||||
|
||||
AC_HEADER_STDC
|
||||
AC_CHECK_HEADERS([errno.h limits.h stddef.h stdlib.h string.h unistd.h])
|
||||
|
||||
AM_ICONV
|
||||
# if test -n "$LIBICONV" ; then
|
||||
# LIBS="$LIBS $LIBICONV"
|
||||
# fi
|
||||
|
||||
AC_CHECK_HEADERS(iconv.h,
|
||||
[AC_MSG_CHECKING(whether iconv.h defines iconv_t)
|
||||
AC_EGREP_HEADER([typedef.*iconv_t],iconv.h,
|
||||
[AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_ICONV_T_DEF, 1,
|
||||
[Define if <iconv.h> defines iconv_t.])],
|
||||
AC_MSG_RESULT(no))])
|
||||
|
||||
# Checks for typedefs, structures, and compiler characteristics.
|
||||
#AC_C_CONST
|
||||
#AC_TYPE_SIZE_T
|
||||
|
||||
# Checks for library functions.
|
||||
#AC_FUNC_ERROR_AT_LINE
|
||||
#AC_FUNC_MALLOC
|
||||
#AC_FUNC_REALLOC
|
||||
#AC_FUNC_VPRINTF
|
||||
#AC_CHECK_FUNCS([floor memset sqrt strchr strdup strtol])
|
||||
|
||||
##### http://autoconf-archive.cryp.to/acx_pthread.html
|
||||
#
|
||||
# SYNOPSIS
|
||||
|
|
@ -364,216 +277,3 @@ else
|
|||
fi
|
||||
AC_LANG_RESTORE
|
||||
])dnl ACX_PTHREAD
|
||||
|
||||
dnl do we need to specify -lm explicitly?
|
||||
AC_CHECK_FUNC(sin,,[AC_CHECK_LIB(m,sin)])
|
||||
|
||||
dnl zlib is required
|
||||
AC_CHECK_LIB(z,deflate,
|
||||
[LIBS="-lz $LIBS"
|
||||
AC_DEFINE(HAVE_LIBZ, 1, [ Define if you have zlib. ])],
|
||||
[AC_MSG_WARN([zlib is required - see http://www.gzip.org/zlib/])])
|
||||
|
||||
dnl libpng is required
|
||||
AC_ARG_WITH(png,dnl
|
||||
[ --with-png=DIR where to find the png library],,
|
||||
withval=yes)
|
||||
|
||||
# libpng12.so is a nightmare. We have to test separately for
|
||||
# libpng12-config and libpng-config. If we find libpng12-config,
|
||||
# we don't look for the other, which will just be a symlink to it,
|
||||
# confusing autoconf into thinking the library itself will be named -lpng,
|
||||
# which it won't be. Awful. This code will suffice unless the libpng
|
||||
# authors decide to do this AGAIN. Which I really hope they won't. TBB
|
||||
|
||||
if test "$withval" != no; then
|
||||
if test -d "$withval"; then
|
||||
if test -e "$withval/bin/libpng12-config"; then
|
||||
LIBPNG12_CONFIG="$withval/bin/libpng12-config"
|
||||
fi
|
||||
if test -e "$withval/bin/libpng-config"; then
|
||||
LIBPNG_CONFIG="$withval/bin/libpng-config"
|
||||
fi
|
||||
else
|
||||
AC_PATH_PROG([LIBPNG12_CONFIG], [libpng12-config])
|
||||
AC_PATH_PROG([LIBPNG_CONFIG], [libpng-config])
|
||||
fi
|
||||
|
||||
if test -n "$LIBPNG12_CONFIG"; then
|
||||
libpng_CPPFLAGS=`$LIBPNG12_CONFIG --cflags`
|
||||
# should be --ldopts, but it's currently broken
|
||||
libpng_LDFLAGS=`$LIBPNG12_CONFIG --ldflags`
|
||||
libpng_LDFLAGS=`echo " $libpng_LDFLAGS" | sed 's/ -l[[^ ]][[^ ]]*//g'`
|
||||
elif test -n "$LIBPNG_CONFIG"; then
|
||||
libpng_CPPFLAGS=`$LIBPNG_CONFIG --cflags`
|
||||
# should be --ldopts, but it's currently broken
|
||||
libpng_LDFLAGS=`$LIBPNG_CONFIG --ldflags`
|
||||
libpng_LDFLAGS=`echo " $libpng_LDFLAGS" | sed 's/ -l[[^ ]][[^ ]]*//g'`
|
||||
fi
|
||||
|
||||
AC_CHECK_HEADERS(png.h,,
|
||||
[AC_CHECK_HEADERS(libpng/png.h,
|
||||
[CPPFLAGS="$CPPFLAGS $libpng_CPPFLAGS/libpng"],
|
||||
[CPPFLAGS="$_cppflags"])])
|
||||
|
||||
_ldflags="$LDFLAGS"
|
||||
LDFLAGS="$libpng_LDFLAGS $LDFLAGS"
|
||||
|
||||
#TBB: png12's png_create_read_struct is just as good
|
||||
if test -n "$LIBPNG12_CONFIG"; then
|
||||
AC_CHECK_LIB(png12,png_create_read_struct,
|
||||
[LIBS="-lpng12 $LIBS"
|
||||
FEATURES="GD_PNG $FEATURES"
|
||||
AC_DEFINE(HAVE_LIBPNG, 1, [ Define if you have the png library. ])])
|
||||
fi
|
||||
# could be reached here in some case like the FreeBSD port of libpng;
|
||||
# libpng12-config but '-lpng' (not '-lpng12').
|
||||
#2.0.23: should be = not ==
|
||||
if test "$ac_cv_lib_png12_png_create_read_struct" = yes; then
|
||||
ac_cv_lib_png_png_create_read_struct=yes
|
||||
else
|
||||
AC_CHECK_LIB(png,png_create_read_struct,
|
||||
[LIBS="-lpng $LIBS"
|
||||
FEATURES="GD_PNG $FEATURES"
|
||||
AC_DEFINE(HAVE_LIBPNG, 1, [ Define if you have the png library. ])],
|
||||
[LDFLAGS="$_ldflags"])
|
||||
fi
|
||||
else
|
||||
ac_cv_lib_png_png_create_read_struct=no
|
||||
fi
|
||||
|
||||
if test "$ac_cv_lib_png_png_create_read_struct" != yes; then
|
||||
AC_MSG_WARN([libpng is required - see http://www.libpng.org/pub/png/])
|
||||
fi
|
||||
|
||||
dnl FreeType configure tests snarfed from libwmf ..
|
||||
AC_ARG_WITH(freetype,dnl
|
||||
[ --with-freetype=DIR where to find the freetype 2.x library],
|
||||
[if test "$withval" != no; then
|
||||
if test "$withval" != yes; then
|
||||
FREETYPE_DIR=$withval
|
||||
fi
|
||||
fi])
|
||||
|
||||
if test "$withval" != no; then
|
||||
|
||||
if test -n "$FREETYPE_DIR"; then
|
||||
AC_PATH_PROG(FREETYPE_CONFIG,freetype-config,,[$FREETYPE_DIR/bin:$PATH])
|
||||
else
|
||||
AC_PATH_PROG(FREETYPE_CONFIG,freetype-config)
|
||||
fi
|
||||
|
||||
if test -n "$FREETYPE_CONFIG"; then
|
||||
if test -n "$FREETYPE_DIR"; then
|
||||
libft_INCLUDES="`$FREETYPE_CONFIG --cflags` -I$FREETYPE_DIR/include"
|
||||
else
|
||||
libft_INCLUDES=`$FREETYPE_CONFIG --cflags`
|
||||
fi
|
||||
libft_LDFLAGS=`$FREETYPE_CONFIG --libs`
|
||||
libft_LDFLAGS=`echo " $libft_LDFLAGS" |sed 's/ -l[[^ ]][[^ ]]*//g'`
|
||||
else
|
||||
if test -n "$FREETYPE_DIR"; then
|
||||
libft_INCLUDES="-I$FREETYPE_DIR/include/freetype2 -I$FREETYPE_DIR/include"
|
||||
libft_LDFLAGS="-L$FREETYPE_DIR/lib"
|
||||
else
|
||||
libft_INCLUDES=""
|
||||
libft_LDFLAGS=""
|
||||
fi
|
||||
fi
|
||||
|
||||
_cppflags="$CPPFLAGS"
|
||||
_ldflags="$LDFLAGS"
|
||||
CPPFLAGS="$libft_INCLUDES $CPPFLAGS"
|
||||
LDFLAGS="$libft_LDFLAGS $LDFLAGS"
|
||||
SAVE_FEATURES=$FEATURES
|
||||
AC_CHECK_LIB(freetype,FT_Init_FreeType,
|
||||
[LIBS="-lfreetype $LIBS"
|
||||
FEATURES="GD_FREETYPE $FEATURES"
|
||||
AC_DEFINE(HAVE_LIBFREETYPE, 1, [ Define if you have the freetype library. ])],
|
||||
[LDFLAGS="$_ldflags"
|
||||
AC_MSG_WARN([not found - disabling freetype support])
|
||||
FEATURES=$SAVE_FEATURES])
|
||||
|
||||
#TBB: 2.0.26: newer gd versions require ft2build.h
|
||||
AC_CHECK_HEADERS(ft2build.h,,
|
||||
[AC_MSG_RESULT([no])
|
||||
FEATURES=$SAVE_FEATURES
|
||||
ac_cv_lib_freetype_FT_Init_FreeType=no
|
||||
CPPFLAGS="$_cppflags"])
|
||||
|
||||
else
|
||||
ac_cv_lib_freetype_FT_Init_FreeType=no
|
||||
fi
|
||||
|
||||
dnl check for libfontconfig by default
|
||||
AC_ARG_WITH(fontconfig,dnl
|
||||
[ --with-fontconfig=DIR where to find the fontconfig library],
|
||||
[if test -d "$withval"; then
|
||||
LDFLAGS="$LDFLAGS -L$withval/lib"
|
||||
CPPFLAGS="$CPPFLAGS -I$withval/include"
|
||||
fi],
|
||||
withval=yes)
|
||||
|
||||
if test "$withval" != no; then
|
||||
AC_CHECK_LIB(fontconfig,FcInit,
|
||||
[LIBS="-lfontconfig $LIBS"
|
||||
FEATURES="GD_FONTCONFIG $FEATURES"
|
||||
AC_DEFINE(HAVE_LIBFONTCONFIG, 1, [ Define if you have the fontconfig library. ])])
|
||||
else
|
||||
ac_cv_lib_fontconfig_FcInit=no
|
||||
fi
|
||||
|
||||
dnl check for libjpeg by default
|
||||
AC_ARG_WITH(jpeg,dnl
|
||||
[ --with-jpeg=DIR where to find the jpeg library],
|
||||
[if test -d "$withval"; then
|
||||
LDFLAGS="$LDFLAGS -L$withval/lib"
|
||||
CPPFLAGS="$CPPFLAGS -I$withval/include"
|
||||
fi],
|
||||
withval=yes)
|
||||
|
||||
if test "$withval" != no; then
|
||||
AC_CHECK_LIB(jpeg,jpeg_set_defaults,
|
||||
[LIBS="-ljpeg $LIBS"
|
||||
FEATURES="GD_JPEG $FEATURES"
|
||||
AC_DEFINE(HAVE_LIBJPEG, 1, [ Define if you have the jpeg library. ])])
|
||||
else
|
||||
ac_cv_lib_jpeg_jpeg_set_defaults=no
|
||||
fi
|
||||
|
||||
dnl check for libXpm by default
|
||||
AC_ARG_WITH(xpm,dnl
|
||||
[ --with-xpm=DIR where to find the xpm library],
|
||||
[if test -d "$withval"; then
|
||||
LDFLAGS="$LDFLAGS -L$withval/lib"
|
||||
CPPFLAGS="$CPPFLAGS -I$withval/include"
|
||||
fi],
|
||||
withval=yes)
|
||||
|
||||
if test "$withval" != no; then
|
||||
AC_CHECK_LIB(Xpm,XpmReadFileToXpmImage,
|
||||
[LIBS="-lXpm -lX11 $LIBS"
|
||||
FEATURES="GD_XPM $FEATURES"
|
||||
AC_DEFINE(HAVE_LIBXPM, 1, [ Define if you have the Xpm library. ])],,
|
||||
[-lX11])
|
||||
else
|
||||
ac_cv_lib_Xpm_XpmReadFileToXpmImage=no
|
||||
fi
|
||||
|
||||
ACX_PTHREAD()
|
||||
|
||||
dnl report configuration
|
||||
AC_MSG_RESULT([
|
||||
** Configuration summary for $PACKAGE $VERSION:
|
||||
|
||||
Support for PNG library: $ac_cv_lib_png_png_create_read_struct
|
||||
Support for JPEG library: $ac_cv_lib_jpeg_jpeg_set_defaults
|
||||
Support for Freetype 2.x library: $ac_cv_lib_freetype_FT_Init_FreeType
|
||||
Support for Fontconfig library: $ac_cv_lib_fontconfig_FcInit
|
||||
Support for Xpm library: $ac_cv_lib_Xpm_XpmReadFileToXpmImage
|
||||
Support for pthreads: $acx_pthread_ok
|
||||
])
|
||||
|
||||
AC_CONFIG_FILES([Makefile config/Makefile config/gdlib-config test/Makefile])
|
||||
|
||||
AC_OUTPUT
|
||||
|
|
@ -1,6 +1,4 @@
|
|||
## Process this file with automake to produce Makefile.in -*-Makefile-*-
|
||||
AUTOMAKE_OPTIONS = foreign 1.7
|
||||
|
||||
bin_PROGRAMS = annotate gdparttopng gdtopng gd2copypal gd2topng pngtogd pngtogd2 webpng gd2togif gdcmpgif giftogd2
|
||||
|
||||
bin_SCRIPTS = bdftogd
|
||||
|
|
@ -13,11 +11,11 @@ include_HEADERS = gd.h gdfx.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h g
|
|||
|
||||
lib_LTLIBRARIES = libgd.la
|
||||
|
||||
libgd_la_SOURCES = gd.c gd_color.c gd_color_map.c gd_transform.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h gdkanji.c gdtables.c gdxpm.c jisx0208.h wbmp.c wbmp.h gd_pixelate.c gd_filter.c
|
||||
libgd_la_SOURCES = gd.c gd_color.c gd_color_map.c gd_transform.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h gdkanji.c gdtables.c gdxpm.c jisx0208.h wbmp.c wbmp.h gd_filter.c gd_nnquant.c
|
||||
|
||||
libgd_la_LDFLAGS = -version-info 2:0:0 $(XTRA_LDFLAGS)
|
||||
|
||||
libgd_la_LIBADD = $(LTLIBICONV)
|
||||
|
||||
LDADD = ./libgd.la $(LIBICONV)
|
||||
LDADD = libgd.la $(LIBICONV)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,2 @@
|
|||
## Process this file with automake to produce Makefile.in -*-Makefile-*-
|
||||
AUTOMAKE_OPTIONS = foreign 1.7
|
||||
|
||||
EXTRA_DIST = gdtest.gd2 gdtest.png gdtest_200_300_150_100.png gdtest_merge.png gdtest_wbmp_to_png.png
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue