projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent FTBFS when we have both xft and freetype2 installed.
[synfig.git]
/
synfig-core
/
trunk
/
config
/
configure.ac
diff --git
a/synfig-core/trunk/config/configure.ac
b/synfig-core/trunk/config/configure.ac
index
0fb932f
..
725ea96
100644
(file)
--- a/
synfig-core/trunk/config/configure.ac
+++ b/
synfig-core/trunk/config/configure.ac
@@
-29,6
+29,8
@@
AC_DEFINE(LT_SCOPE,[extern],[LibLTDL is linked staticly])
# -- V A R I A B L E S ----------------------------------------
# -- V A R I A B L E S ----------------------------------------
+SVN_REPOSITORY=@SVN_REPOSITORY@
+AC_SUBST(SVN_REPOSITORY)
# -- P R O G R A M S ------------------------------------------
# -- P R O G R A M S ------------------------------------------
@@
-138,7
+140,8
@@
if test $use_layerprofiling = "yes" ; then {
AC_ARG_WITH(imagemagick,[
--without-imagemagick Disable support for ImageMagick],[
],[
AC_ARG_WITH(imagemagick,[
--without-imagemagick Disable support for ImageMagick],[
],[
- with_imagemagick="yes"
+ AC_CHECK_PROG([imagemagick_convert],[convert],[yes],[no])
+ with_imagemagick=$imagemagick_convert
])
if test $with_imagemagick = "no" ; then {
AM_CONDITIONAL(WITH_IMAGEMAGICK,false)
])
if test $with_imagemagick = "no" ; then {
AM_CONDITIONAL(WITH_IMAGEMAGICK,false)
@@
-224,7
+227,7
@@
AC_ARG_WITH(freetype,[
if test $with_freetype != "no" ; then {
if test $with_freetype != "no" ; then {
- PKG_CHECK_MODULES(FREETYPE, xft fontconfig,[
+ PKG_CHECK_MODULES(FREETYPE, xft f
reetype2 f
ontconfig,[
with_freetype="yes"
],[
PKG_CHECK_MODULES(FREETYPE, freetype2 fontconfig,[
with_freetype="yes"
],[
PKG_CHECK_MODULES(FREETYPE, freetype2 fontconfig,[
@@
-341,7
+344,7
@@
AC_CHECK_LIB(png, png_write_row,[
AC_MSG_RESULT([ *** PNG Output target disabled])
TARGET_PNG="no"
AM_CONDITIONAL(HAVE_LIBPNG,false)
AC_MSG_RESULT([ *** PNG Output target disabled])
TARGET_PNG="no"
AM_CONDITIONAL(HAVE_LIBPNG,false)
-],[-lz])
+],[-lz
-L${exec_prefix}/lib
])
AC_CHECK_LIB(jpeg, main,[
JPEG_LIBS="-ljpeg"
AC_CHECK_LIB(jpeg, main,[
JPEG_LIBS="-ljpeg"
@@
-352,7
+355,7
@@
AC_CHECK_LIB(jpeg, main,[
AC_MSG_RESULT([ *** JPEG Output target disabled])
TARGET_JPEG="no"
AM_CONDITIONAL(HAVE_LIBJPEG,false)
AC_MSG_RESULT([ *** JPEG Output target disabled])
TARGET_JPEG="no"
AM_CONDITIONAL(HAVE_LIBJPEG,false)
-],[])
+],[
-L${exec_prefix}/lib
])
dnl AC_CHECK_HEADERS(jpeglib.h,[],[
dnl AC_CHECK_HEADERS(jpeglib.h,[],[
@@
-375,7
+378,7
@@
AC_SUBST(SYNFIGLIB_DIR)
CXXFLAGS="$CXXFLAGS -fpermissive"
CXXFLAGS="$CXXFLAGS -fpermissive"
-AC_CHECK_HEADERS(signal.h termios.h)
+AC_CHECK_HEADERS(signal.h termios.h
sys/errno.h
)
case "$host" in
case "$host" in
@@
-464,8
+467,8
@@
AC_SUBST(CONFIG_CFLAGS)
AC_SUBST(CONFIG_DEPS)
AC_SUBST(ETL_CFLAGS)
AC_SUBST(CONFIG_DEPS)
AC_SUBST(ETL_CFLAGS)
-SYNFIG_LIBS="$VIMAGE_LIBS $LIBXMLPP_LIBS $ETL_LIBS $
OPENEXR_LIBS $
LIBSIGC_LIBS"
-SYNFIG_CFLAGS="$LIBXMLPP_CFLAGS $ETL_CFLAGS $
OPENEXR_CFLAGS $
LIBSIGC_CFLAGS $CONFIG_CFLAGS -DSYNFIG_NO_DEPRECATED"
+SYNFIG_LIBS="$VIMAGE_LIBS $LIBXMLPP_LIBS $ETL_LIBS $LIBSIGC_LIBS"
+SYNFIG_CFLAGS="$LIBXMLPP_CFLAGS $ETL_CFLAGS $LIBSIGC_CFLAGS $CONFIG_CFLAGS -DSYNFIG_NO_DEPRECATED"
CONFIG_CFLAGS="`echo $CONFIG_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
SYNFIG_CFLAGS="`echo $SYNFIG_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
CONFIG_CFLAGS="`echo $CONFIG_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
SYNFIG_CFLAGS="`echo $SYNFIG_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
@@
-498,7
+501,6
@@
Makefile
src/Makefile
src/synfig/Makefile
src/modules/Makefile
src/Makefile
src/synfig/Makefile
src/modules/Makefile
-src/modules/example/Makefile
src/modules/mod_filter/Makefile
src/modules/mod_bmp/Makefile
src/modules/mod_gif/Makefile
src/modules/mod_filter/Makefile
src/modules/mod_bmp/Makefile
src/modules/mod_gif/Makefile
@@
-519,6
+521,7
@@
src/modules/mod_yuv420p/Makefile
src/modules/mod_particle/Makefile
src/tool/Makefile
src/modules/synfig_modules.cfg
src/modules/mod_particle/Makefile
src/tool/Makefile
src/modules/synfig_modules.cfg
+examples/Makefile
win32inst.nsi
pkg-info/macosx/synfig-core.info
dnl src/modules/trgt_mpg/Makefile
win32inst.nsi
pkg-info/macosx/synfig-core.info
dnl src/modules/trgt_mpg/Makefile