view src/fltk-2-uuid-mod.patch @ 3721:933b99febcf1

Expand options to support 3 possible sources of octave * configure.ac: modify --enable-stable rule to --enable-octave=source (stable,alpha,default) * Makefile.am: modify OCTAVE_TARGET based on octave build value set in configure. * index.html: added master-octave information. * src/default-octave.mk: new file. * src/default-octave-1-docinstall.patch * dist-files.mk: add default-octave-1-docinstall.patch default-octave.mk * binary-dist-rules.mk: use OCTAVE_TARGET to decide on tarball/installer name
author John Donoghue <john.donoghue@ieee.org>
date Sun, 19 Oct 2014 22:58:20 -0400
parents 1f944d8d6fe5
children
line wrap: on
line source

diff -ur fltk-1.3.1.orig/fltk-config.in fltk-1.3.1/fltk-config.in
--- fltk-1.3.1.orig/fltk-config.in	2013-05-24 20:20:53.000000000 -0400
+++ fltk-1.3.1/fltk-config.in	2013-05-24 20:22:12.000000000 -0400
@@ -341,7 +341,7 @@
     libdirs=$libs
 
     for i in $LDLIBS ; do
-	if test $i != -L$libdir ; then
+	if test $i != -L$libdir -a $i != -luuid ; then
 	    if test -z "$my_libs" ; then
 		my_libs="$i"
 	    else