File ibutils-diagui.patch of Package ibutils

Overview Repositories Revisions Requests Users Attributes Meta

File ibutils-diagui.patch of Package ibutils (Revision 3f260ecf2d0cbaf4b083f65973b7482b)

Currently displaying revision 3f260ecf2d0cbaf4b083f65973b7482b , Show latest

diff --git ibdiag/configure.in ibdiag/configure.in
index 0ddf85d..f436939 100644
--- ibdiag/configure.in
+++ ibdiag/configure.in
@@ -61,13 +61,26 @@ AC_ARG_ENABLE(libcheck,
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-libcheck) ;;
 esac],[libcheck=true])
 
+AC_ARG_ENABLE(ibdiagui,
+[  --enable-ibdiagui    Build ibdiagui],
+[case "${enableval}" in
+  yes) ibdiagui=true ;;
+  no)  ibdiagui=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-ibdiagui) ;;
+esac],[ibdiagui=true])
+AM_CONDITIONAL([BUILD_IBDIAGUI], [test "x$ibdiagui" != xfalse])
+
 if test $libcheck = true; then
 dnl Checks for libraries.
 CHECK_IBIS_EXEC_DIR
 CHECK_IBDM_TCLLIB
+
+dnl Check for UI libs if ibdiagui is being built
+if test "x$ibdiagui" = "xtrue"; then
 SET_TK_LIBS
 SET_GRAPHVIZ_LIBS
 fi
+fi
 
 dnl Create the following Makefiles
 AC_OUTPUT(Makefile src/Makefile doc/Makefile)
diff --git ibdiag/doc/Makefile.am ibdiag/doc/Makefile.am
index b64c568..129f184 100644
--- ibdiag/doc/Makefile.am
+++ ibdiag/doc/Makefile.am
@@ -30,8 +30,13 @@
 # SOFTWARE.
 #--
 
-man_MANS = ibdiagnet.1 ibdiagpath.1 ibdiagui.1
-EXTRA_DIST = ibdiagnet.pod ibdiagpath.pod ibdiagui.pod ibdiag_pod2man
+man_MANS = ibdiagnet.1 ibdiagpath.1
+EXTRA_DIST = ibdiagnet.pod ibdiagpath.pod ibdiag_pod2man
+
+if BUILD_IBDIAGUI
+man_MANS += ibdiagui.1
+EXTRA_DIST += ibdiagui.pod
+endif
 
 ibdiagnet.1: ibdiagnet.pod
 	$(srcdir)/ibdiag_pod2man $(srcdir)/ibdiagnet.pod ibdiagnet.1
@@ -39,5 +44,7 @@ ibdiagnet.1: ibdiagnet.pod
 ibdiagpath.1: ibdiagpath.pod
 	$(srcdir)/ibdiag_pod2man $(srcdir)/ibdiagpath.pod ibdiagpath.1
 
+if BUILD_IBDIAGUI
 ibdiagui.1: ibdiagui.pod
 	$(srcdir)/ibdiag_pod2man $(srcdir)/ibdiagui.pod ibdiagui.1
+endif
diff --git ibdiag/src/Makefile.am ibdiag/src/Makefile.am
index c33e9f0..1233b96 100644
--- ibdiag/src/Makefile.am
+++ ibdiag/src/Makefile.am
@@ -32,11 +32,16 @@
 
 ACLOCAL_AMFLAGS      = -I config
 
-bin_SCRIPTS = ibdiagnet ibdiagpath ibdiagui git_version.tcl
+bin_SCRIPTS = ibdiagnet ibdiagpath git_version.tcl
 EXTRA_DIST = ibdebug_if.tcl ibdebug.tcl \
 	ibdiagnet.in ibdiagnet.pkg ibdiagnet.tcl \
 	ibdiagpath.in ibdiagpath.pkg ibdiagpath.tcl \
-	ibdiagui.in ibdiagui.pkg ibdiagui.tcl git_version.tcl
+	 git_version.tcl
+
+if BUILD_IBDIAGUI
+bin_SCRIPTS += ibdiagui
+EXTRA_DIST += ibdiagui.in ibdiagui.pkg ibdiagui.tcl
+endif
 
 GIT=$(shell which git)
 
@@ -73,13 +78,15 @@ ibdiagpath: ibdiagpath.in
 	    -e 's=%with_ibis_bindir%='$(DESTDIR)$(bindir)'=' \
 	    -e 's=%with_ibis%='$(with_ibis)'=' $(srcdir)/ibdiagpath.in > ibdiagpath
 
-ibdiagui: ibdiagui.in
+if BUILD_IBDIAGUI
+ ibdiagui: ibdiagui.in
 	sed -e 's=%ibdiag_libdir%='$(DESTDIR)$(libdir)'=' \
 	    -e 's=%with_ibdm_lib%='$(with_ibdm_lib)'=' \
 	    -e 's=%with_tk_lib%='$(with_tk_lib)'=' \
 	    -e 's=%with_graphviz_lib%='$(with_graphviz_lib)'=' \
 	    -e 's=%with_ibis_bindir%='$(DESTDIR)$(bindir)'=' \
 	    -e 's=%with_ibis%='$(with_ibis)'=' $(srcdir)/ibdiagui.in > ibdiagui
+endif
 
 clean:
 	rm -f ibdiagui ibdiagnet ibdiagpath
@@ -100,9 +107,11 @@ install-exec-am: install-binSCRIPTS
 	cp $(srcdir)/ibdebug_if.tcl $(PATH_LIB_DIR)/ibdebug_if.tcl
 	cp $(srcdir)/ibdiagpath.tcl $(PATH_LIB_DIR)/ibdiagpath.tcl
 	cp $(srcdir)/git_version.tcl $(PATH_LIB_DIR)/git_version.tcl
+if BUILD_IBDIAGUI
 	mkdir -p $(UI_LIB_DIR)
 	cp $(srcdir)/ibdiagui.pkg $(UI_LIB_DIR)/pkgIndex.tcl
 	cp $(srcdir)/ibdebug.tcl $(UI_LIB_DIR)/ibdebug.tcl
 	cp $(srcdir)/ibdebug_if.tcl $(UI_LIB_DIR)/ibdebug_if.tcl
 	cp $(srcdir)/ibdiagui.tcl $(UI_LIB_DIR)/ibdiagui.tcl
 	cp $(srcdir)/git_version.tcl $(UI_LIB_DIR)/git_version.tcl
+endif

Places

File ibutils-diagui.patch of Package ibutils (Revision 3f260ecf2d0cbaf4b083f65973b7482b)

Places