Commit 9e68cb0a authored by Gildas Bazin's avatar Gildas Bazin

* configure.ac, modules/visualization/goom.c: in case --with-goom-tree is...

* configure.ac, modules/visualization/goom.c: in case --with-goom-tree is specified and we don't find libgoom2, try to find and use libgoom.
parent af3abae3
......@@ -3421,9 +3421,18 @@ then
AX_ADD_LDFLAGS([goom],[-L${real_goom_tree}/src/.libs -lgoom2])
AX_ADD_CPPFLAGS([goom],[-I${real_goom_tree}/src -DUSE_GOOM_TREE])
else
dnl The given libgoom wasn't built
dnl The given libgoom2 wasn't built, try to look for the old goom
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot find ${real_goom_tree}/src/.libs/libgoom2.a, make sure you compiled goom in ${with_goom_tree}])
AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree})
if test -f "${real_goom_tree}/libgoom.a"; then
AC_MSG_RESULT(${real_goom_tree}/libgoom.a)
AX_ADD_LDFLAGS([goom],[-L${real_goom_tree} -lgoom])
AX_ADD_CPPFLAGS([goom],[-I${real_goom_tree} -DUSE_GOOM_TREE -DOLD_GOOM])
else
dnl The given libgoom wasn't built
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot find ${real_goom_tree}/src/.libs/libgoom2.a, make sure you compiled goom in ${with_goom_tree}])
fi
fi
else
AC_CHECK_HEADERS(goom/goom.h, [
......
......@@ -36,7 +36,15 @@
#include "aout_internal.h"
#ifdef USE_GOOM_TREE
# include "goom.h"
# ifdef OLD_GOOM
# include "goom_core.h"
# define PluginInfo void
# define goom_update(a,b,c,d,e,f) goom_update(b,c,d,e,f)
# define goom_close(a) goom_close()
# define goom_init(a,b) NULL; goom_init(a,b,0); goom_set_font(0,0,0)
# else
# include "goom.h"
# endif
#else
# include <goom/goom.h>
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment