diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-07-14 17:03:31 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-07-14 17:03:31 +0000 |
| commit | 3346a9fee75faff9b8087513204cb63cfcf8ec0c (patch) | |
| tree | 9d047b2a883c283ebca058e3872758aa8c39a69c /fltk-config.in | |
| parent | 8e2ff295008e2319e01df604a7c8e382924b22cd (diff) | |
Change the Fl_Group current, add, and remove methods so they are no longer
inline; this should make shared libraries work better on all platforms.
Link FLUID against shared libraries, too, so that the installed fluid is
also using shared libraries (still make a statically linked fluid for the
build)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2525 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fltk-config.in')
| -rwxr-xr-x | fltk-config.in | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/fltk-config.in b/fltk-config.in index 015082890..f36d2c6fc 100755 --- a/fltk-config.in +++ b/fltk-config.in @@ -1,6 +1,6 @@ #! /bin/sh # -# "$Id: fltk-config.in,v 1.12.2.13 2002/07/11 10:37:49 easysw Exp $" +# "$Id: fltk-config.in,v 1.12.2.14 2002/07/14 17:03:30 easysw Exp $" # # FLTK configuration utility. # @@ -60,6 +60,7 @@ LIBNAME="@LIBNAME@" DSONAME="@DSONAME@" DSOLINK="@DSOLINK@" IMAGELIBS="@IMAGELIBS@" +SHAREDSUFFIX="@SHAREDSUFFIX@" usage () { @@ -101,12 +102,6 @@ compile= post= debug= -# AIX has very poor handling of static and shared libraries; always use -# the image libraries under AIX... -if test `uname` = AIX; then - use_images=yes -fi - # Parse command line options while test $# -gt 0 do @@ -199,21 +194,21 @@ fi # Calculate needed libraries LDSTATIC="$libdir/libfltk.a $LDLIBS" -LDLIBS="$libs -lfltk $LDLIBS" +LDLIBS="$libs -lfltk$SHAREDSUFFIX $LDLIBS" LIBS="$LIBS $libdir/libfltk.a" if test x$use_forms = xyes; then - LDLIBS="-lfltk_forms $LDLIBS" + LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS" LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC" LIBS="$LIBS $libdir/libfltk_forms.a" fi if test x$use_gl = xyes; then - LDLIBS="-lfltk_gl @GLLIB@ $LDLIBS" + LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS" LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC" LIBS="$LIBS $libdir/libfltk_gl.a" fi if test x$use_images = xyes; then - LDLIBS="-lfltk_images $IMAGELIBS $LDLIBS" + LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS" LDSTATIC="$libdir/libfltk_images.a $IMAGELIBS $LDSTATIC" fi @@ -297,5 +292,5 @@ if test "$echo_libs" = "yes"; then fi # -# End of "$Id: fltk-config.in,v 1.12.2.13 2002/07/11 10:37:49 easysw Exp $". +# End of "$Id: fltk-config.in,v 1.12.2.14 2002/07/14 17:03:30 easysw Exp $". # |