diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2013-09-08 18:44:16 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-08 18:44:16 +0200 |
| commit | 1f5ba242d560270d166303c6cdc20702c2337bb2 (patch) | |
| tree | e90097f1e01fd5f14a4ade2ee78f14c60e027b49 | |
| parent | 1859432c9417b0ad9a86fd15c28307680e0d3ea9 (diff) | |
| download | tdemultimedia-1f5ba242d560270d166303c6cdc20702c2337bb2.tar.gz tdemultimedia-1f5ba242d560270d166303c6cdc20702c2337bb2.zip | |
Add missing LDFLAGS causing FTBFS
| -rw-r--r-- | arts/modules/common/Makefile.am | 2 | ||||
| -rw-r--r-- | arts/modules/synth/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in.in | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/arts/modules/common/Makefile.am b/arts/modules/common/Makefile.am index 46839022..bcf472fc 100644 --- a/arts/modules/common/Makefile.am +++ b/arts/modules/common/Makefile.am @@ -25,7 +25,7 @@ libartsmodulescommon_la_LIBADD = \ $(top_builddir)/arts/gui/common/libartsgui_idl.la \ $(top_builddir)/arts/midi/libartsmidi_idl.la \ $(top_builddir)/arts/modules/synth/libartsmodulessynth.la \ - -lartsflow -lartsflow_idl -lmcop $(LIB_TDECORE) $(LIB_QT) $(VORBISFILE_LIBS) -lgthread-2.0 + -lartsflow -lartsflow_idl -lmcop $(LIB_TDECORE) $(LIB_QT) -lgthread-2.0 $(ARTS_LIBS) libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined diff --git a/arts/modules/synth/Makefile.am b/arts/modules/synth/Makefile.am index 363e3411..520b33fe 100644 --- a/arts/modules/synth/Makefile.am +++ b/arts/modules/synth/Makefile.am @@ -31,7 +31,7 @@ libartsmodulessynth_la_COMPILE_FIRST = artsmodulessynth.h ../../midi/artsmidi.h libartsmodulessynth_la_LIBADD = \ $(top_builddir)/arts/runtime/libartsbuilder.la \ $(top_builddir)/arts/midi/libartsmidi_idl.la \ - -lartsflow -lartsgsl -lartsflow_idl -lmcop -lglib-2.0 + -lartsflow -lartsgsl -lartsflow_idl -lmcop -lglib-2.0 $(ARTS_LIBS) #libartsmodulessynth_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_TDEUI) $(LIB_TDECORE) libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -lartsflow -lartsgsl -no-undefined diff --git a/configure.in.in b/configure.in.in index 3d1e15fd..b25704d3 100644 --- a/configure.in.in +++ b/configure.in.in @@ -549,15 +549,18 @@ if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then LIB_ARTS="-lartskde" ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`] ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts" + ARTS_LIBS=[`$PKG_CONFIG --libs-only-l arts`] AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk]) else build_arts="no" LIB_ARTS="" ARTS_CFLAGS="" + ARTS_LIBS="" AC_DEFINE(HAVE_ARTS, 0, [no arts support in juk]) fi AC_SUBST(LIB_ARTS) AC_SUBST(ARTS_CFLAGS) +AC_SUBST(ARTS_LIBS) KDE_CHECK_MPEGLIB_ARTS |