From 346821c54a99a709622523cf79f34f204dea2f93 Mon Sep 17 00:00:00 2001 From: Jonas Suhr Christensen Date: Tue, 22 Mar 2016 23:18:18 +0100 Subject: Enabled no gui selection to configure. --- Makefile.am | 6 +++++- configure.ac | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 3784c39..c90cd0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,11 @@ AUTOMAKE_OPTIONS = gnu -SUBDIRS = plugingui tools include src plugin drumgizmo man test +SUBDIRS = tools include src plugin drumgizmo man test DISTDIRS = plugingui tools include src plugin drumgizmo man test +if DISABLE_GUI +SUBDIRS += plugingui +endif + EXTRA_DIST = \ version.h \ hugin/hugin.h \ diff --git a/configure.ac b/configure.ac index 1745714..52ddc17 100644 --- a/configure.ac +++ b/configure.ac @@ -119,6 +119,10 @@ AS_IF( GUI_CPPFLAGS="-DPUGL -I../../pugl" GUI_LIBS="-lGLU -lGL -lglut"], + [test "x$enable_gui" = "xnone"], + [AC_MSG_RESULT([Setting gui backend to NONE - No GUI will be build]) + ], + AC_MSG_ERROR([*** No GUI backend has been selected ***]) ) @@ -128,6 +132,7 @@ AC_SUBST(GUI_LIBS) AM_CONDITIONAL([ENABLE_PUGL], [test "x$enable_gui" = "xpugl"]) AM_CONDITIONAL([ENABLE_WIN32], [test "x$enable_gui" = "xwin32"]) AM_CONDITIONAL([ENABLE_X11], [test "x$enable_gui" = "xx11"]) +AM_CONDITIONAL([DISABLE_GUI], [test "x$enable_gui" = "xnone"]) dnl ====================== dnl Compile unit tests -- cgit v1.2.3