summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2004-08-05 20:20:51 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2004-08-05 20:20:51 +0000
commit1215b40f82222881101c5bfebe62da9ffef7dff2 (patch)
tree1abe6371488b10f175e16dd8a86d2e1f762389b7
parentdb983c71b170cfe208554ca332458ec59ac23e9e (diff)
Make sure that -L option comes before image libraries, not after.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3759 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rwxr-xr-xfltk-config.in14
1 files changed, 7 insertions, 7 deletions
diff --git a/fltk-config.in b/fltk-config.in
index bb46d56e1..f7296c224 100755
--- a/fltk-config.in
+++ b/fltk-config.in
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# "$Id: fltk-config.in,v 1.12.2.24 2004/07/29 18:13:10 easysw Exp $"
+# "$Id: fltk-config.in,v 1.12.2.25 2004/08/05 20:20:51 easysw Exp $"
#
# FLTK configuration utility.
#
@@ -175,9 +175,9 @@ else
fi
# Calculate needed libraries
-LDSTATIC="$libs $libdir/libfltk.a $LDLIBS"
-LDLIBS="$libs -lfltk$SHAREDSUFFIX $LDLIBS"
-LIBS="$LIBS $libs $libdir/libfltk.a"
+LDSTATIC="$libdir/libfltk.a $LDLIBS"
+LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS"
+LIBS="$libdir/libfltk.a"
if test x$use_forms = xyes; then
LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS"
@@ -194,8 +194,8 @@ if test x$use_images = xyes; then
LDSTATIC="$libdir/libfltk_images.a $IMAGELIBS $LDSTATIC"
fi
-LDLIBS="$DSOLINK $LDFLAGS $LDLIBS"
-LDSTATIC="$LDFLAGS $LDSTATIC"
+LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS"
+LDSTATIC="$LDFLAGS $libs $LDSTATIC"
# Answer to user requests
if test -n "$echo_help"; then
@@ -266,5 +266,5 @@ if test "$echo_libs" = "yes"; then
fi
#
-# End of "$Id: fltk-config.in,v 1.12.2.24 2004/07/29 18:13:10 easysw Exp $".
+# End of "$Id: fltk-config.in,v 1.12.2.25 2004/08/05 20:20:51 easysw Exp $".
#