Refresh patches

4 files changed, 121 insertions, 114 deletions

diff --git a/debian/changelog b/debian/changelog
index 0b53e08..15b01d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+argyll (1.8.0+repack-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Refresh patches:
+    + debian/patches/15_jam.patch
+    + debian/patches/100_spelling.patch
+    + debian/patches/110_dispwin_segfault.patch
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Sun, 23 Aug 2015 13:32:55 +0200
+
 argyll (1.7.0+repack-4) unstable; urgency=medium
 
   * debian/rules:
diff --git a/debian/patches/100_spelling.patch b/debian/patches/100_spelling.patch
index ad53dfa..6ec2078 100644
--- a/debian/patches/100_spelling.patch
+++ b/debian/patches/100_spelling.patch
@@ -1,6 +1,6 @@
 Description: correct some typos
 Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Last-Update: 2015-05-03
+Last-Update: 2015-08-23
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: trunk/spectro/dispcal.c
@@ -32,7 +32,7 @@ Index: trunk/spectro/dispcal.c
  				x.nbrate = atof(na);
  				if (x.nbrate < 0.05 || x.nbrate > 20.0) usage(0,"-A parameter must be between 0.05 and 20.0");
  			/* Black brightness */
-@@ -1996,7 +1996,7 @@ int main(int argc, char *argv[]) {
+@@ -1999,7 +1999,7 @@ int main(int argc, char *argv[]) {
  			/* COM port  */
  			} else if (argv[fa][1] == 'c') {
  				fa = nfa;
@@ -41,7 +41,7 @@ Index: trunk/spectro/dispcal.c
  				comport = atoi(na);
  				if (comport < 1 || comport > 50) usage(0,"-c parameter %d out of range",comport);
  
-@@ -3059,7 +3059,7 @@ int main(int argc, char *argv[]) {
+@@ -3063,7 +3063,7 @@ int main(int argc, char *argv[]) {
  			/* Black level adjustment */
  			/* Due to the possibility of the channel offsets not being even, */
  			/* we use the largest of the XYZ values after they have been */
@@ -143,7 +143,7 @@ Index: trunk/spectro/dispwin.c
  /* 2 if profile not found */
  int dispwin_uninstall_profile(dispwin *p, char *fname, p_scope scope) {
  	debugr2((errout,"dispwin_uninstall_profile '%s'\n", fname));
-@@ -5123,7 +5123,7 @@ int ddebug						/* >0 to print debug sta
+@@ -5128,7 +5128,7 @@ int ddebug						/* >0 to print debug sta
  		p->native = native &= ~2;
  	}
  
@@ -156,7 +156,7 @@ Index: trunk/spectro/dtp51.c
 ===================================================================
 --- trunk.orig/spectro/dtp51.c
 +++ trunk/spectro/dtp51.c
-@@ -678,7 +678,7 @@ dtp51_interp_error(inst *pp, int ec) {
+@@ -679,7 +679,7 @@ dtp51_interp_error(inst *pp, int ec) {
  		case DTP51_INVALID_STEP:
  			return "Invalid step";
  		case DTP51_NO_DATA_AVAILABLE:
@@ -208,7 +208,7 @@ Index: trunk/spectro/i1pro_imp.c
 ===================================================================
 --- trunk.orig/spectro/i1pro_imp.c
 +++ trunk/spectro/i1pro_imp.c
-@@ -3757,7 +3757,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
+@@ -3768,7 +3768,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
  		return I1PRO_OK;
  	}
  
@@ -217,7 +217,7 @@ Index: trunk/spectro/i1pro_imp.c
  	s->dark_valid = 1;
  	s->ddate = m->caldate;
  
-@@ -3802,7 +3802,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
+@@ -3813,7 +3813,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
  		return I1PRO_OK;
  	}
  
@@ -230,7 +230,7 @@ Index: trunk/spectro/madvrwin.c
 ===================================================================
 --- trunk.orig/spectro/madvrwin.c
 +++ trunk/spectro/madvrwin.c
-@@ -602,7 +602,7 @@ int ii = 0;
+@@ -593,7 +593,7 @@ int ii = 0;
  	}
  #endif
  
@@ -243,7 +243,7 @@ Index: trunk/spectro/ss.c
 ===================================================================
 --- trunk.orig/spectro/ss.c
 +++ trunk/spectro/ss.c
-@@ -1786,7 +1786,7 @@ ss_interp_error(inst *pp, int ec) {
+@@ -1787,7 +1787,7 @@ ss_interp_error(inst *pp, int ec) {
  		case ss_et_BadHexEncoding:
  			return "Message received from instrument has bad Hex encoding";
  		case ss_et_RecBufferOverun:
@@ -269,7 +269,7 @@ Index: trunk/spectro/webwin.c
 ===================================================================
 --- trunk.orig/spectro/webwin.c
 +++ trunk/spectro/webwin.c
-@@ -408,7 +408,7 @@ int ddebug						/* >0 to print debug sta
+@@ -396,7 +396,7 @@ int ddebug						/* >0 to print debug sta
  		msec_sleep(50);
  	}
  
@@ -317,7 +317,7 @@ Index: trunk/imdi/cctiff.c
  	planes from input to output, rather than simply ignoring them.
  
  
-@@ -1942,11 +1942,11 @@ main(int argc, char *argv[]) {
+@@ -1953,11 +1953,11 @@ main(int argc, char *argv[]) {
  
  		if (wh != NULL) {
  			printf("Output TIFF file '%s'\n",out_name);
@@ -348,7 +348,7 @@ Index: trunk/spectro/munki_imp.c
 ===================================================================
 --- trunk.orig/spectro/munki_imp.c
 +++ trunk/spectro/munki_imp.c
-@@ -6391,7 +6391,7 @@ munki_code munki_create_hr(munki *p, int
+@@ -6393,7 +6393,7 @@ munki_code munki_create_hr(munki *p, int
  	int i, j, jj, k, cx, sx;
  	munki_fc coeff[40][16];	/* Existing filter cooefficients */
  	int nwav1;					/* Number of filters */
@@ -435,7 +435,7 @@ Index: trunk/link/collink.c
 ===================================================================
 --- trunk.orig/link/collink.c
 +++ trunk/link/collink.c
-@@ -1134,7 +1134,7 @@ void devip_devop(void *cntx, double *out
+@@ -1138,7 +1138,7 @@ void devip_devop(void *cntx, double *out
  			}
  			/* We've got the input profile PCS' at this point. */
  
@@ -444,7 +444,7 @@ Index: trunk/link/collink.c
  			/* output, copy it into locus[], which will be given to the inverse */
  			/* lookup function, else the inverse lookup will generate a K using */
  			/* the curve parameters. */  
-@@ -1265,7 +1265,7 @@ void devip_devop(void *cntx, double *out
+@@ -1270,7 +1270,7 @@ void devip_devop(void *cntx, double *out
  		if (p->nhack == 2) {
  			/* Ideally we would create a 4D PCSK -> PCSK gamut mapping */
  			/* to smoothly and accurately cope with the changing source */
@@ -457,7 +457,7 @@ Index: trunk/profile/printcal.c
 ===================================================================
 --- trunk.orig/profile/printcal.c
 +++ trunk/profile/printcal.c
-@@ -1290,7 +1290,7 @@ int main(int argc, char *argv[]) {
+@@ -1294,7 +1294,7 @@ int main(int argc, char *argv[]) {
  				icmXYZ2Lab(&wht, wp->Lab, wp->XYZ);
  			}
  
@@ -509,7 +509,7 @@ Index: trunk/render/thscreen.c
 ===================================================================
 --- trunk.orig/render/thscreen.c
 +++ trunk/render/thscreen.c
-@@ -624,7 +624,7 @@ thscreen *new_thscreen(
+@@ -636,7 +636,7 @@ thscreen *new_thscreen(
  	mrang = 65535.0/(t->oelev - 1.0); 
  	DBG(("new_thscreen() raw modulation rande = %f\n",mrang));
  
@@ -522,7 +522,7 @@ Index: trunk/xicc/xspect.c
 ===================================================================
 --- trunk.orig/xicc/xspect.c
 +++ trunk/xicc/xspect.c
-@@ -3583,7 +3583,7 @@ void xspect_plot(xspect *sp1, xspect *sp
+@@ -4440,7 +4440,7 @@ void xspect_plot10(xspect *sp, int n) {
  /* Given an emission spectrum, set the UV output to the given level. */
  /* The shape of the UV is taken from FWA1_stim, and the level is */
  /* with respect to the Y of the input spectrum. */
@@ -553,24 +553,11 @@ Index: trunk/spectro/ccxxmake.c
  				if (na[0] == 'n' || na[0] == 'N')
  					fc = fc_none;
  				else if (na[0] == 'h' || na[0] == 'H')
-Index: trunk/spectro/ccwin.c
-===================================================================
---- trunk.orig/spectro/ccwin.c
-+++ trunk/spectro/ccwin.c
-@@ -686,7 +686,7 @@ int ddebug						/* >0 to print debug sta
- 		return NULL;
- 	}
- 
--	debugr("new_ccwin: return sucessfully\n");
-+	debugr("new_ccwin: return successfully\n");
- 
- 	return p;
- }
 Index: trunk/spectro/dispread.c
 ===================================================================
 --- trunk.orig/spectro/dispread.c
 +++ trunk/spectro/dispread.c
-@@ -409,7 +409,7 @@ int main(int argc, char *argv[]) {
+@@ -413,7 +413,7 @@ int main(int argc, char *argv[]) {
  			/* COM port  */
  			} else if (argv[fa][1] == 'c') {
  				fa = nfa;
@@ -583,7 +570,7 @@ Index: trunk/spectro/fakeread.c
 ===================================================================
 --- trunk.orig/spectro/fakeread.c
 +++ trunk/spectro/fakeread.c
-@@ -811,7 +811,7 @@ int main(int argc, char *argv[])
+@@ -814,7 +814,7 @@ int main(int argc, char *argv[])
  
  		/* We're assuming that the input space has a perfect black point... */
  
@@ -592,7 +579,7 @@ Index: trunk/spectro/fakeread.c
  		bp[0] = bp[1] = bp[2] = 0.0;
  		oluo->lookup(oluo, bp, bp);
  
-@@ -824,7 +824,7 @@ int main(int argc, char *argv[])
+@@ -827,7 +827,7 @@ int main(int argc, char *argv[])
  		             bt1886 == 1 ? egamma : tgamma, bt1886 == 1 ? 1 : 0);
  
  		if (verb)
@@ -605,7 +592,7 @@ Index: trunk/profile/invprofcheck.c
 ===================================================================
 --- trunk.orig/profile/invprofcheck.c
 +++ trunk/profile/invprofcheck.c
-@@ -96,7 +96,7 @@ void usage(void) {
+@@ -99,7 +99,7 @@ void usage(void) {
  	fprintf(stderr," -k           Show CIEDE2000 delta E values\n");
  	fprintf(stderr," -w           create %s visualisation (profile%s)\n",vrml_format(),vrml_ext());
  	fprintf(stderr," -x           Use %s axes\n",vrml_format());
diff --git a/debian/patches/110_dispwin_segfault.patch b/debian/patches/110_dispwin_segfault.patch
index 06fb9f9..2b1e684 100644
--- a/debian/patches/110_dispwin_segfault.patch
+++ b/debian/patches/110_dispwin_segfault.patch
@@ -3,14 +3,14 @@ Author: Jörg Frings-Fürst <debian@jff-webhsoting.net>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=700253
 Forwarded: http://www.freelists.org/post/argyllcms/dispwin-bad-command-line-option-makes-dispwin-segfault
 Reviewed-by: 
-Last-Update: 2015-05-03
+Last-Update: 2015-08-23
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: trunk/spectro/dispwin.c
 ===================================================================
 --- trunk.orig/spectro/dispwin.c
 +++ trunk/spectro/dispwin.c
-@@ -5547,6 +5547,7 @@ main(int argc, char *argv[]) {
+@@ -5553,6 +5553,7 @@ main(int argc, char *argv[]) {
  
  			/* Display number */
  			else if (argv[fa][1] == 'd') {
diff --git a/debian/patches/15_jam.patch b/debian/patches/15_jam.patch
index 2809967..251f61f 100644
--- a/debian/patches/15_jam.patch
+++ b/debian/patches/15_jam.patch
@@ -1,7 +1,7 @@
 Description: Add multiarch support to jam files
 Author: Jörg Frings Fürst <debian@jff-webhosting.net>
 Forwarded: http://www.freelists.org/post/argyllcms/Some-buildsystem-issues
-Last-Update: 2015-05-04
+Last-Update: 2015-08-23
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: trunk/Jambase
@@ -47,87 +47,97 @@ Index: trunk/Jamtop
  
  # Tell standalone libraries that they are part of Argyll:
  DEFINES += ARGYLLCMS ;
-@@ -132,16 +133,79 @@ rule CheckForLibrary {
+@@ -139,17 +140,82 @@ rule CheckForLibrary {
+ 	}
  
  	if ! $(BUILTIN_$(UCASE)) && $(UNIX) {
- 		if  [ GLOB /usr/include : $(lcase).h $(lcase)lib.h ]
--	     || [ GLOB /usr/local/include : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/local/include : $(lcase).h $(lcase)lib.h ]
- 		 || [ GLOB /usr/include/x86_64-linux-gnu : $(lcase).h $(lcase)lib.h ]
--	     || [ GLOB /usr/include/i386-linux-gnu : $(lcase).h $(lcase)lib.h ] {
-+	         || [ GLOB /usr/include/i386-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/include/alpha-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/include/aarch64-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/include/arm-linux-gnueabi : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/include/arm-linux-gnueabihf : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/include/hppa-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/include/i386-gnu : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/include/x86_64-kfreebsd-gnu : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/include/i386-kfreebsd-gnu : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/include/m68k-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/include/mips-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/include/mipsel-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/include/mips64el-linux-gnuabi64 : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/include/powerpc-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/include/powerpc-linux-gnuspe : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/include/powerpc64-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/include/powerpc64le-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/include/s390x-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/include/sh4-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/include/sparc-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/include/sparc64-linux-gnu : $(lcase).h $(lcase)lib.h ]
-+	         || [ GLOB /usr/include/x86_64-linux-gnux32 : $(lcase).h $(lcase)lib.h ] {
- 			if  [ GLOB /usr/lib : lib$(lcase).so ] || [ GLOB /usr/lib : lib$(lcase).a ]
- 			 || [ GLOB /usr/local/lib : lib$(lcase).so ] || [ GLOB /usr/local/lib : lib$(lcase).a ]
- 			 || [ GLOB /usr/lib64 : lib$(lcase).so ] || [ GLOB /usr/lib64 : lib$(lcase).a ]
- 			 || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).so ]
- 			 || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).a ]
+-		if  [ GLOB /usr/include$(subd) : $(lcase).h $(lcase)lib.h ]
+-	     || [ GLOB /usr/local/include$(subd) : $(lcase).h $(lcase)lib.h ]
+-		 || [ GLOB /usr/include/x86_64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+-	     || [ GLOB /usr/include/i386-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ] {
+-			if  [ GLOB /usr/lib : lib$(lcase).so ] || [ GLOB /usr/lib : lib$(lcase).a ]
+-			 || [ GLOB /usr/local/lib : lib$(lcase).so ] || [ GLOB /usr/local/lib : lib$(lcase).a ]
+-			 || [ GLOB /usr/lib64 : lib$(lcase).so ] || [ GLOB /usr/lib64 : lib$(lcase).a ]
+-			 || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).so ]
+-			 || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).a ]
 -	         || [ GLOB /usr/lib/i386-linux-gnu : lib$(lcase).so ]
 -	         || [ GLOB /usr/lib/i386-linux-gnu : lib$(lcase).a ] {
-+	        	 || [ GLOB /usr/lib/i386-linux-gnu : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/i386-linux-gnu : lib$(lcase).a ]
-+	        	 || [ GLOB /usr/lib/alpha-linux-gnu : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/alpha-linux-gnu : lib$(lcase).a ]
-+	        	 || [ GLOB /usr/lib/aarch64-linux-gnu : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/aarch64-linux-gnu : lib$(lcase).a ]
-+	        	 || [ GLOB /usr/lib/arm-linux-gnueabi : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/arm-linux-gnueabi : lib$(lcase).a ]
-+	        	 || [ GLOB /usr/lib/arm-linux-gnueabihf : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/arm-linux-gnueabihf : lib$(lcase).a ]
-+	        	 || [ GLOB /usr/lib/hppa-linux-gnu : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/hppa-linux-gnu : lib$(lcase).a ]
-+	        	 || [ GLOB /usr/lib/i386-gnu : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/i386-gnu : lib$(lcase).a ]
-+	        	 || [ GLOB /usr/lib/x86_64-kfreebsd-gnu : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/x86_64-kfreebsd-gnu : lib$(lcase).a ]
-+	        	 || [ GLOB /usr/lib/i386-kfreebsd-gnu : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/i386-kfreebsd-gnu : lib$(lcase).a ]
-+	        	 || [ GLOB /usr/lib/m68k-linux-gnu : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/m68k-linux-gnu : lib$(lcase).a ]
-+	        	 || [ GLOB /usr/lib/mips-linux-gnu : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/mips-linux-gnu : lib$(lcase).a ]
-+	        	 || [ GLOB /usr/lib/mipsel-linux-gnu : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/mipsel-linux-gnu : lib$(lcase).a ]
-+	        	 || [ GLOB /usr/lib/mips64el-linux-gnuabi64 : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/mips64el-linux-gnuabi64 : lib$(lcase).a ]
-+	        	 || [ GLOB /usr/lib/powerpc-linux-gnu : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/powerpc-linux-gnu : lib$(lcase).a ]
-+	        	 || [ GLOB /usr/lib/powerpc-linux-gnuspe : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/powerpc-linux-gnuspe : lib$(lcase).a ]
-+	        	 || [ GLOB /usr/lib/powerpc64-linux-gnu : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/powerpc64-linux-gnu : lib$(lcase).a ]
-+	        	 || [ GLOB /usr/lib/powerpc64le-linux-gnu : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/powerpc64le-linux-gnu : lib$(lcase).a ]
-+	        	 || [ GLOB /usr/lib/s390x-linux-gnu : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/s390x-linux-gnu : lib$(lcase).a ]
-+	        	 || [ GLOB /usr/lib/sh4-linux-gnu : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/sh4-linux-gnu : lib$(lcase).a ]
-+	        	 || [ GLOB /usr/lib/sparc-linux-gnu : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/sparc-linux-gnu : lib$(lcase).a ]
-+	        	 || [ GLOB /usr/lib/sparc64-linux-gnu : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/sparc64-linux-gnu : lib$(lcase).a ]
-+	        	 || [ GLOB /usr/lib/x86_64-linux-gnux32 : lib$(lcase).so ]
-+	        	 || [ GLOB /usr/lib/x86_64-linux-gnux32 : lib$(lcase).a ] {
++	    if  [ GLOB /usr/include$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/local/include$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/x86_64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/i386-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/alpha-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/aarch64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/arm-linux-gnueabi$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/arm-linux-gnueabihf$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/hppa-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/i386-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/x86_64-kfreebsd-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/i386-kfreebsd-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/m68k-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/mips-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/mipsel-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/mips64el-linux-gnuabi64$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/powerpc-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/powerpc-linux-gnuspe$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/powerpc64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/powerpc64le-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/s390x-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/sh4-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/sparc-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/sparc64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
++		|| [ GLOB /usr/include/x86_64-linux-gnux32$(subd) : $(lcase).h $(lcase)lib.h ] {
++		    if  [ GLOB /usr/lib : lib$(lcase).so ] || [ GLOB /usr/lib : lib$(lcase).a ]
++			|| [ GLOB /usr/local/lib : lib$(lcase).so ]
++			|| [ GLOB /usr/local/lib : lib$(lcase).a ]
++			|| [ GLOB /usr/lib64 : lib$(lcase).so ]
++			|| [ GLOB /usr/lib64 : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/i386-linux-gnu : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/i386-linux-gnu : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/alpha-linux-gnu : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/alpha-linux-gnu : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/aarch64-linux-gnu : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/aarch64-linux-gnu : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/arm-linux-gnueabi : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/arm-linux-gnueabi : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/arm-linux-gnueabihf : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/arm-linux-gnueabihf : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/hppa-linux-gnu : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/hppa-linux-gnu : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/i386-gnu : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/i386-gnu : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/x86_64-kfreebsd-gnu : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/x86_64-kfreebsd-gnu : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/i386-kfreebsd-gnu : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/i386-kfreebsd-gnu : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/m68k-linux-gnu : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/m68k-linux-gnu : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/mips-linux-gnu : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/mips-linux-gnu : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/mipsel-linux-gnu : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/mipsel-linux-gnu : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/mips64el-linux-gnuabi64 : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/mips64el-linux-gnuabi64 : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/powerpc-linux-gnu : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/powerpc-linux-gnu : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/powerpc-linux-gnuspe : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/powerpc-linux-gnuspe : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/powerpc64-linux-gnu : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/powerpc64-linux-gnu : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/powerpc64le-linux-gnu : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/powerpc64le-linux-gnu : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/s390x-linux-gnu : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/s390x-linux-gnu : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/sh4-linux-gnu : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/sh4-linux-gnu : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/sparc-linux-gnu : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/sparc-linux-gnu : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/sparc64-linux-gnu : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/sparc64-linux-gnu : lib$(lcase).a ]
++			|| [ GLOB /usr/lib/x86_64-linux-gnux32 : lib$(lcase).so ]
++			|| [ GLOB /usr/lib/x86_64-linux-gnux32 : lib$(lcase).a ] {
  				echo "Using system $(UCASE) library" ;
  				$(UCASE)LIB = ;
  				$(UCASE)INC = ;