fltk-link.patch

   1 --- fltk-1.1.3/src/Makefile.orig        2003-01-30 22:43:17.000000000 +0100
   2 +++ fltk-1.1.3/src/Makefile     2003-05-16 21:53:12.000000000 +0200
   3 @@ -200,7 +200,7 @@
   4
   5  libfltk.so.1.1: $(OBJECTS)
   6         echo $(DSOCOMMAND) $@ ...
   7 -       $(DSOCOMMAND) $@ $(OBJECTS) $(IMAGELIBS)
   8 +       $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
   9         -$(RM) libfltk.so
  10         $(LN) libfltk.so.1.1 libfltk.so
  11
  12 @@ -230,9 +230,9 @@
  13         $(LIBCOMMAND) $@ $(FLOBJECTS)
  14         $(RANLIB) $@
  15
  16 -libfltk_forms.so.1.1: $(FLOBJECTS)
  17 +libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
  18         echo $(DSOCOMMAND) $@ ...
  19 -       $(DSOCOMMAND) $@ $(FLOBJECTS)
  20 +       $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk $(LDLIBS) $(IMAGELIBS)
  21         -$(RM) libfltk_forms.so
  22         $(LN) libfltk_forms.so.1.1 libfltk_forms.so
  23
  24 @@ -262,9 +262,9 @@
  25         $(LIBCOMMAND) $@ $(GLOBJECTS)
  26         $(RANLIB) $@
  27
  28 -libfltk_gl.so.1.1: $(GLOBJECTS)
  29 +libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
  30         echo $(DSOCOMMAND) $@ ...
  31 -       $(DSOCOMMAND) $@ $(GLOBJECTS)
  32 +       $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk $(GLDLIBS)
  33         -$(RM) libfltk_gl.so
  34         $(LN) libfltk_gl.so.1.1 libfltk_gl.so
  35
  36 @@ -294,9 +294,9 @@
  37         $(LIBCOMMAND) $@ $(IMGOBJECTS)
  38         $(RANLIB) $@
  39
  40 -libfltk_images.so.1.1: $(IMGOBJECTS)
  41 +libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
  42         echo $(DSOCOMMAND) $@ ...
  43 -       $(DSOCOMMAND) $@ $(IMGOBJECTS)
  44 +       $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. -lfltk $(LDLIBS) $(IMAGELIBS)
  45         -$(RM) libfltk_images.so
  46         $(LN) libfltk_images.so.1.1 libfltk_images.so
  47
  48 --- fltk-1.1.3/configure.in.orig        2003-01-30 22:38:18.000000000 +0100
  49 +++ fltk-1.1.3/configure.in     2003-05-16 21:46:27.000000000 +0200
  50 @@ -169,7 +169,7 @@
  51              FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
  52              GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
  53              IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
  54 -            DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
  55 +            DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
  56             if test "$libdir" != "/usr/lib"; then
  57                     DSOLINK="-Wl,-rpath,$libdir"
  58              fi
  59 @@ -649,22 +649,7 @@
  60      # Previous versions of GCC do not have the reliance on the stdc++
  61      # or g++ libraries, so the extra supc++ library is not needed.
  62
  63 -    AC_MSG_CHECKING(if libsupc++ is required)
  64 -
  65 -    SUPC="`$CXX -print-file-name=libsupc++.a 2>/dev/null`"
  66 -    case "$SUPC" in
  67 -       libsupc++.a*)
  68 -           # Library not found, so this is and older GCC...
  69 -           AC_MSG_RESULT(no)
  70 -           ;;
  71 -       *)
  72 -            # This is gcc 3.x, and it knows of libsupc++, so we need it
  73 -            LIBS="$LIBS -lsupc++"
  74 -            AC_MSG_RESULT(yes)
  75 -           ;;
  76 -    esac
  77 -
  78 -    CXX="$CC"
  79 +    # PLD: we link all C++ programs against the same version of shared libstdc++.
  80
  81      # Show all standard warnings + unused variables when compiling...
  82      OPTIM="-Wall -Wunused $OPTIM"