Revision: 2078
http://synfig.svn.sourceforge.net/synfig/?rev=2078&view=rev
Author: pabs3
Date: 2008-10-02 11:44:43 +0000 (Thu, 02 Oct 2008)
Log Message:
-----------
Apply patch 5: add a configure flag to switch on/off jpeg support. Patch by
Daniel Hornung (rubikcube)
Modified Paths:
--------------
synfig-core/trunk/AUTHORS
synfig-core/trunk/configure.ac
Modified: synfig-core/trunk/AUTHORS
===================================================================
--- synfig-core/trunk/AUTHORS 2008-10-01 21:52:26 UTC (rev 2077)
+++ synfig-core/trunk/AUTHORS 2008-10-02 11:44:43 UTC (rev 2078)
@@ -14,6 +14,7 @@
Martin Michlmayr
Carlos López González (genete)
Gerco Ballintijn
+Daniel Hornung (rubikcube)
Translators:
Modified: synfig-core/trunk/configure.ac
===================================================================
--- synfig-core/trunk/configure.ac 2008-10-01 21:52:26 UTC (rev 2077)
+++ synfig-core/trunk/configure.ac 2008-10-02 11:44:43 UTC (rev 2078)
@@ -372,9 +372,22 @@
} ; fi
+# JPEG CHECK (commandline switch) ------------------------
+AC_ARG_WITH(jpeg,[
+ --without-jpeg Disable support for JPEG],[
+],[
+ with_jpeg="yes"
+])
+if test $with_jpeg = "no" ; then {
+ AM_CONDITIONAL(WITH_JPEG,false)
+} else {
+ AM_CONDITIONAL(WITH_JPEG,true)
+} ; fi
+
+
# -- L I B R A R I E S ----------------------------------------
AC_LIB_LTDL
@@ -417,7 +430,6 @@
TARGET_PNG="yes"
TARGET_MNG="yes"
-TARGET_JPEG="yes"
AC_CHECK_LIB(png, png_write_row,[
PNG_LIBS="-lpng"
@@ -448,26 +460,29 @@
AM_CONDITIONAL(HAVE_LIBMNG,false)
],[-lz -L${exec_prefix}/lib])
-AC_CHECK_LIB(jpeg, jpeg_CreateCompress,[
- JPEG_LIBS="-ljpeg"
- AC_DEFINE(HAVE_LIBJPEG,[], [ Define if JPEG library is available ] )
- AC_SUBST(JPEG_LIBS)
- AM_CONDITIONAL(HAVE_LIBJPEG,true)
-],[
+# check for JPEG availability
+if test $with_jpeg = "yes" ; then {
+ AC_CHECK_LIB(jpeg, jpeg_CreateCompress,[
+ JPEG_LIBS="-ljpeg"
+ AC_DEFINE(HAVE_LIBJPEG,[], [ Define if JPEG library is
available ] )
+ AC_SUBST(JPEG_LIBS)
+ TARGET_JPEG="yes"
+ AM_CONDITIONAL(HAVE_LIBJPEG,true)
+ ],[
+ AC_MSG_RESULT([ *** JPEG Output target disabled])
+ TARGET_JPEG="no"
+ AM_CONDITIONAL(HAVE_LIBJPEG,false)
+ ],[
+ -L${exec_prefix}/lib
+ ])
+} else {
AC_MSG_RESULT([ *** JPEG Output target disabled])
TARGET_JPEG="no"
AM_CONDITIONAL(HAVE_LIBJPEG,false)
-],[-L${exec_prefix}/lib])
+} ; fi
-dnl AC_CHECK_HEADERS(jpeglib.h,[],[
-dnl AC_MSG_RESULT([ *** JPEG Output target disabled])
-dnl TARGET_JPEG="no"
-dnl AM_CONDITIONAL(HAVE_LIBJPEG,false)
-dnl ])
-
-
MODULE_DIR='${libdir}/synfig/modules'
moduledir=$libdir/synfig/modules
AC_SUBST(MODULE_DIR)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
