From a64caa3c10b346d03edac649a81fe9db92dc2147 Mon Sep 17 00:00:00 2001 From: pabs Date: Sun, 11 Mar 2007 07:17:28 +0000 Subject: [PATCH] Fix 1678141: link the synfig command line app with -lHalf to prevent FTBFS using --enable-half git-svn-id: http://svn.voria.com/code@290 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/config/configure.ac | 5 +++++ synfig-core/trunk/src/tool/Makefile.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/synfig-core/trunk/config/configure.ac b/synfig-core/trunk/config/configure.ac index dd673c2..b272a87 100644 --- a/synfig-core/trunk/config/configure.ac +++ b/synfig-core/trunk/config/configure.ac @@ -292,6 +292,9 @@ if test $with_openexr = "no" ; then { if test $use_openexr_half = yes ; then { AC_MSG_RESULT([ ** Using OpenEXR Half.]) CONFIG_CFLAGS="$CONFIG_CFLAGS -DUSE_HALF_TYPE" + OPENEXR_HALF_LIBS="-lHalf" +} else { + OPENEXR_HALF_LIBS="" } ; fi @@ -499,6 +502,8 @@ AC_SUBST(LIBADD_DL) AC_SUBST(SYNFIG_LIBS) AC_SUBST(SYNFIG_CFLAGS) +AC_SUBST(OPENEXR_HALF_LIBS) + AC_SUBST(API_VERSION) synfigincludedir=$includedir/synfig-@API_VERSION@ diff --git a/synfig-core/trunk/src/tool/Makefile.am b/synfig-core/trunk/src/tool/Makefile.am index 98ca086..103b179 100644 --- a/synfig-core/trunk/src/tool/Makefile.am +++ b/synfig-core/trunk/src/tool/Makefile.am @@ -8,7 +8,7 @@ INCLUDES=-I$(top_srcdir)/src bin_PROGRAMS = synfig synfig_SOURCES = main.cpp -synfig_LDADD = -L../synfig -lsynfig @SYNFIG_LIBS@ +synfig_LDADD = -L../synfig -lsynfig @SYNFIG_LIBS@ @OPENEXR_HALF_LIBS@ synfig_CXXFLAGS = -lsynfig @SYNFIG_CFLAGS@ #synfig_LDFLAGS=-export-dynamic -dlopen self #-dlopen ../modules/example/libexample.la -- 2.7.4