Author: fabien
Date: 2008-10-25 14:06:31 -0700 (Sat, 25 Oct 2008)
New Revision: 6487
Log:
Fixed one typoe in configure.in, changed LINKFLTKCAIRO parameter passing in
LINKSHARED.
Modified:
branches/branch-1.3/configure.in
branches/branch-1.3/makeinclude.in
Modified: branches/branch-1.3/configure.in
===================================================================
--- branches/branch-1.3/configure.in 2008-10-25 20:40:20 UTC (rev 6486)
+++ branches/branch-1.3/configure.in 2008-10-25 21:06:31 UTC (rev 6487)
@@ -126,7 +126,7 @@
CAIROFLAGS=""
LINKFLTKCAIRO=""
FLTKCAIROOPTION=""
-CairolibsCAIROLIBS=""
+CAIROLIBS=""
AC_ARG_ENABLE(cairo,[ --enable-cairoext use fltk code
instrumentation for cairo extended use (default=no)])
if test x$enable_cairoext = xyes; then
@@ -277,7 +277,7 @@
;;
esac
- LINKSHARED="-L../src $(FLTKCAIROOPTION) -lfltk_images$SHAREDSUFFIX
-lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX"
+ LINKSHARED="-L../src $FLTKCAIROOPTION -lfltk_images$SHAREDSUFFIX
-lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX"
else
DSOCOMMAND="echo"
DSOLINK=""
@@ -289,7 +289,7 @@
PICFLAG=0
SHAREDSUFFIX=""
FLUID="fluid"
- LINKSHARED="$(LINKFLTKCAIRO) ../lib/libfltk_images.a
../lib/libfltk_forms.a ../lib/libfltk.a"
+ LINKSHARED="$LINKFLTKCAIRO ../lib/libfltk_images.a ../lib/libfltk_forms.a
../lib/libfltk.a"
fi
AC_SUBST(DSOCOMMAND)
Modified: branches/branch-1.3/makeinclude.in
===================================================================
--- branches/branch-1.3/makeinclude.in 2008-10-25 20:40:20 UTC (rev 6486)
+++ branches/branch-1.3/makeinclude.in 2008-10-25 21:06:31 UTC (rev 6487)
@@ -88,6 +88,7 @@
LINKFLTKFORMS = @LINKFLTKFORMS@ @LINKFLTK@
LINKFLTKIMG = @LINKFLTKIMG@ @LINKFLTK@ $(IMAGELIBS)
LINKFLTKCAIRO = @LINKFLTKCAIRO@ $(CAIROLIBS)
+FLTKCAIROOPTION = @FLTKCAIROOPTION@
LINKSHARED = @DSOLINK@ @LINKSHARED@ $(IMAGELIBS) $(CAIROLIBS)
IMAGELIBS = -L../lib @IMAGELIBS@
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
