rrdtool-system-libs.patch

   1 diff -urN rrdtool-1.0.48.org/configure.ac rrdtool-1.0.48/configure.ac
   2 --- rrdtool-1.0.48.org/configure.ac     2004-05-10 21:54:23.926860912 +0200
   3 +++ rrdtool-1.0.48/configure.ac 2004-05-10 21:54:50.507819992 +0200
   4 @@ -366,7 +366,7 @@
   5  ]))])])])])])])])])])
   6
   7
   8 -AC_CONFIG_FILES([cgilib-0.4/Makefile                           \
   9 +AC_CONFIG_FILES([ \
  10            examples/shared-demo.pl                      \
  11            examples/piped-demo.pl                       \
  12            examples/stripes.pl                          \
  13 @@ -383,9 +383,6 @@
  14            contrib/add_ds/add_ds.pl                     \
  15           contrib/add_ds/batch.pl                       \
  16            doc/Makefile                                 \
  17 -          gd1.3/Makefile                               \
  18 -          libpng-1.0.9/Makefile                                \
  19 -          zlib-1.1.4/Makefile                          \
  20            src/Makefile                                 \
  21            tcl/Makefile                                 \
  22            perl-shared/Makefile.PL                      \
  23 diff -urN rrdtool-1.0.48.org/gd1.3/Makefile.am rrdtool-1.0.48/gd1.3/Makefile.am
  24 --- rrdtool-1.0.48.org/gd1.3/Makefile.am        2004-05-10 21:54:23.833875048 +0200
  25 +++ rrdtool-1.0.48/gd1.3/Makefile.am    2004-05-10 21:54:50.509819688 +0200
  26 @@ -3,15 +3,14 @@
  27  noinst_LTLIBRARIES  = librrd_gd.la
  28
  29  librrd_gd_la_SOURCES = \
  30 -       gd.c            gdfontg.c       gdfontl.c       gdfontmb.c      \
  31 -       gdfonts.c       gdfontt.c       gdlucidab10.c   gdlucidab12.c   \
  32 +       gdlucidab10.c   gdlucidab12.c   \
  33         gdlucidab14.c   gdlucidan10.c   gdlucidan12.c   gdlucidan14.c \
  34         gdlucidan10l2.c  gdlucidab12l2.c \
  35 -       gd.h           gdfontmb.h     gdlucidab10.h  gdlucidan10.h \
  36 -       gdfontg.h      gdfonts.h      gdlucidab12.h  gdlucidan12.h \
  37 -       gdfontl.h      gdfontt.h      gdlucidab14.h  gdlucidan14.h \
  38 +       gdlucidab10.h  gdlucidan10.h \
  39 +       gdlucidab12.h  gdlucidan12.h \
  40 +       gdlucidab14.h  gdlucidan14.h \
  41         gdlucidan10l2.h  gdlucidab12l2.h
  42 -
  43 +librrd_gd_la_LIBADD = -lgd
  44
  45  EXTRA_DIST= README.rrdtool demoin.gif gd.dsp gd.dsw index.html readme.txt \
  46         webgif.c mtables.c mathmake.c giftogd.c gd.vcproj
  47 diff -urN rrdtool-1.0.48.org/Makefile.am rrdtool-1.0.48/Makefile.am
  48 --- rrdtool-1.0.48.org/Makefile.am      2004-05-10 21:54:23.926860912 +0200
  49 +++ rrdtool-1.0.48/Makefile.am  2004-05-10 21:54:50.511819384 +0200
  50 @@ -3,20 +3,11 @@
  51
  52  # allow to use shipped code with rrdtool or local OS's version
  53  # see configure.in or do a ./configure --help
  54 -if USE_INSTALLED_ZLIB
  55  SUBDIRS_1 =
  56 -else
  57 -SUBDIRS_1 = zlib-1.1.4
  58 -endif
  59 -
  60 -if USE_INSTALLED_LIBPNG
  61  SUBDIRS_2 =
  62 -else
  63 -SUBDIRS_2 = libpng-1.0.9
  64 -endif
  65
  66  # build the following subdirectories
  67 -SUBDIRS = cgilib-0.4 gd1.3 $(SUBDIRS_1) $(SUBDIRS_2) \
  68 +SUBDIRS = \
  69            src doc examples contrib tcl
  70
  71  # the following files are not mentioned in any other Makefile
  72 diff -urN rrdtool-1.0.48.org/perl-shared/Makefile.PL.in rrdtool-1.0.48/perl-shared/Makefile.PL.in
  73 --- rrdtool-1.0.48.org/perl-shared/Makefile.PL.in       2004-05-10 21:54:23.814877936 +0200
  74 +++ rrdtool-1.0.48/perl-shared/Makefile.PL.in   2004-05-10 21:54:50.512819232 +0200
  75 @@ -4,7 +4,7 @@
  76  # the contents of the Makefile that is written.
  77
  78  # Specify the location of the archive containing PIC compiled object files.
  79 -my $librrd = "-L../src/.libs/ @RRD_PRIVATE_LINK@"  ;
  80 +my $librrd = "-L../src/.libs/ -lrrd"  ;
  81
  82  WriteMakefile(
  83      'NAME'         => 'RRDs',
  84 @@ -14,7 +14,6 @@
  85      'CCFLAGS'      => '-DHAVE_CONFIG_H',
  86      # where to look for the necessary libraries
  87      # Perl will figure out which one is valid
  88 -    'depend'      => {'RRDs.c' => "@top_srcdir@/src/.libs/librrd_private.a"},
  89      'dynamic_lib'  => {'OTHERLDFLAGS' => "$librrd -lm"},
  90      'realclean'    => {FILES => 't/demo?.rrd t/demo?.gif' }
  91  );
  92 diff -urN rrdtool-1.0.48.org/src/Makefile.am rrdtool-1.0.48/src/Makefile.am
  93 --- rrdtool-1.0.48.org/src/Makefile.am  2004-05-10 21:54:23.886866992 +0200
  94 +++ rrdtool-1.0.48/src/Makefile.am      2004-05-10 21:55:10.680753240 +0200
  95 @@ -34,7 +34,7 @@
  96
  97
  98
  99 -AM_CPPFLAGS = -I$(CGI_INC_DIR) -I$(GD_INC_DIR) $(PNG_INC) $(ZLIB_INC)
 100 +AM_CPPFLAGS = -I$(CGI_INC_DIR) -I$(GD_INC_DIR)
 101
 102  #COMPILE   = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
 103  #LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
 104 @@ -73,10 +73,9 @@
 105  # files.
 106
 107  RRD_LIBS =                             \
 108 -       $(CGI_LIB_DIR)/librrd_cgi.la    \
 109 -       $(GD_LIB_DIR)/librrd_gd.la      \
 110 -       $(PNG_LIB)                      \
 111 -       $(ZLIB_LIB)
 112 +       -lcgic \
 113 +       -lgd \
 114 +       -lpng -lz
 115
 116  lib_LTLIBRARIES           = librrd.la
 117  noinst_LTLIBRARIES        = librrd_private.la
 118 diff -urN rrdtool-1.0.48.org/src/rrd_graph.c rrdtool-1.0.48/src/rrd_graph.c
 119 --- rrdtool-1.0.48.org/src/rrd_graph.c  2004-05-10 21:54:23.890866384 +0200
 120 +++ rrdtool-1.0.48/src/rrd_graph.c      2004-05-10 22:14:26.099102952 +0200
 121 @@ -14,13 +14,8 @@
 122  #include "rrd_graph.h"
 123  #include <gd.h>
 124
 125 -#ifdef LATIN2_ENABLE
 126 -#include <gdlucidan10l2.h>
 127 -#include <gdlucidab12l2.h>
 128 -#else
 129 -#include <gdlucidan10.h>
 130 -#include <gdlucidab12.h>
 131 -#endif
 132 +#include <gdfonts.h>
 133 +#include <gdfontl.h>
 134
 135  #include <sys/stat.h>
 136  #ifdef WIN32
 137 @@ -36,13 +31,8 @@
 138  #include <locale.h>
 139  #endif
 140
 141 -#ifdef LATIN2_ENABLE
 142 -#define SmallFont gdLucidaNormal10l2
 143 -#define LargeFont gdLucidaBold12l2
 144 -#else
 145 -#define SmallFont gdLucidaNormal10
 146 -#define LargeFont gdLucidaBold12
 147 -#endif
 148 +#define SmallFont gdFontSmall
 149 +#define LargeFont gdFontLarge
 150
 151  xlab_t xlab[] = {
 152      {0,        TMT_SECOND,30, TMT_MINUTE,5,  TMT_MINUTE,5,         0,"%H:%M"},
 153 diff -urN rrdtool-1.0.48.org/tcl/Makefile.am rrdtool-1.0.48/tcl/Makefile.am
 154 --- rrdtool-1.0.48.org/tcl/Makefile.am  2004-05-10 21:54:23.925861064 +0200
 155 +++ rrdtool-1.0.48/tcl/Makefile.am      2004-05-10 21:54:50.519818168 +0200
 156 @@ -22,7 +22,7 @@
 157  if COMP_TCL
 158
 159  $(TCL_LIB_FILE): tclrrd.o
 160 -       $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ @RRD_PRIVATE_LINK@ -lm $(TCL_LIB_SPEC)
 161 +       $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ -lrrd -lm -ltcl
 162
 163  tclrrd.o: tclrrd.c
 164         $(CC) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(INCLUDES) $(AM_CPPFLAGS) -c $< -DVERSION=\"$(VERSION)\"