"Fossies" - the Fresh Open Source Software Archive  

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

About: bed is an adjustable data format binary editor.

config  (bed-3.1.0.src.tar.xz):config  (bed-3.1.1.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) -m32 CFLAGS=$(CPPFLAGS) -g -O2
CXXFLAGS=$(CPPFLAGS) -m32 -std=$(GXXVERSION) CXXFLAGS=$(CPPFLAGS) -static -std=$(GXXVERSION)
LDFLAGS= -m32 #-std=$(GXXVERSION) LDFLAGS= -static #-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.1.0 export BEDSRCDIR=/home/jka/src/bed-3.1.1
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.1.0 export VERSION=3.1.1
export PROGRAM=bed export PROGRAM=bed
SYSTEM=Linux SYSTEM=
export WINDOWS=no export WINDOWS=yes
export HOST_CPU=x86_64 export HOST_CPU=x86_64
export HOST_OS=linux-gnu export HOST_OS=mingw32
HOSTCONF=conf-.h HOSTCONF=conf-.h
HOST_ALIAS= HOST_ALIAS=
export HOSTEXEEXT= export HOSTEXEEXT=.exe
export EXEEXT=$(HOSTEXEEXT) export EXEEXT=$(HOSTEXEEXT)
include $(BEDSRCDIR)/build include $(BEDSRCDIR)/build
CYGWIN=no CYGWIN=no
HAVE_MAGIC_H=1 HAVE_MAGIC_H=0
export HAS_RE_SEARCH=n export HAS_RE_SEARCH=n
export CONFFILE=$(PROGRAM)rc export CONFFILE=$(PROGRAM)rc
export CONFLASTDIR=$(PROGRAM)-$(VERSION) export CONFLASTDIR=$(PROGRAM)-$(VERSION)
export ROOTDIR= export ROOTDIR=
HAS_APPLICATIONS= HAS_APPLICATIONS=
LN_S=ln -s LN_S=cp -pR
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=
CONFIG_PLUGIN=y CONFIG_PLUGIN=n
USE_RE2= USE_RE2=1
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+= -lpthread EXTRALIBS+=-lre2
endif endif
USE_HYPERSCAN= 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+= 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=-lpdcurses
CFLAGS+=-DCURSESTYPE=ncurses -DCURSES=1 CFLAGS+=-DCURSESTYPE=pdcurses -DCURSES=1
CXXFLAGS+=-DCURSESTYPE=ncurses -DCURSES=1 CXXFLAGS+=-DCURSESTYPE=pdcurses -DCURSES=1
# user threads to go on while making a searchlist. # user threads to go on while making a searchlist.
# Adds instability, but is also the most widely used. # Adds instability, but is also the most widely used.
# Not tried with win95 requires ReadFile with offset in OVERLAPPED # Not tried with win95 requires ReadFile with offset in OVERLAPPED
CONFIG_THREADS=y CONFIG_THREADS=y
THREADSLIB=-lpthread THREADSLIB=
ifneq ($(WINDOWS),yes) ifneq ($(WINDOWS),yes)
# The user of the program is unix minded # The user of the program is unix minded
FULLUNIX=y FULLUNIX=y
else else
CFLAGS+=-D_WIN32=1 -DWindows=1 -DUSE_WINFILE CFLAGS+=-D_WIN32=1 -DWindows=1 -DUSE_WINFILE
CXXFLAGS+=-D_WIN32=1 -DWindows=1 -DUSE_WINFILE CXXFLAGS+=-D_WIN32=1 -DWindows=1 -DUSE_WINFILE
FULLUNIX=n FULLUNIX=n
CONFIG_PLUGIN=n CONFIG_PLUGIN=n
#export BIOSDISK=y #export BIOSDISK=y
#set to y if you want to to use raw disk edit under win95/98/ME #set to y if you want to to use raw disk edit under win95/98/ME
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/local prefix=/mingw64
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 203 skipping to change at line 203
ICONPATH=/usr/share/icons ICONPATH=/usr/share/icons
MENUPATH=/usr/lib/menu MENUPATH=/usr/lib/menu
KDEMENU=/usr/share/applnk KDEMENU=/usr/share/applnk
GNOMEMENU=/usr/share/gnome/apps GNOMEMENU=/usr/share/gnome/apps
BEDMENU=Editors BEDMENU=Editors
XBEDMENU=Utilities XBEDMENU=Utilities
XMENUNAME="bed - binary editor" XMENUNAME="bed - binary editor"
MENUNAME="BED - BINARY EDITOR" MENUNAME="BED - BINARY EDITOR"
DEFINES_H=$(BEDSRCDIR)/src/defines.h DEFINES_H=$(BEDSRCDIR)/src/defines.h
CFLAGS+= -DHAVE_CONFIG_H -imacros $(DEFINES_H) CFLAGS+= -DHAVE_CONFIG_H -I$(BEDSRCDIR)/utils -I$(BEDSRCDIR)/x11 -imacros $(DE
CXXFLAGS+= -DHAVE_CONFIG_H -imacros $(DEFINES_H) FINES_H)
CXXFLAGS+= -DHAVE_CONFIG_H -I$(BEDSRCDIR)/utils -I$(BEDSRCDIR)/x11 -imacros $(
DEFINES_H)
#CONFIG_XBED=n #CONFIG_XBED=n
CONFIG_XBED=n CONFIG_XBED=n
NRXVT= rxvt rxvt.bin rxvt.sh rxvt-xpm rxvt-xterm NRXVT=
RXVT=rxvt RXVT=
CONFIG_PROGMAN=n CONFIG_PROGMAN=n
CROSS_COMPILING=no CROSS_COMPILING=no
CC=gcc CC=gcc
CXX=g++ CXX=g++
GXX=$(CXX) GXX=$(CXX)
GCC=$(CC) GCC=$(CC)
TOBUILDCC=gcc TOBUILDCC=x86_64-w64-mingw32-gcc
TOBUILDCXX=g++ TOBUILDCXX=x86_64-w64-mingw32-c++
HAS_X=y HAS_X=n
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= X_PRE_LIBS=
PDCURSES= PDCURSES=1
USES_ELF=y USES_ELF=n
ELFSIZE=32 ELFSIZE=unknown
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=y
ifeq ($(WINDOWS),yes) ifeq ($(WINDOWS),yes)
CONFIG_XBED=n CONFIG_XBED=n
endif endif
# Uses mmap when searching makes searching (forward, casesensitive, # Uses mmap when searching makes searching (forward, casesensitive,
# non regex) maybe a little bit faster. When true around 0.001%. # non regex) maybe a little bit faster. When true around 0.001%.
# and until 0.2.4 it somehow didn't work on extended files # and until 0.2.4 it somehow didn't work on extended files
CONFIG_MMAP=n CONFIG_MMAP=n
skipping to change at line 277 skipping to change at line 277
#n: don't do #n: don't do
CONFIG_MENULINES=n CONFIG_MENULINES=n
#color support (depends also on color lines in (.)bedrc) #color support (depends also on color lines in (.)bedrc)
#y: default color, black-white with option -B #y: default color, black-white with option -B
#n: not possible #n: not possible
#o: default black-white, color with option -C #o: default black-white, color with option -C
CONFIG_COLOR=y CONFIG_COLOR=y
ifeq ($(CONFIG_STATIC),y) ifeq ($(CONFIG_STATIC),y)
ifeq (ncurses,ncurses) ifeq (pdcurses,ncurses)
CURSESLIB+= -ltinfo -lgpm CURSESLIB+= -ltinfo -lgpm
endif endif
CONFIG_PLUGIN=n CONFIG_PLUGIN=n
endif endif
#Plugins can also be linked in the main program #Plugins can also be linked in the main program
#LINKIN: Puts it among other linked in procedures #LINKIN: Puts it among other linked in procedures
#LINKINDYN: shows the linked in plugin like a dynamic one. Can not be put in men u's #LINKINDYN: shows the linked in plugin like a dynamic one. Can not be put in men u's
#Plugins to choice from: bitcontains.plug bitflags.plug duplicate.plug ebcdic2as cii.plug elftables.plug (needs index2table.plug) file.plug filter.plug float.plu g gdb.plug nextitem.plug record.plug signed.plug skip.plug index2table.plug time .plug translate.plug xterm.plug #Plugins to choice from: bitcontains.plug bitflags.plug duplicate.plug ebcdic2as cii.plug elftables.plug (needs index2table.plug) file.plug filter.plug float.plu g gdb.plug nextitem.plug record.plug signed.plug skip.plug index2table.plug time .plug translate.plug xterm.plug
#defaults: #defaults:
skipping to change at line 324 skipping to change at line 324
#LINKINDYN+=disass.plug filter.plug #LINKINDYN+=disass.plug filter.plug
LINKINDYN+=filter.plug LINKINDYN+=filter.plug
endif endif
ifeq ($(HAVE_MAGIC_H),1) ifeq ($(HAVE_MAGIC_H),1)
LINKINDYN+= magic.plug LINKINDYN+= magic.plug
OTHERLIBS+= -lmagic #-lz OTHERLIBS+= -lmagic #-lz
REMOVEPLUG+= file.plug REMOVEPLUG+= file.plug
else else
REMOVEPLUG+= magic.plug REMOVEPLUG+= magic.plug
ifeq ($(HAS_FILE),y) ifeq ($(HAS_FILE),y)
LINKINDYN+= file.plug #LINKINDYN+= file.plug
endif endif
endif endif
ifeq ($(UNIXPLUGINS),y) ifeq ($(UNIXPLUGINS),y)
ifeq ($(USES_ELF),y) ifeq ($(USES_ELF),y)
#LINKINDYN+=index2table.plug #LINKINDYN+=index2table.plug
endif endif
ifeq ($(ELFSIZE),32) ifeq ($(ELFSIZE),32)
#LINKINDYN+=elftables32.plug #LINKINDYN+=elftables32.plug
endif endif
endif endif
endif endif
ifeq ($(WINDOWS),yes) ifeq ($(WINDOWS),yes)
LINKIN+=clipboard.plug title.plug LINKIN+=clipboard.plug title.plug
ifeq (ncurses,ncurses) ifeq (pdcurses,ncurses)
LINKINDYN+=rxvt.plug LINKINDYN+=rxvt.plug
endif endif
endif endif
endif # MINIMAL endif # MINIMAL
LINKIN+=edit.plug # if left out edit src/menu.h LINKIN+=edit.plug # if left out edit src/menu.h
INLINKLIB=inlink.a INLINKLIB=inlink.a
#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)\"
 End of changes. 24 change blocks. 
34 lines changed or deleted 36 lines changed or added

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