The fix to buildAll.sh handles this.

set ZLIBLIB=../../zlib-1.1.4
set ZLIBINC=../../zlib-1.1.4
make -e -f scripts/makefile.gcc
unset ZLIBLIB
unset ZLIBINC

It's probably also required in the Darwin/Solaris legs, but I don't usually
touch those - Luca does.  So the cleaner version (I'll send the patch to
Luca) would be:

#
# If you're using Mac OS X you
# need to change makefile.gcc with
# makefile.macosx
# Linux: use gcc not linux
#
mfn="gcc"

if test -f /usr/bin/uname; then
    case `uname` in
        *solaris* )
        mfn="solaris"
        ;;

    *darwin* )
        mfn="macosx"
        ;;

    esac
fi

set ZLIBLIB=../../zlib-1.1.4
set ZLIBINC=../../zlib-1.1.4
make -e -f scripts/makefile.${mfn}
unset ZLIBLIB
unset ZLIBINC




-----Burton

-----Original Message-----
From: Falk Hayn [mailto:[EMAIL PROTECTED]]
Sent: Friday, September 20, 2002 6:23 AM
To: [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED]
Subject: RE: [Ntop-dev] libpng 1.2.4 does not build - wrong path in
makefile


Burton,

there is still a local reference to zlib.h in png.h, line 324
#include "zlib.h"
What is Your proposal to fix this in an adequate fashion ?


> Already fixed and committed to the CVS night before last.
>
> Patching the Makefile of an included product isn't the best way to fix
> this.
> What I did, rather, was to change the ntop file, buildAll.sh, to override
> the libpng provided values.
>
> -----Burton
>
>
> -----Original Message-----
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf
> Of Falk Hayn
> Sent: Thursday, September 19, 2002 2:55 AM
> To: [EMAIL PROTECTED]
> Subject: [Ntop-dev] libpng 1.2.4 does not build - wrong path in makefile
>
>
> Dear Ladies and Sirs,
>
> it is necessary to include this into the makefileof libpng 1.2.4,
> because the path to zlib does not fit the actual directory tree.
>
> Path:
> ntop-current/gdchart0.94c/gd-1.8.3/libpng-1.2.4/scripts
>
> File:
> "makefile.gcc"
>
> Change to do: (pls. correct the path of zlib and inseet the comments)
>
> # makefile for libpng using gcc (generic, static library)
> # Copyright (C) 2000 Cosmin Truta
> # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
> # For conditions of distribution and use, see copyright notice in png.h
> #
> # these are the original settings of libpng
> # ZLIBINC = ../zlib
> # ZLIBLIB = ../zlib
>
> # these are the settings for the distribution contained with ntop
> # Location of the zlib library and include files
> # $NTOPROOT/gdchart0.94c/gd-1.8.3/libpng-1.2.4
> # $NTOPROOT/gdchart0.94c/zlib-1.1.4
> ZLIBINC = ../../zlib-1.1.4
> ZLIBLIB = ../../zlib-1.1.4
>
> With regards.
> F.
>
> --
> GMX - Die Kommunikationsplattform im Internet.
> http://www.gmx.net
>
> _______________________________________________
> Ntop-dev mailing list
> [EMAIL PROTECTED]
> http://lists.ntop.org/mailman/listinfo/ntop-dev
>
> _______________________________________________
> Ntop-dev mailing list
> [EMAIL PROTECTED]
> http://lists.ntop.org/mailman/listinfo/ntop-dev
>

--
Werden Sie mit uns zum "OnlineStar 2002"! Jetzt GMX w�hlen -
und tolle Preise absahnen! http://www.onlinestar.de


_______________________________________________
Ntop mailing list
[EMAIL PROTECTED]
http://lists.ntop.org/mailman/listinfo/ntop

Reply via email to