summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
3e06508)
During the configure, if ncurses is not detected, compile only the
textdump code and print an error if the user tries to use the GUI.
This will allow to create a package with only the textdump code for
platforms that don't have/want ncurses packages.
Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
-AC_CHECK_LIB([ncurses], [initscr], [],
- [AC_MSG_ERROR([Cannot find the the ncurses library.])]
+AC_CHECK_LIB([ncurses], [initscr], [], [HAVE_NCURSES=0]
)
# Check for libpanel, also part of libncurses
# (but this check will add the required -lpanel flag)
)
# Check for libpanel, also part of libncurses
# (but this check will add the required -lpanel flag)
-AC_CHECK_LIB([panel], [update_panels], [],
- [AC_MSG_ERROR([Cannot find the the ncurses library.])]
+AC_CHECK_LIB([panel], [update_panels], [], [HAVE_PANELS=0]
)
# Check for libbabeltrace
)
# Check for libbabeltrace
utils/Makefile
])
AC_OUTPUT
utils/Makefile
])
AC_OUTPUT
+
+AS_IF([test "x$HAVE_NCURSES" = "x0"],[
+ AS_ECHO()
+ AS_ECHO_N("Ncurses GUI won't be compiled install ncurses if you want it.")
+ ], [
+ CURSES_LIBS="-lcurses -lpanel"
+ AC_SUBST(CURSES_LIBS)
+ AS_ECHO()
+ AS_ECHO_N("Ncurses GUI will be compiled.")
+ ])
+AS_ECHO()
+
lttngtop_LDFLAGS = -Wl,--no-as-needed
lttngtop_LDFLAGS = -Wl,--no-as-needed
-#lttngtop_LDADD = -lbabeltrace -lbabeltrace-ctf -llttngtop-helper -llttng-ctl -lurcu -llttngtopmmappacketseek -llttng-ust-ctl -lcurses -lpanel
-lttngtop_LDADD = -lbabeltrace -lbabeltrace-ctf -llttng-ctl -lurcu -llttng-ust-ctl -lcurses -lpanel \
+lttngtop_LDADD = -lbabeltrace -lbabeltrace-ctf -llttng-ctl \
+ -lurcu -llttng-ust-ctl \
$(top_builddir)/src/libbabeltrace-lttngtop-live.la
$(top_builddir)/src/libbabeltrace-lttngtop-live.la
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include <config.h>
+
+#ifdef HAVE_LIBNCURSES
+
#include <stdio.h>
#include <stdlib.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <signal.h>
pthread_create(&keyboard_thread, NULL, handle_keyboard, (void *)NULL);
}
pthread_create(&keyboard_thread, NULL, handle_keyboard, (void *)NULL);
}
+
+#endif /* HAVE_LIBNCURSES */
pthread_create(&display_thread, NULL, ncurses_display,
(void *) NULL);
pthread_create(&timer_thread, NULL, refresh_thread,
(void *) NULL);
pthread_create(&display_thread, NULL, ncurses_display,
(void *) NULL);
pthread_create(&timer_thread, NULL, refresh_thread,
(void *) NULL);
+#else
+ printf("Ncurses support not compiled, please install "
+ "the missing dependencies and recompile\n");
+ goto end_free;
+#endif
}
iter_trace(ctx->bt_ctx);
g_hash_table_foreach_remove(ctx->session->ctf_traces,
}
iter_trace(ctx->bt_ctx);
g_hash_table_foreach_remove(ctx->session->ctf_traces,
#include "lttngtoptypes.h"
#include "cputop.h"
#include "iostreamtop.h"
#include "lttngtoptypes.h"
#include "cputop.h"
#include "iostreamtop.h"
-#include "cursesdisplay.h"
#include "common.h"
#include "network-live.h"
#include "common.h"
#include "network-live.h"
+#ifdef HAVE_LIBNCURSES
+#include "cursesdisplay.h"
+#endif
+
#define NET_URL_PREFIX "net://"
#define NET4_URL_PREFIX "net4://"
#define NET6_URL_PREFIX "net6://"
#define NET_URL_PREFIX "net://"
#define NET4_URL_PREFIX "net4://"
#define NET6_URL_PREFIX "net6://"
void *ncurses_display(void *p)
{
unsigned int current_display_index = 0;
void *ncurses_display(void *p)
{
unsigned int current_display_index = 0;
sem_post(&pause_sem);
}
}
sem_post(&pause_sem);
}
}
+#endif /* HAVE_LIBNCURSES */
void print_fields(struct bt_ctf_event *event, const char *procname,
int pid)
void print_fields(struct bt_ctf_event *event, const char *procname,
int pid)
pthread_create(&display_thread, NULL, ncurses_display,
(void *) NULL);
pthread_create(&timer_thread, NULL, refresh_thread,
(void *) NULL);
pthread_create(&display_thread, NULL, ncurses_display,
(void *) NULL);
pthread_create(&timer_thread, NULL, refresh_thread,
(void *) NULL);
+#else
+ printf("Ncurses support not compiled, please install "
+ "the missing dependencies and recompile\n");
+ goto end;
+#endif