diff options
| author | Fabien Costantini <fabien@onepost.net> | 2008-10-25 21:06:31 +0000 |
|---|---|---|
| committer | Fabien Costantini <fabien@onepost.net> | 2008-10-25 21:06:31 +0000 |
| commit | b2deb4b6f44416e9c298f6cf1e44fcb30bd20bd3 (patch) | |
| tree | a8f3a2bdd8c504a1c7438201acf90b5e87c5213d | |
| parent | 0c69cbc7a0e78febb193d8a8d99270ee6e3a8fc5 (diff) | |
Fixed one typoe in configure.in, changed LINKFLTKCAIRO parameter passing in LINKSHARED.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6487 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | makeinclude.in | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 9c8803bb8..6758a17a2 100644 --- a/configure.in +++ b/configure.in @@ -126,7 +126,7 @@ CAIRODIR="" 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 @@ if test x$enable_shared = xyes; then ;; 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 @@ else 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) diff --git a/makeinclude.in b/makeinclude.in index d16bcff9e..3b49099f6 100644 --- a/makeinclude.in +++ b/makeinclude.in @@ -88,6 +88,7 @@ LINKFLTKGL = @LINKFLTKGL@ LINKFLTKFORMS = @LINKFLTKFORMS@ @LINKFLTK@ LINKFLTKIMG = @LINKFLTKIMG@ @LINKFLTK@ $(IMAGELIBS) LINKFLTKCAIRO = @LINKFLTKCAIRO@ $(CAIROLIBS) +FLTKCAIROOPTION = @FLTKCAIROOPTION@ LINKSHARED = @DSOLINK@ @LINKSHARED@ $(IMAGELIBS) $(CAIROLIBS) IMAGELIBS = -L../lib @IMAGELIBS@ |