"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "config" between
bed-3.0.3.src.tar.xz and bed-3.1.0.src.tar.xz

About: bed is an adjustable data format binary editor.

config  (bed-3.0.3.src.tar.xz):config  (bed-3.1.0.src.tar.xz)
#config. Generated from config.in by configure. #config. Generated from config.in by configure.
ifneq ($(INCLUDEDCONFIG),yes) ifneq ($(INCLUDEDCONFIG),yes)
PROGRAMC= PROGRAMC=
PROGRAMLD= PROGRAMLD=
CPPFLAGS= CPPFLAGS=
GXXVERSION=c++20 GXXVERSION=c++20
CFLAGS=$(CPPFLAGS) CFLAGS=$(CPPFLAGS) -m32
CXXFLAGS=$(CPPFLAGS) -std=$(GXXVERSION) CXXFLAGS=$(CPPFLAGS) -m32 -std=$(GXXVERSION)
LDFLAGS= #-std=$(GXXVERSION) LDFLAGS= -m32 #-std=$(GXXVERSION)
CFLAGS+= -Wall #-Wno-write-strings -Wno-char-subscripts CFLAGS+= -Wall #-Wno-write-strings -Wno-char-subscripts
CXXFLAGS+= -Wall #-Wno-write-strings -Wno-char-subscripts CXXFLAGS+= -Wall #-Wno-write-strings -Wno-char-subscripts
LDFLAGS+= LDFLAGS+=
EXTRALIBS= EXTRALIBS=
OTHERLIBS= OTHERLIBS=
export GNUSTRIP=yes export GNUSTRIP=yes
ifeq ($(BEDSRCDIR),) ifeq ($(BEDSRCDIR),)
export BEDSRCDIR=/o/home/jka/src/bed-3.0.3 export BEDSRCDIR=/o/home/jka/src/bed-3.1.0
endif endif
REGEX_DIR=$(BEDSRCDIR)/regex-0.13 REGEX_DIR=$(BEDSRCDIR)/regex-0.13
#include $(BEDSRCDIR)/prognames.mk #include $(BEDSRCDIR)/prognames.mk
INCLUDEDCONFIG=yes INCLUDEDCONFIG=yes
export LC_ALL=POSIX export LC_ALL=POSIX
# test,sed,sort,grep etc should produce exactly the intented output. # test,sed,sort,grep etc should produce exactly the intented output.
# Data access don't work anymore if e.g. sort order is changed # Data access don't work anymore if e.g. sort order is changed
# and some idiot made sort (Mandrake 7.2) produce different sort order # and some idiot made sort (Mandrake 7.2) produce different sort order
# depending on locale. try # depending on locale. try
#LC_ALL=nl sort #LC_ALL=nl sort
#aA #aA
#AB #AB
export MAN2HTML=../man2html/man2html export MAN2HTML=../man2html/man2html
#export LOWVERSION=@LOWVERSION@ #export LOWVERSION=@LOWVERSION@
#export MIDVERSION=@MIDVERSION@ #export MIDVERSION=@MIDVERSION@
#export UPVERSION=@UPVERSION@ #export UPVERSION=@UPVERSION@
export VERSION=3.0.3 export VERSION=3.1.0
export PROGRAM=bed export PROGRAM=bed
SYSTEM=Linux SYSTEM=Linux
export WINDOWS=no export WINDOWS=no
export HOST_CPU=x86_64 export HOST_CPU=x86_64
export HOST_OS=linux-gnu export HOST_OS=linux-gnu
HOSTCONF=conf-.h HOSTCONF=conf-.h
HOST_ALIAS= HOST_ALIAS=
export HOSTEXEEXT= export HOSTEXEEXT=
export EXEEXT=$(HOSTEXEEXT) export EXEEXT=$(HOSTEXEEXT)
include $(BEDSRCDIR)/build include $(BEDSRCDIR)/build
skipping to change at line 65 skipping to change at line 65
export CONFLASTDIR=$(PROGRAM)-$(VERSION) export CONFLASTDIR=$(PROGRAM)-$(VERSION)
export ROOTDIR= export ROOTDIR=
HAS_APPLICATIONS= HAS_APPLICATIONS=
LN_S=ln -s LN_S=ln -s
HAVE_LN_R=y HAVE_LN_R=y
# compile support for the use of plugins. Needs libdl # compile support for the use of plugins. Needs libdl
# if CONFIG_PLUGIN=n then GIVE=.. in plugin/examples/Makefile determines # if CONFIG_PLUGIN=n then GIVE=.. in plugin/examples/Makefile determines
# which plugins are linked in instead # which plugins are linked in instead
DL_LIBRARY=-ldl DL_LIBRARY=-ldl
CONFIG_PLUGIN=y CONFIG_PLUGIN=y
USE_RE2=1 USE_RE2=
ifeq ($(USE_RE2),1) ifeq ($(USE_RE2),1)
CFLAGS+=-DUSE_RE2=1 CFLAGS+=-DUSE_RE2=1
CXXFLAGS+=-DUSE_RE2=1 CXXFLAGS+=-DUSE_RE2=1
EXTRALIBS+=-lre2 -lpthread EXTRALIBS+= -lpthread
endif endif
USE_HYPERSCAN=1 USE_HYPERSCAN=
ifeq ($(USE_HYPERSCAN),1) ifeq ($(USE_HYPERSCAN),1)
CFLAGS+=-DUSE_HYPERSCAN=1 CFLAGS+=-DUSE_HYPERSCAN=1
CXXFLAGS+=-DUSE_HYPERSCAN=1 CXXFLAGS+=-DUSE_HYPERSCAN=1
EXTRALIBS+=-lhs EXTRALIBS+=
endif endif
ifneq ($(HAS_RE_SEARCH),y) ifneq ($(HAS_RE_SEARCH),y)
OBJECTS=$(REGEX_DIR)/regex.o OBJECTS=$(REGEX_DIR)/regex.o
endif endif
DYNAMICCURSES= DYNAMICCURSES=
STATICCURSES= STATICCURSES=
CURSESLIB=-lncurses CURSESLIB=-lncurses
skipping to change at line 123 skipping to change at line 123
CFLAGS+= -DBIOSDISK -DRUNONWIN95=1 CFLAGS+= -DBIOSDISK -DRUNONWIN95=1
CXXFLAGS+= -DBIOSDISK -DRUNONWIN95=1 CXXFLAGS+= -DBIOSDISK -DRUNONWIN95=1
CONFIG_THREADS=n CONFIG_THREADS=n
endif endif
endif endif
ifeq ($(FULLUNIX),y) ifeq ($(FULLUNIX),y)
#LINK some useful 'plugins' in main program instead of dynamic linkage? #LINK some useful 'plugins' in main program instead of dynamic linkage?
CONFIG_LINKINPLUGINS=y CONFIG_LINKINPLUGINS=y
prefix=/usr prefix=/usr/local
datarootdir = ${prefix}/share datarootdir = ${prefix}/share
exec_prefix=${prefix} exec_prefix=${prefix}
bindir=${exec_prefix}/bin bindir=${exec_prefix}/bin
datadir=${datarootdir} datadir=${datarootdir}
mandir=${datarootdir}/man mandir=${datarootdir}/man
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
LDFLAGS+=-Xlinker -rpath=$(libdir) LDFLAGS+=-Xlinker -rpath=$(libdir)
TEMPDIR=$(prefix)/tmp TEMPDIR=$(prefix)/tmp
CFLAGS+=-DTEMPDIR=\"$(TEMPDIR)\" CFLAGS+=-DTEMPDIR=\"$(TEMPDIR)\"
CXXFLAGS+=-DTEMPDIR=\"$(TEMPDIR)\" CXXFLAGS+=-DTEMPDIR=\"$(TEMPDIR)\"
skipping to change at line 150 skipping to change at line 150
export CONFDIR=$(datadir)/$(PROGRAM) export CONFDIR=$(datadir)/$(PROGRAM)
TEMPDIR=$(prefix)/tmp TEMPDIR=$(prefix)/tmp
endif endif
export CONFDIRLINK=$(datadir)/$(PROGRAM) export CONFDIRLINK=$(datadir)/$(PROGRAM)
PERSCONFFILE=~/.$(CONFFILE) PERSCONFFILE=~/.$(CONFFILE)
GLOBALCONFFILE=$(CONFDIRLINK)/$(CONFFILE) GLOBALCONFFILE=$(CONFDIRLINK)/$(CONFFILE)
DEFAULTBEDRCBIN=$(PERSCONFFILE)-bin DEFAULTBEDRCBIN=$(PERSCONFFILE)-bin
else else
ifeq ($(CYGWIN),yes)
prefix=/cygdrive/c prefix=/cygdrive/c
else
prefix="c:/"
endif
bindir=$(prefix)/Windows bindir=$(prefix)/Windows
datadir=$(prefix)/Program\ Files datadir=$(prefix)/Program\ Files
mandir=$(CONFDIR) mandir=$(CONFDIR)
export MANDIR=$(CONFDIR) export MANDIR=$(CONFDIR)
export CONFDIR=$(datadir)/$(PROGRAM) export CONFDIR=$(datadir)/$(PROGRAM)
export CONFDIRLINK=$(datadir)/$(PROGRAM) export CONFDIRLINK=$(datadir)/$(PROGRAM)
PERSCONFFILE=~/.$(CONFFILE) PERSCONFFILE=~/.$(CONFFILE)
#BEDRCBINFILE="bedrc-bin" #give only last part in MS Windows is placed in %APPD ATA% if DEFAULTBEDRCBIN not defined #BEDRCBINFILE="bedrc-bin" #give only last part in MS Windows is placed in %APPD ATA% if DEFAULTBEDRCBIN not defined
GLOBALCONFFILE=$(datadir)/bed/bedrc GLOBALCONFFILE=$(datadir)/bed/bedrc
CFLAGS+=-DNCURSES_BED=\"$(CONFDIR)/bedn.exe\" -DNCURSES_BEDENV=\"BEDN\" CFLAGS+=-DNCURSES_BED=\"$(CONFDIR)/bedn.exe\" -DNCURSES_BEDENV=\"BEDN\"
skipping to change at line 220 skipping to change at line 224
GCC=$(CC) GCC=$(CC)
TOBUILDCC=gcc TOBUILDCC=gcc
TOBUILDCXX=g++ TOBUILDCXX=g++
HAS_X=y HAS_X=y
X_CFLAGS= X_CFLAGS=
X_LIBS= X_LIBS=
#X_EXTRA_LIBS= -lxcb -lXau -lXdmcp #X_EXTRA_LIBS= -lxcb -lXau -lXdmcp
X_EXTRA_LIBS= -lxcb -lXau X_EXTRA_LIBS= -lxcb -lXau
X_PRE_LIBS= -lSM -lICE X_PRE_LIBS=
PDCURSES= PDCURSES=
USES_ELF=y USES_ELF=y
ELFSIZE=64 ELFSIZE=32
HAS_NROFF=y HAS_NROFF=y
# *** spaces and tabs matter!!!! *** # *** spaces and tabs matter!!!! ***
#configuration options: #configuration options:
# link static=y # link static=y
CONFIG_STATIC=n CONFIG_STATIC=n
ifeq ($(WINDOWS),yes) ifeq ($(WINDOWS),yes)
CONFIG_XBED=n CONFIG_XBED=n
skipping to change at line 354 skipping to change at line 358
#CFLAGS+=-DVERSION=\"$(VERSION)\" -DPROGRAM=\"$(PROGRAM)\" -DCONFDIR=\"$(CONFDI R)\" -DCONFDIRLINK=\"$(CONFDIRLINK)\" -DBINDIR=\"$(BINDIR)\" -DCONFVAR=\"$(CONFV AR)\" -DCONFFILE=\"$(CONFFILE)\" #CFLAGS+=-DVERSION=\"$(VERSION)\" -DPROGRAM=\"$(PROGRAM)\" -DCONFDIR=\"$(CONFDI R)\" -DCONFDIRLINK=\"$(CONFDIRLINK)\" -DBINDIR=\"$(BINDIR)\" -DCONFVAR=\"$(CONFV AR)\" -DCONFFILE=\"$(CONFFILE)\"
CFLAGS+= -DVERSION=\"$(VERSION)\" -DPROGRAM=\"$(PROGRAM)\" -DCONFDIR=\"$(CONFDI R)\" -DCONFDIRLINK=\"$(CONFDIRLINK)\" -DBINDIR=\"$(BINDIR)\" -DCONFVAR=\"$(CONFV AR)\" -DCONFFILE=\"$(CONFFILE)\" CFLAGS+= -DVERSION=\"$(VERSION)\" -DPROGRAM=\"$(PROGRAM)\" -DCONFDIR=\"$(CONFDI R)\" -DCONFDIRLINK=\"$(CONFDIRLINK)\" -DBINDIR=\"$(BINDIR)\" -DCONFVAR=\"$(CONFV AR)\" -DCONFFILE=\"$(CONFFILE)\"
CXXFLAGS+= -DVERSION=\"$(VERSION)\" -DPROGRAM=\"$(PROGRAM)\" -DCONFDIR=\"$(CONF DIR)\" -DCONFDIRLINK=\"$(CONFDIRLINK)\" -DBINDIR=\"$(BINDIR)\" -DCONFVAR=\"$(CON FVAR)\" -DCONFFILE=\"$(CONFFILE)\" CXXFLAGS+= -DVERSION=\"$(VERSION)\" -DPROGRAM=\"$(PROGRAM)\" -DCONFDIR=\"$(CONF DIR)\" -DCONFDIRLINK=\"$(CONFDIRLINK)\" -DBINDIR=\"$(BINDIR)\" -DCONFVAR=\"$(CON FVAR)\" -DCONFFILE=\"$(CONFFILE)\"
INLINKALL=$(LINKIN) $(LINKINDYN) INLINKALL=$(LINKIN) $(LINKINDYN)
ifeq ($(CROSS_COMPILING),no) ifeq ($(CROSS_COMPILING),no)
TOBUILDCXXFLAGS=$(CXXFLAGS) TOBUILDCXXFLAGS=$(CXXFLAGS)
TOBUILDCFLAGS=$(CFLAGS) TOBUILDCFLAGS=$(CFLAGS)
TOBUILDLDFLAGS=$(LDFLAGS) TOBUILDLDFLAGS=$(LDFLAGS)
endif endif
ifeq ($(HOST_OS),mingw32)
CFLAGS+=-D_POSIX_THREAD_SAFE_FUNCTIONS=1
CXXFLAGS+=-D_POSIX_THREAD_SAFE_FUNCTIONS=1
endif
endif endif
 End of changes. 13 change blocks. 
12 lines changed or deleted 20 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)