fltk-link.patch

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