meta-openembedded/meta-oe/recipes-extended/hplip/hplip-3.12.6/fix-libusb-paths.patch

Upstream-Status: Inappropriate [configuration]

diff -rupN hplip-3.12.6_orig/configure.in hplip-3.12.6/configure.in
--- hplip-3.12.6_orig/configure.in	2012-06-18 20:44:24.000000000 +1000
+++ hplip-3.12.6/configure.in	2012-08-16 13:40:07.259927650 +1000
@@ -524,6 +524,8 @@ if test "$hpijs_only_build" = "no"; then
       AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)])
    else
       AC_CHECK_LIB([usb-1.0], [libusb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb 1.0 support], 2)])
+      LIBUSBINCLUDEROOT?="/usr/include/"
+      AC_ARG_VAR(LIBUSBINCLUDEROOT, [path to libusb-1.0 folder])
       AC_CHECK_HEADERS(libusb-1.0/libusb.h, ,[AC_MSG_ERROR([cannot find libusb-1.0-devel support], 11)])
    fi
 fi
diff -rupN hplip-3.12.6_orig/Makefile.am hplip-3.12.6/Makefile.am
--- hplip-3.12.6_orig/Makefile.am	2012-06-18 20:44:13.000000000 +1000
+++ hplip-3.12.6/Makefile.am	2012-08-16 13:41:12.307932822 +1000
@@ -72,7 +72,7 @@ libhpmud_la_SOURCES = io/hpmud/hpmud.c i
 	  io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/pml.h io/hpmud/dot4.c \
 	  io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h io/hpmud/musb.h io/hpmud/musb_libusb01.c
 else
-libhpmud_la_CFLAGS = -I/usr/include/libusb-1.0 -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"
+libhpmud_la_CFLAGS = -I/$(LIBUSBINCLUDEROOT)/libusb-1.0 -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"
 libhpmud_la_SOURCES = io/hpmud/hpmud.c io/hpmud/mlc.c io/hpmud/model.c io/hpmud/pml.c \
 	  io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/pml.h io/hpmud/dot4.c \
 	  io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h io/hpmud/musb.h io/hpmud/musb.c
@@ -286,7 +286,7 @@ hpmudext_la_LIBADD = libhpmud.la
 if LIBUSB01_BUILD
 hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
 else
-hpmudext_la_CFLAGS =-I/usr/include/libusb-1.0 -I$(PYTHONINCLUDEDIR)
+hpmudext_la_CFLAGS =-I$(LIBUSBINCLUDEROOT)/libusb-1.0 -I$(PYTHONINCLUDEDIR)
 endif
 
 # ui (qt3)