[dahdi-commits] dahdi/tools.git branch "master" updated.

[SVN commits to the DAHDI project]

branch "master" has been updated
       via  212b247e689f84a431c67f80144384c5d2a27c50 (commit)
       via  f225a5692c9844c1b8c5f04a7e4f0fab83b6e773 (commit)
      from  cffc5158cc4ca9edba83387af97f6d28d74d6a0d (commit)

Summary of changes:
 configure.ac    |    2 --
 xpp/Makefile.am |   16 ++++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)


- Log -----------------------------------------------------------------
commit 212b247e689f84a431c67f80144384c5d2a27c50
Author: Oron Peled <oron.peled at xorcom.com>
Date:   Sun Dec 13 15:41:12 2015 +0200

    xpp: move tools man-pages into PBX_USB conditional
    
    * Otherwise, they pull compilation of xpp tools via implicit rules.
    * This breaks build without libusb/libusbx
    * To test this scenario:
        ./configure .... --without-libusb --without-libusbx
    
    Signed-off-by: Oron Peled <oron.peled at xorcom.com>
    Signed-off-by: Russ Meyerriecks <rmeyerriecks at digium.com>

diff --git a/xpp/Makefile.am b/xpp/Makefile.am
index 369e1d2..d06fffe 100644
--- a/xpp/Makefile.am
+++ b/xpp/Makefile.am
@@ -20,14 +20,6 @@ GLOBAL_CFLAGS	+= \
 	-Wformat=2
 endif
 
-man_pages	= \
-		astribank_tool.8 \
-		astribank_hexload.8 \
-		astribank_allow.8 \
-		astribank_is_starting.8
-
-man_MANS	+= $(man_pages)
-
 if PERL
 SUBDIRS		+= perl_modules
 
@@ -149,6 +141,14 @@ astribank_allow_CFLAGS		= $(GLOBAL_CFLAGS)
 astribank_allow_LDFLAGS		= $(USB_LIBS)
 astribank_allow_LDADD		= libastribank.la
 
+man_pages	= \
+		astribank_tool.8 \
+		astribank_hexload.8 \
+		astribank_allow.8 \
+		astribank_is_starting.8
+
+man_MANS	+= $(man_pages)
+
 endif
 
 EXTRA_DIST	= \

commit f225a5692c9844c1b8c5f04a7e4f0fab83b6e773
Author: Oron Peled <oron.peled at xorcom.com>
Date:   Sun Dec 13 15:41:11 2015 +0200

    configure.ac: remove unused PKG_CONFIG_LIBUSB
    
    Signed-off-by: Oron Peled <oron.peled at xorcom.com>
    Signed-off-by: Russ Meyerriecks <rmeyerriecks at digium.com>

diff --git a/configure.ac b/configure.ac
index 9dc008a..ee06287 100644
--- a/configure.ac
+++ b/configure.ac
@@ -199,7 +199,6 @@ AS_IF([test "$with_libusbx" != "no"],
 		[AC_CHECK_LIB([usb-1.0], [libusb_error_name],
 			[
 				have_libusbx="yes"
-				AC_SUBST([PKG_CONFIG_LIBUSB], [libusb-1.0])
 				AC_DEFINE([HAVE_LIBUSBX], [1], [Define to 1 if you have <libusb.h>.])
 				AC_SUBST([PBX_USB], [1])
 			], [
@@ -225,7 +224,6 @@ AS_IF([test "$with_libusb" != "no"],
 			PKG_CHECK_MODULES([LIBUSB], [libusb],
 				[
 					have_libusb="yes"
-					AC_SUBST([PKG_CONFIG_LIBUSB], [libusb])
 					AC_SUBST([PBX_USB], [1])
 				]
 				[AC_DEFINE([HAVE_LIBUSB], [1], [Define to 1 if you have <usb.h>.])],

-----------------------------------------------------------------------


-- 
dahdi/tools.git