diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-08-08 00:44:38 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-08-08 00:44:38 +0000 |
| commit | b8dcdf4c648a36182aff048a618463087de41c7c (patch) | |
| tree | d4e58833eb10fe55b20226f840744e10ae8d4a25 /configure.in | |
| parent | 7da5a27b404078ecefcb90f2374e2e2e09ad9e47 (diff) | |
Compilation could fail if a previous installation of FLTK was in
the same (non-standard) directory as an image library (STR #926)
configure.in:
- Add LINKFLTKFORMS definition.
- Change LINKFLTK* definitions to just reference the static
libraries themselves.
makeinclude.in:
- Use LINKFLTKFORMS and drop -L../lib stuff for static linking.
src/Makefile:
- Move -L. in front of LDLIBS and IMGLIBS when linking shared
libfltk_images.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4472 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/configure.in b/configure.in index e1a6cf4e5..c601e7ad1 100644 --- a/configure.in +++ b/configure.in @@ -80,9 +80,10 @@ case $uname in esac dnl Define the libraries and link options we'll need. -LINKFLTK="-lfltk" -LINKFLTKGL="-lfltk_gl" -LINKFLTKIMG="-lfltk_images" +LINKFLTK="../lib/libfltk.a" +LINKFLTKFORMS="../lib/libfltk_forms.a" +LINKFLTKGL="../lib/libfltk_gl.a" +LINKFLTKIMG="../lib/libfltk_images.a" GLDEMOS="gldemos" LIBEXT=".a" @@ -98,6 +99,7 @@ AC_SUBST(IMGLIBNAME) AC_SUBST(LIBEXT) AC_SUBST(LIBNAME) AC_SUBST(LINKFLTK) +AC_SUBST(LINKFLTKFORMS) AC_SUBST(LINKFLTKGL) AC_SUBST(LINKFLTKIMG) @@ -208,7 +210,7 @@ else PICFLAG=0 SHAREDSUFFIX="" FLUID="fluid" - LINKSHARED="-L../lib -lfltk_images -lfltk_forms -lfltk" + LINKSHARED="../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a" fi AC_SUBST(DSOCOMMAND) |