"Fossies" - the Fresh Open Source Software Archive  

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

About: bed is an adjustable data format binary editor.

config  (bed-3.0.0.src.tar.xz):config  (bed-3.0.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=
PROGRAMLD=
CPPFLAGS= CPPFLAGS=
GXXVERSION=c++17 GXXVERSION=c++2a
CFLAGS=$(CPPFLAGS) -m32 -std=$(GXXVERSION) CFLAGS=$(CPPFLAGS)
CXXFLAGS=$(CPPFLAGS) -m32 -std=$(GXXVERSION) CXXFLAGS=$(CPPFLAGS) -std=$(GXXVERSION)
LDFLAGS= -m32 -std=$(GXXVERSION) LDFLAGS= -Xlinker -rpath=/plugins/examples #-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
LDFLAGS+= LDFLAGS+=
EXTRALIBS= EXTRALIBS=
OTHERLIBS= OTHERLIBS=
export GNUSTRIP=yes export GNUSTRIP=yes
BEDSRCDIR=/home/jka/src/bed-3.0.0
ifeq ($(BEDSRCDIR),)
export BEDSRCDIR=/home/jka/src/bed-3.0.1
endif
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=0 #export LOWVERSION=@LOWVERSION@
export MIDVERSION=0 #export MIDVERSION=@MIDVERSION@
export UPVERSION=3 #export UPVERSION=@UPVERSION@
export VERSION=3.0.0 export VERSION=3.0.1
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)
include $(BEDSRCDIR)/build include $(BEDSRCDIR)/build
CYGWIN=no CYGWIN=no
HAVE_MAGIC_H=1 HAVE_MAGIC_H=1
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=ln -s
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=1
ifeq ($(USE_RE2),1) ifeq ($(USE_RE2),1)
CFLAGS+=-DUSE_RE2=1 CFLAGS+=-DUSE_RE2=1
CXXFLAGS+=-DUSE_RE2=1
EXTRALIBS+=-lre2 -lpthread EXTRALIBS+=-lre2 -lpthread
endif endif
USE_HYPERSCAN=1 USE_HYPERSCAN=1
ifeq ($(USE_HYPERSCAN),1) ifeq ($(USE_HYPERSCAN),1)
CFLAGS+=-DUSE_HYPERSCAN=1 CFLAGS+=-DUSE_HYPERSCAN=1
CXXFLAGS+=-DUSE_HYPERSCAN=1
EXTRALIBS+=-lhs EXTRALIBS+=-lhs
endif endif
ifneq ($(HAS_RE_SEARCH),y) ifneq ($(HAS_RE_SEARCH),y)
OBJECTS=regex.o OBJECTS=$(REGEX_DIR)/regex.o
endif endif
DYNAMICCURSES= DYNAMICCURSES=
STATICCURSES= STATICCURSES=
CURSESLIB=-lncurses CURSESLIB=-lncurses
CFLAGS+=-DCURSESTYPE=ncurses -DCURSES=1 CFLAGS+=-DCURSESTYPE=ncurses -DCURSES=1
CXXFLAGS+=-DCURSESTYPE=ncurses -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=-lpthread
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
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
CYGWINDLL= CYGWINDLL=
# >= 1007 no support for Windows 95/98/ME anymore so # >= 1007 no support for Windows 95/98/ME anymore so
# shouldn't be defined -DBIOSDISK -DRUNONWIN95=1 # shouldn't be defined -DBIOSDISK -DRUNONWIN95=1
ifeq ($(shell if test 0$(CYGWINDLL) -ge 01007;then echo nowin95;else echo win95 ;fi),nowin95) ifeq ($(shell if test 0$(CYGWINDLL) -ge 01007;then echo nowin95;else echo win95 ;fi),nowin95)
export BIOSDISK=n export BIOSDISK=n
endif endif
ifeq ($(BIOSDISK),y) ifeq ($(BIOSDISK),y)
CFLAGS+= -DBIOSDISK -DRUNONWIN95=1 CFLAGS+= -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
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)
TEMPDIR=$(prefix)/tmp TEMPDIR=$(prefix)/tmp
CFLAGS+=-DTEMPDIR=\"$(TEMPDIR)\" CFLAGS+=-DTEMPDIR=\"$(TEMPDIR)\"
CXXFLAGS+=-DTEMPDIR=\"$(TEMPDIR)\"
export MANDIR=$(mandir)/man1 export MANDIR=$(mandir)/man1
ifneq ($(WINDOWS),yes) ifneq ($(WINDOWS),yes)
export CONFDIR=$(libdir)/$(CONFLASTDIR) export CONFDIR=$(libdir)/$(CONFLASTDIR)
HAS_X=y HAS_X=y
else else
# bed under CYGWIN uses windows find file # bed under CYGWIN uses windows find file
export CONFDIR=$(datadir)/$(PROGRAM) export CONFDIR=$(datadir)/$(PROGRAM)
TEMPDIR=$(prefix)/tmp TEMPDIR=$(prefix)/tmp
endif endif
export CONFDIRLINK=$(datadir)/$(PROGRAM) export CONFDIRLINK=$(datadir)/$(PROGRAM)
skipping to change at line 143 skipping to change at line 161
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\"
CXXFLAGS+=-DNCURSES_BED=\"$(CONFDIR)/bedn.exe\" -DNCURSES_BEDENV=\"BEDN\"
endif endif
ifeq ($(SYSTEM),Android) ifeq ($(SYSTEM),Android)
PERSCONFFILE=/sdcard/.$(CONFFILE) PERSCONFFILE=/sdcard/.$(CONFFILE)
endif endif
CFLAGS+= -DPERSCONFFILE=\"$(PERSCONFFILE)\" CFLAGS+= -DPERSCONFFILE=\"$(PERSCONFFILE)\"
CXXFLAGS+= -DPERSCONFFILE=\"$(PERSCONFFILE)\"
ifneq ($(DEFAULTBEDRCBIN),) ifneq ($(DEFAULTBEDRCBIN),)
CFLAGS+= -DDEFAULTBEDRCBIN=\"$(DEFAULTBEDRCBIN)\" CFLAGS+= -DDEFAULTBEDRCBIN=\"$(DEFAULTBEDRCBIN)\"
CXXFLAGS+= -DDEFAULTBEDRCBIN=\"$(DEFAULTBEDRCBIN)\"
else else
ifneq ($(BEDRCBINFILE),) ifneq ($(BEDRCBINFILE),)
CFLAGS+=-DBEDRCBINFILE=\"$(BEDRCBINFILE)\" CFLAGS+=-DBEDRCBINFILE=\"$(BEDRCBINFILE)\"
CXXFLAGS+=-DBEDRCBINFILE=\"$(BEDRCBINFILE)\"
endif endif
endif endif
CFLAGS+= -DGLOBALCONFFILE=\"$(GLOBALCONFFILE)\" CFLAGS+= -DGLOBALCONFFILE=\"$(GLOBALCONFFILE)\"
CXXFLAGS+= -DGLOBALCONFFILE=\"$(GLOBALCONFFILE)\"
export EXEPROGRAM=bed$(EXEEXT) export EXEPROGRAM=bed$(HOSTEXEEXT)
#HAS_MAKEDEPEND=@HAS_MAKEDEPEND@ #HAS_MAKEDEPEND=@HAS_MAKEDEPEND@
export BASEDIR=$(prefix) export BASEDIR=$(prefix)
export XPROGRAM=x$(PROGRAM) export XPROGRAM=x$(PROGRAM)
export BINDIR=$(bindir) export BINDIR=$(bindir)
export CONFVAR=BEDRC export CONFVAR=BEDRC
#s/AC_SUBST(\(.*\))/\1=@\1@ #s/AC_SUBST(\(.*\))/\1=@\1@
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 -imacros $(DEFINES_H)
CXXFLAGS+= -DHAVE_CONFIG_H -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.bin rxvt.sh rxvt-xpm rxvt-xterm
RXVT=rxvt RXVT=rxvt
CONFIG_PROGMAN=n CONFIG_PROGMAN=n
CROSS_COMPILING=no CROSS_COMPILING=no
CC=gcc CC=clang
CXX=g++ CXX=clang++
GXX=$(CXX) GXX=$(CXX)
GCC=$(CC) GCC=$(CC)
TOBUILDCC=cc TOBUILDCC=cc
TOBUILDCXX=c++ TOBUILDCXX=c++
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_PRE_LIBS= X_PRE_LIBS= -lSM -lICE
PDCURSES= PDCURSES=
HAS_FILE := $(shell $(BEDSRCDIR)/has_file)
USES_ELF=y USES_ELF=y
ELFSIZE=32 ELFSIZE=64
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 285 skipping to change at line 310
ifneq ($(WINDOWS),yes) ifneq ($(WINDOWS),yes)
#ifeq ($(HAS_X),y) #ifeq ($(HAS_X),y)
LINKINDYN+=title.plug #putselect.plug switchsize.plug rxvt.plug LINKINDYN+=title.plug #putselect.plug switchsize.plug rxvt.plug
# OTHERLIBS+= $(THREADSLIB) #for putselect.plug # OTHERLIBS+= $(THREADSLIB) #for putselect.plug
#endif #endif
endif endif
ifeq ($(FULLUNIX),y) ifeq ($(FULLUNIX),y)
UNIXPLUGINS=y UNIXPLUGINS=y
endif endif
ifeq ($(UNIXPLUGINS),y) ifeq ($(UNIXPLUGINS),y)
LINKINDYN+=disass.plug filter.plug #LINKINDYN+=disass.plug 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
else else
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 (ncurses,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)\"
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)
TOBUILDCXXFLAGS=$(CXXFLAGS)
TOBUILDCFLAGS=$(CFLAGS)
TOBUILDLDFLAGS=$(LDFLAGS)
endif
endif endif
 End of changes. 37 change blocks. 
20 lines changed or deleted 54 lines changed or added

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