Menu
▾
▴
[Devil-linux-commit] build/scripts/config netpbm,1.2,1.3
|
From: Heiko Z. <smi...@us...> - 2010-01-13 23:39:43
|
Update of /cvsroot/devil-linux/build/scripts/config In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28939/scripts/config Modified Files: netpbm Log Message: - updated ImageMagick to 6.5.8-10 - updated autoconf to 2.65 - updated coreutils to 8.3 - updated gmp to 4.3.2 - updated gnutls to 2.8.5 - updated grep to 2.5.4 - updated groff to 1.20.1 - updated grsecurity to 2.1.14-2.6.31.11-201001071931 - updated inetutils to 1.7 - updated iproute2 to 2.6.31 - updated libiconv to 1.13.1 - updated minicom to 2.4 - updated mtools to 4.0.12 - updated nano to 2.2.1 - updated netpbm to 10.35.72 - updated patch to 2.6.1 - updated kernel to 2.6.31.11 - updated which to 2.20 Index: netpbm =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/config/netpbm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- netpbm 23 Oct 2006 16:54:55 -0000 1.2 +++ netpbm 13 Jan 2010 23:39:34 -0000 1.3 @@ -69,17 +69,30 @@ # This is the name of the header file that declares the types # uint32_t, etc. This name is used as #include $(INTTYPES_H) . # Set to null if the types come automatically without including anything. + +# We have a report (2005.09.17) that on IRIX 5.3 with the native IDO +# cc, inttypes.h and sys/types.h conflict (and Netpbm programs include +# sys/types for other things), so for that environment, <inttypes.h> +# won't work, but "inttypes_netpbm.h" might. + INTTYPES_H = <inttypes.h> # Linux libc5: #INTTYPES_H = <types.h> # Solaris: -#INTTYPES_H = <sys/inttypes.h> +# Solaris has <sys/inttypes.h>, but it doesn't define int_fast2_t, etc. +#INTTYPES_H = "inttypes_netpbm.h" # Others: #INTTYPES_H = <sys/stdint.h> #INTTYPES_H = <sys/types.h> # The automatically generated Netpbm version: #INTTYPES_H = "inttypes_netpbm.h" +# HAVE_INT64 tells whether, assuming you include the header indicated by +# INTTYPES_H, you have the int64_t type and related stuff. (If you don't +# the build will omit certain code that does 64 bit computations). +HAVE_INT64 = Y +#HAVE_INT64 = N + # CC and LD are for building the Netpbm programs, which are not necessarily # intended to run on the same system on which Make is running. But when we # build a build tool such as Libopt, it is meant to run only on the same @@ -87,6 +100,7 @@ # to use to compile and link build tools. CC_FOR_BUILD = $(CC) LD_FOR_BUILD = $(LD) +CFLAGS_FOR_BUILD = $(CFLAGS) # MAKE is set automatically by Make to what was used to invoke Make. @@ -122,11 +136,18 @@ RANLIB = ranlib # IRIX, SCO don't have Ranlib: #RANLIB = true + +# LEX is the beginning of a shell command that runs a Lex-like +# pattern matcher generator. Null string means there isn't any such +# command. That means the build will skip parts that need one. + LEX = flex # Solaris: # LEX = flex -e -# Or just skip parts that need Lex: +# Windows Mingw: # LEX = +# +# LEX = lex # C compiler options @@ -134,8 +155,9 @@ # -ansi and -Werror should work too, but are not included # by default because there's no point in daring the build to fail. # -pedantic isn't a problem because it causes at worst a warning. -#CFLAGS = -O3 -fast-math -pedantic \ -# -Wall -Wno-uninitialized -Wmissing-declarations +#CFLAGS = -O3 -ffast-math -pedantic -fno-common \ +# -Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit \ +# -Wwrite-string -Wmissing-prototypes -Wundef # The merged programs have a main_XXX subroutine instead of main(), # which would cause a warning with -Wmissing-declarations or # -Wmissing-prototypes. @@ -179,6 +201,15 @@ # LDFLAGS is often set as an environment variable; A setting here overrides # it. So either make sure you want to override it, or do a "LDFLAGS +=" here. +# LDFLAGS is usually not the right place for a -L option, because we put +# LDFLAGS _before_ our own -L options, so it would cancel out our +# specific selection of libraries. For example, if you say +# LDFLAGS=/usr/local/lib and an old copy of the libnetpbm is in +# /usr/local/lib, then you'd be linking against that old copy instead of +# the copy you just built, which is located by a -L option later on the +# link command. LIBS is the right variable for adding -L options. LIBS +# goes after any of our make files' own -L options. + # Eunice users may want to use -noshare so that the executables can # run standalone: #LDFLAGS += -noshare @@ -196,13 +227,6 @@ #LDFLAGS += -Wl,+b,/usr/pubsw/lib #IRIX: #LDFLAGS += -n32 -#FreeBSD, OpenBSD: -# (04.03.15 This may be a mistake. LDFLAGS may already be set to this as -# an environment variable. We used to override the environment variable -# here with LDFLAGS =, which would mean we had to override with the same -# value it already had. I suspect it will work fine with no LDFLAGS -# setting at all; need to confirm this on real FreeBSD and OpenBSD systems) -#LDFLAGS += -L/usr/local/lib # Linker options for created Netpbm shared libraries. @@ -256,8 +280,12 @@ # copy of Pbmtext used 16K less real memory when built with -fpic than # when built without. 2001.06.02. +# We have seen -fPIC required on IA64 and AMD64 machines (GNU +# compiler/linker). Build-time linking fails without it. I don't +# know why -- history seems to be repeating itself. 2005.02.23. + CFLAGS_SHLIB = -# Solaris or SunOS with gcc, and NetBSD: +# Gcc: #CFLAGS_SHLIB = -fpic #CFLAGS_SHLIB = -fPIC # Sun compiler: @@ -300,7 +328,7 @@ # The following variables tell where your various libraries on which # Netpbm depends live. The LIBxxx variable is a full file # specification of the link library (not necessarily the library used -# at run time). e.g. "/usr/local/lib/graphics/libpng.so". It usually +# at run time). e.g. "/usr/local/lib/graphics/libjpeg.so". It usually # doesn't matter if the library prefix and suffix are right -- you can # use "lib" and ".so" or ".a" regardless of what your system actually # uses because these just turn into "-L" and "-l" linker options @@ -308,7 +336,7 @@ # If you don't have the library in question, use a value of NONE for # LIBxxx and the build will simply skip the programs that require that # library. If the library is in your linker's (or the Netpbm build's) -# default search path, leave off the directory part, e.g. "libpng.so". +# default search path, leave off the directory part, e.g. "libjpeg.so". # The xxxHDR_DIR variable is the directory in which the interface # headers for the library live (e.g. /usr/include). If they are in your @@ -380,8 +408,15 @@ # The PNG library, by convention starting around April 2002, gets installed # with names that include a version number, such as libpng10.a and header -# files in /usr/include/libpng10. -# option. +# files in /usr/include/libpng10. But there is conventionally an unnumbered +# alias (e.g. libpng.a, /usr/include/libpng) for the preferred version. +# +# Recent versions of the library (since some time in the 2002-2006 period) +# have an associated 'libpng-config' that tells how to link it. The make +# files will use that program if it exists (must be in the PATH). In that +# case, PNGLIB and PNGHDR_DIR are irrelevant, but PNGVER is still meaningful, +# because the make file runs 'libpng$(PNGVER)-config'. + PNGLIB = NONE PNGHDR_DIR = PNGVER = @@ -398,6 +433,8 @@ # anything that needs the PNG library (see above). If you selected # NONE for the PNG library, it doesn't matter what you specify here -- # it won't get used. +# +# If you have 'libpng-config' (see above), these are irrelevant. ZLIB = NONE ZHDR_DIR = @@ -411,19 +448,33 @@ # The Jasper JPEG-2000 image compression library (aka JasPer): JASPERLIB = $(INTERNAL_JASPERLIB) JASPERHDR_DIR = $(INTERNAL_JASPERHDR_DIR) +# JASPERDEPLIBS is the libraries (-l options or file names) on which +# The Jasper library depends -- i.e. what you have to link into any +# executable that links in the Jasper library. +JASPERDEPLIBS = +#JASPERDEPLIBS = -ljpeg # And the Utah Raster Toolkit (aka URT aka RLE) library: URTLIB = $(BUILDDIR)/urt/librle.a URTHDR_DIR = $(SRCDIR)/urt +# The X11 library has facilities for talking to an X Window System +# server. It is required by Pamx. + +X11LIB = NONE +X11HDR_DIR = + +#X11LIB = /usr/lib/libX11.so +#X11HDR_DIR = + # The Linux SVGA library (Svgalib) is a facility for displaying graphics # on the Linux console. It is required by Ppmsvgalib. LINUXSVGALIB = NONE LINUXSVGAHDR_DIR = -#LINUXSVGALIB_DIR = +#LINUXSVGALIB = /usr/lib/libvga.so #LINUXSVGAHDR_DIR = /usr/include/vgalib # If you don't want any network functions, set OMIT_NETWORK to "y". @@ -435,7 +486,7 @@ #DJGPP/Windows, Tru64: # (there's some minor header problem that prevents network functions from # building on Tru64 2000.10.06) -#OMIT_NETWORK = Y +#OMIT_NETWORK = y # These are -l options to link in the network libraries. Often, these are # built into the standard C library, so this can be null. This is irrelevant @@ -451,6 +502,11 @@ #VMS: #VMS = yes +# DONT_HAVE_PROCESS_MGMT is Y if this system doesn't have the usual +# Unix process management stuff - fork, wait, etc. N for a regular Unix +# system. +DONT_HAVE_PROCESS_MGMT = N + # The following variables are used only by 'make install' (and the # variants of it). Paths here don't, for example, get built into any # programs. @@ -459,6 +515,10 @@ # override it by setting 'pkgdir' on the Make command line. PKGDIR_DEFAULT = /tmp/netpbm +# Subdirectory of the package directory ($(pkgdir)) in which man pages +# go. +PKGMANDIR = man + # File permissions for installed files. # Note that on some systems (e.g. Solaris), 'install' can't use the # mnemonic permissions - you have to use octal. @@ -529,7 +589,7 @@ #SHLIBPREFIXLIST is a blank-delimited list of prefixes that a filename #of a shared library may have on this system. Traditionally, it's -#just "lib", as in libc or libpbm. On Windows, though, varying +#just "lib", as in libc or libnetpbm. On Windows, though, varying #prefixes are used when multiple alternative forms of a library are #available. The first prefix in this list is what we use to name the #Netpbm shared libraries. @@ -569,20 +629,20 @@ + ####Lines above were copied from Makefile.config.in by 'configure'. ####Lines below were added by 'configure' based on the GNU platform. DEFAULT_TARGET = nonmerge NETPBMLIBTYPE=unixshared NETPBMLIBSUFFIX=so STATICLIB_TOO=y -CFLAGS = -O3 -ffast-math -pedantic -Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit -Wwrite-strings -Wmissing-prototypes +CFLAGS = -O3 -ffast-math -pedantic -fno-common -Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit -Wwrite-strings -Wmissing-prototypes -Wundef CFLAGS_MERGE = -Wno-missing-declarations -Wno-missing-prototypes LDRELOC = ld --reloc LINKER_CAN_DO_EXPLICIT_LIBRARY=Y LINKERISCOMPILER = Y +CFLAGS_SHLIB += -fPIC TIFFLIB = libtiff.so JPEGLIB = libjpeg.so -PNGHDR_DIR = /usr/include/libpng -PNGLIB = libpng.so ZLIB = libz.so NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/ |
