X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfig%2Fconfigure.ac;h=09ebcfbc1898d6268d1935678a846d8a6d2057fd;hb=633c08b084b6ab9868e0c0f428903467e536afb9;hp=f683639e3e11dd08bc330a4a9948fe3e6b9d54eb;hpb=18f426c62a55555033ed25ae1b0037638b18553f;p=synfig.git

diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac
index f683639..09ebcfb 100644
--- a/synfig-core/trunk/config/configure.ac
+++ b/synfig-core/trunk/config/configure.ac
@@ -1,4 +1,4 @@
-i# $Header: /opt/voria/cvs/sinfg/config/configure.ac,v 1.10 2005/03/24 21:07:24 darco Exp $
+i# $Header: /opt/voria/cvs/synfig/config/configure.ac,v 1.10 2005/03/24 21:07:24 darco Exp $
 
 # -- I N I T --------------------------------------------------
 
@@ -15,7 +15,7 @@ dnl AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
 
-AC_LIBLTDL_CONVENIENCE
+AC_LIBLTDL_INSTALLABLE
 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 ----------------------------------------
 
+SVN_REPOSITORY=@SVN_REPOSITORY@
+AC_SUBST(SVN_REPOSITORY)
 
 # -- 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 {
-	AC_DEFINE(SINFG_PROFILE_LAYERS,[1],[enable layer profiling])	
+	AC_DEFINE(SYNFIG_PROFILE_LAYERS,[1],[enable layer profiling])	
 } ; fi
 
 
@@ -138,7 +140,8 @@ if test $use_layerprofiling = "yes" ; then {
 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)
@@ -224,10 +227,14 @@ AC_ARG_WITH(freetype,[
 
 
 if test $with_freetype != "no" ; then {
-	PKG_CHECK_MODULES(FREETYPE, freetype2,[
+	PKG_CHECK_MODULES(FREETYPE, xft freetype2 fontconfig,[
 		with_freetype="yes"
 	],[
-		with_freetype="no"
+		PKG_CHECK_MODULES(FREETYPE, freetype2 fontconfig,[
+			with_freetype="yes"
+		],[
+			with_freetype="no"
+		])
 	])
 #	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)
-],[-lz])
+],[-lz -L${exec_prefix}/lib])
 
 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)
-],[])
+],[-L${exec_prefix}/lib])
 
 
 dnl AC_CHECK_HEADERS(jpeglib.h,[],[
@@ -359,11 +366,11 @@ dnl ])
 
 
 
-MODULE_DIR='${libdir}/sinfg/modules'
-moduledir=$libdir/sinfg/modules
+MODULE_DIR='${libdir}/synfig/modules'
+moduledir=$libdir/synfig/modules
 AC_SUBST(MODULE_DIR)
-SINFGLIB_DIR=$libdir/sinfg
-AC_SUBST(SINFGLIB_DIR)
+SYNFIGLIB_DIR=$libdir/synfig
+AC_SUBST(SYNFIGLIB_DIR)
 
 
 
@@ -371,7 +378,7 @@ AC_SUBST(SINFGLIB_DIR)
 
 CXXFLAGS="$CXXFLAGS -fpermissive"
 
-AC_CHECK_HEADERS(signal.h termios.h)
+AC_CHECK_HEADERS(signal.h termios.h sys/errno.h)
 
 
 case "$host" in
@@ -453,28 +460,28 @@ AC_SUBST(VERSION_REV)
 
 dnl AC_CONFIG_SUBDIRS(libltdl)
 
-CONFIG_LIBS="-lsinfg"
+CONFIG_LIBS="-lsynfig"
 CONFIG_CFLAGS="$CONFIG_CFLAGS"
 AC_SUBST(CONFIG_LIBS)
 AC_SUBST(CONFIG_CFLAGS)
 AC_SUBST(CONFIG_DEPS)
 AC_SUBST(ETL_CFLAGS)
 
-SINFG_LIBS="$VIMAGE_LIBS $LIBXMLPP_LIBS $ETL_LIBS $OPENEXR_LIBS $LIBSIGC_LIBS"
-SINFG_CFLAGS="$LIBXMLPP_CFLAGS $ETL_CFLAGS $OPENEXR_CFLAGS $LIBSIGC_CFLAGS $CONFIG_CFLAGS -DSINFG_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`"
-SINFG_CFLAGS="`echo $SINFG_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
-SINFG_LIBS="`echo $SINFG_LIBS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
+SYNFIG_CFLAGS="`echo $SYNFIG_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
+SYNFIG_LIBS="`echo $SYNFIG_LIBS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
 
 AC_SUBST(LIBADD_DL)
 
-AC_SUBST(SINFG_LIBS)
-AC_SUBST(SINFG_CFLAGS)
+AC_SUBST(SYNFIG_LIBS)
+AC_SUBST(SYNFIG_CFLAGS)
 AC_SUBST(API_VERSION)
 
-sinfgincludedir=$includedir/sinfg-@API_VERSION@
-AC_SUBST(sinfgincludedir)
+synfigincludedir=$includedir/synfig-@API_VERSION@
+AC_SUBST(synfigincludedir)
 
 [(
 	[ -d libltdl ] || mkdir libltdl;
@@ -488,13 +495,12 @@ AC_SUBST(sinfgincludedir)
 )]
 
 AC_OUTPUT(
-sinfg-config
+synfig-config
 @PACKAGE_TARNAME@.pc
 Makefile
 src/Makefile
-src/sinfg/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
@@ -514,7 +520,8 @@ src/modules/mod_libavcodec/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
@@ -553,10 +560,10 @@ Using OpenEXR's \"half\" type ------> $use_openexr_half
 
 "'$'"CXX ------------------------------> '$CXX'
 "'$'"CXXFLAGS -------------------------> '$CXXFLAGS'
-"'$'"SINFG_LIBS -----------------------> '$SINFG_LIBS'
+"'$'"SYNFIG_LIBS -----------------------> '$SYNFIG_LIBS'
 "'$'"LIBXMLPP_LIBS --------------------> '$LIBXMLPP_LIBS'
 "'$'"ETL_LIBS -------------------------> '$ETL_LIBS'
 "'$'"LIBSIGC_LIBS ---------------------> '$LIBSIGC_LIBS'
-"'$'"SINFG_CFLAGS ---------------------> '$SINFG_CFLAGS'
+"'$'"SYNFIG_CFLAGS ---------------------> '$SYNFIG_CFLAGS'
 "'$'"LIBADD_DL ------------------------> '$LIBADD_DL'
 "