2015-06-22 21:25 GMT+06:00 Olaf Hering <o...@aepfle.de>:
> If synfigstudio.spec has just "BuildRequires: pkgconfig(synfig)" some
> required libs will not be installed. In my case "pkgconfig(Magick++)".
> As a result linking failed.
>
> Put more libs into CONFIG_DEPS to automatically install them if
> synfig-devel is installed.
>
> Signed-off-by: Olaf Hering <o...@aepfle.de>
>
> ---
> Not sure if every part of this change is correct.
>
> configure.ac | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> Index: synfig-1.0/configure.ac
> ===================================================================
> --- synfig-1.0.orig/configure.ac
> +++ synfig-1.0/configure.ac
> @@ -139,6 +139,7 @@ if test $with_magickpp = "yes" ; then {
> PKG_CHECK_MODULES(MAGICKPP, Magick++ >= 6.4.2,[
> with_magickpp="yes"
> AM_CONDITIONAL(HAVE_LIBMAGICKPP,true)
> + CONFIG_DEPS="$CONFIG_DEPS Magick++"
> ],[
> with_magickpp="no"
> AC_MSG_RESULT([ *** Magick++ Output target disabled])
> @@ -199,6 +200,7 @@ if test $with_libavcodec != "no" ; then
> if test $with_libavcodec = "yes" ; then {
> AC_DEFINE(WITH_LIBAVCODEC,[],[enable libavcodec support])
> AM_CONDITIONAL(WITH_LIBAVCODEC,true)
> + CONFIG_DEPS="$CONFIG_DEPS libavcodec libavformat"
> } else {
> AM_CONDITIONAL(WITH_LIBAVCODEC,false)
> } ; fi
> @@ -229,6 +231,7 @@ if test $with_libavcodec = "yes" ; then
>
> if test $with_libswscale = "yes" ; then {
> AC_DEFINE(WITH_LIBSWSCALE, [], [enable libswscale support])
> + CONFIG_DEPS="$CONFIG_DEPS libswscale"
>
> # Need to check both the new and old locations for the
> swscale header
> # Need to save flags, add swscale flags, check headers and
> restore flags
> @@ -261,6 +264,7 @@ AC_ARG_WITH(freetype,
> if test $with_freetype != "no" ; then {
> PKG_CHECK_MODULES(FREETYPE, freetype2,[
> with_freetype="yes"
> + CONFIG_DEPS="$CONFIG_DEPS freetype2"
> ],[
> PKG_CHECK_MODULES(FREETYPE, xft,[
> with_freetype="yes"
> @@ -283,6 +287,7 @@ AC_ARG_WITH(fontconfig,
> if test $with_fontconfig != "no" ; then {
> PKG_CHECK_MODULES(FONTCONFIG, fontconfig,[
> with_fontconfig="yes"
> + CONFIG_DEPS="$CONFIG_DEPS fontconfig"
> ],[
> with_fontconfig="no"
> ])
> @@ -306,6 +311,7 @@ if test $with_openexr = "yes" ; then {
> PKG_CHECK_MODULES(OPENEXR, OpenEXR,[
> AC_DEFINE(HAVE_OPENEXR,[], [ Define if OpenEXR is available ]
> )
> AM_CONDITIONAL(WITH_OPENEXR,true)
> + CONFIG_DEPS="$CONFIG_DEPS OpenEXR"
> ],
> [
> with_openexr="no"
> @@ -317,7 +323,6 @@ if test $with_openexr = "no" ; then {
> } ; fi
> if test $use_openexr_half = yes ; then {
> AC_MSG_RESULT([ ** Using OpenEXR Half.])
> - CONFIG_DEPS="$CONFIG_DEPS OpenEXR"
> CONFIG_CFLAGS="$CONFIG_CFLAGS -DUSE_HALF_TYPE"
> OPENEXR_HALF_LIBS="-lHalf"
> } else {
>
Merged into master branch. Thank you!
Best Regards,
K.
--
http://morevnaproject.org/
------------------------------------------------------------------------------
Monitor 25 network devices or servers for free with OpManager!
OpManager is web-based network management software that monitors
network devices and physical & virtual servers, alerts via email & sms
for fault. Monitor 25 devices for free with no restriction. Download now
http://ad.doubleclick.net/ddm/clk/292181274;119417398;o
_______________________________________________
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
