projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add gnome thumbnailer for .sif images. Thanks to Adrian Winchell (SnapSilverlight).
[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
f683639
..
09ebcfb
100644
(file)
--- a/
synfig-core/trunk/config/configure.ac
+++ b/
synfig-core/trunk/config/configure.ac
@@
-1,4
+1,4
@@
-i# $Header: /opt/voria/cvs/s
inf
g/config/configure.ac,v 1.10 2005/03/24 21:07:24 darco Exp $
+i# $Header: /opt/voria/cvs/s
ynfi
g/config/configure.ac,v 1.10 2005/03/24 21:07:24 darco Exp $
# -- I N I T --------------------------------------------------
# -- I N I T --------------------------------------------------
@@
-15,7
+15,7
@@
dnl AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE
AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE
-AC_LIBLTDL_
CONVENIENC
E
+AC_LIBLTDL_
INSTALLABL
E
AC_SUBST(INCLTDL)
AC_SUBST(LIBLTDL)
AC_SUBST(INCLTDL)
AC_SUBST(LIBLTDL)
@@
-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 ------------------------------------------
@@
-129,7
+131,7
@@
AC_ARG_ENABLE(layer-profiling,[
use_layerprofiling="no"
])
if test $use_layerprofiling = "yes" ; then {
use_layerprofiling="no"
])
if test $use_layerprofiling = "yes" ; then {
- AC_DEFINE(S
INFG_PROFILE_LAYERS,[1],[enable layer profiling])
+ AC_DEFINE(S
YNFIG_PROFILE_LAYERS,[1],[enable layer profiling])
} ; fi
} ; fi
@@
-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,10
+227,14
@@
AC_ARG_WITH(freetype,[
if test $with_freetype != "no" ; then {
if test $with_freetype != "no" ; then {
- PKG_CHECK_MODULES(FREETYPE,
freetype2
,[
+ PKG_CHECK_MODULES(FREETYPE,
xft freetype2 fontconfig
,[
with_freetype="yes"
],[
with_freetype="yes"
],[
- with_freetype="no"
+ PKG_CHECK_MODULES(FREETYPE, freetype2 fontconfig,[
+ with_freetype="yes"
+ ],[
+ with_freetype="no"
+ ])
])
# AC_CHECK_FT2(,[
# with_freetype="yes"
])
# AC_CHECK_FT2(,[
# with_freetype="yes"
@@
-337,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"
@@
-348,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,[],[
@@
-359,11
+366,11
@@
dnl ])
-MODULE_DIR='${libdir}/s
inf
g/modules'
-moduledir=$libdir/s
inf
g/modules
+MODULE_DIR='${libdir}/s
ynfi
g/modules'
+moduledir=$libdir/s
ynfi
g/modules
AC_SUBST(MODULE_DIR)
AC_SUBST(MODULE_DIR)
-S
INFGLIB_DIR=$libdir/sinf
g
-AC_SUBST(S
INF
GLIB_DIR)
+S
YNFIGLIB_DIR=$libdir/synfi
g
+AC_SUBST(S
YNFI
GLIB_DIR)
@@
-371,7
+378,7
@@
AC_SUBST(SINFGLIB_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
@@
-453,28
+460,28
@@
AC_SUBST(VERSION_REV)
dnl AC_CONFIG_SUBDIRS(libltdl)
dnl AC_CONFIG_SUBDIRS(libltdl)
-CONFIG_LIBS="-ls
inf
g"
+CONFIG_LIBS="-ls
ynfi
g"
CONFIG_CFLAGS="$CONFIG_CFLAGS"
AC_SUBST(CONFIG_LIBS)
AC_SUBST(CONFIG_CFLAGS)
AC_SUBST(CONFIG_DEPS)
AC_SUBST(ETL_CFLAGS)
CONFIG_CFLAGS="$CONFIG_CFLAGS"
AC_SUBST(CONFIG_LIBS)
AC_SUBST(CONFIG_CFLAGS)
AC_SUBST(CONFIG_DEPS)
AC_SUBST(ETL_CFLAGS)
-S
INFG_LIBS="$VIMAGE_LIBS $LIBXMLPP_LIBS $ETL_LIBS $OPENEXR
_LIBS $LIBSIGC_LIBS"
-S
INFG_CFLAGS="$LIBXMLPP_CFLAGS $ETL_CFLAGS $OPENEXR_CFLAGS $LIBSIGC_CFLAGS $CONFIG_CFLAGS -DSINF
G_NO_DEPRECATED"
+S
YNFIG_LIBS="$VIMAGE_LIBS $LIBXMLPP_LIBS $ETL
_LIBS $LIBSIGC_LIBS"
+S
YNFIG_CFLAGS="$LIBXMLPP_CFLAGS $ETL_CFLAGS $LIBSIGC_CFLAGS $CONFIG_CFLAGS -DSYNFI
G_NO_DEPRECATED"
CONFIG_CFLAGS="`echo $CONFIG_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
CONFIG_CFLAGS="`echo $CONFIG_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
-S
INFG_CFLAGS="`echo $SINF
G_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
-S
INFG_LIBS="`echo $SINF
G_LIBS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
+S
YNFIG_CFLAGS="`echo $SYNFI
G_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
+S
YNFIG_LIBS="`echo $SYNFI
G_LIBS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
AC_SUBST(LIBADD_DL)
AC_SUBST(LIBADD_DL)
-AC_SUBST(S
INF
G_LIBS)
-AC_SUBST(S
INF
G_CFLAGS)
+AC_SUBST(S
YNFI
G_LIBS)
+AC_SUBST(S
YNFI
G_CFLAGS)
AC_SUBST(API_VERSION)
AC_SUBST(API_VERSION)
-s
infgincludedir=$includedir/sinf
g-@API_VERSION@
-AC_SUBST(s
inf
gincludedir)
+s
ynfigincludedir=$includedir/synfi
g-@API_VERSION@
+AC_SUBST(s
ynfi
gincludedir)
[(
[ -d libltdl ] || mkdir libltdl;
[(
[ -d libltdl ] || mkdir libltdl;
@@
-488,13
+495,12
@@
AC_SUBST(sinfgincludedir)
)]
AC_OUTPUT(
)]
AC_OUTPUT(
-s
inf
g-config
+s
ynfi
g-config
@PACKAGE_TARNAME@.pc
Makefile
src/Makefile
@PACKAGE_TARNAME@.pc
Makefile
src/Makefile
-src/s
inf
g/Makefile
+src/s
ynfi
g/Makefile
src/modules/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
@@
-514,7
+520,8
@@
src/modules/mod_libavcodec/Makefile
src/modules/mod_yuv420p/Makefile
src/modules/mod_particle/Makefile
src/tool/Makefile
src/modules/mod_yuv420p/Makefile
src/modules/mod_particle/Makefile
src/tool/Makefile
-src/modules/sinfg_modules.cfg
+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
@@
-553,10
+560,10
@@
Using OpenEXR's \"half\" type ------> $use_openexr_half
"'$'"CXX ------------------------------> '$CXX'
"'$'"CXXFLAGS -------------------------> '$CXXFLAGS'
"'$'"CXX ------------------------------> '$CXX'
"'$'"CXXFLAGS -------------------------> '$CXXFLAGS'
-"'$'"S
INFG_LIBS -----------------------> '$SINF
G_LIBS'
+"'$'"S
YNFIG_LIBS -----------------------> '$SYNFI
G_LIBS'
"'$'"LIBXMLPP_LIBS --------------------> '$LIBXMLPP_LIBS'
"'$'"ETL_LIBS -------------------------> '$ETL_LIBS'
"'$'"LIBSIGC_LIBS ---------------------> '$LIBSIGC_LIBS'
"'$'"LIBXMLPP_LIBS --------------------> '$LIBXMLPP_LIBS'
"'$'"ETL_LIBS -------------------------> '$ETL_LIBS'
"'$'"LIBSIGC_LIBS ---------------------> '$LIBSIGC_LIBS'
-"'$'"S
INFG_CFLAGS ---------------------> '$SINF
G_CFLAGS'
+"'$'"S
YNFIG_CFLAGS ---------------------> '$SYNFI
G_CFLAGS'
"'$'"LIBADD_DL ------------------------> '$LIBADD_DL'
"
"'$'"LIBADD_DL ------------------------> '$LIBADD_DL'
"