"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "configure.ac" 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.

configure.ac  (bed-3.0.0.src.tar.xz):configure.ac  (bed-3.0.1.src.tar.xz)
AC_INIT([bed],[3.0.0],[bed@dse.nl]) AC_INIT([bed],[3.0.1],[binaryeditor@gmx.com])
#AC_INIT([bed],[$VERSION],[binaryeditor@gmx.com])
AC_CONFIG_HEADER(src/confdefines.h) AC_CONFIG_HEADER(src/confdefines.h)
. ./settings . ./settings
AC_CANONICAL_HOST AC_CANONICAL_HOST
AC_CANONICAL_BUILD AC_CANONICAL_BUILD
AC_PROG_CC AC_PROG_CC
AC_PROG_CXX AC_PROG_CXX
AC_CHECK_TOOL([STRIP],[strip]) AC_CHECK_TOOL([STRIP],[strip])
if $STRIP -V|grep GNU if $STRIP -V|grep GNU
then then
skipping to change at line 106 skipping to change at line 107
, ,
{ {
GetStdHandle(STD_OUTPUT_HANDLE) ; GetStdHandle(STD_OUTPUT_HANDLE) ;
},WINDOWS=yes,WINDOWS=no) },WINDOWS=yes,WINDOWS=no)
fi fi
fi fi
AC_CHECK_FUNCS(strchrnul setenv ftruncate64 truncate64 open64 stat64 fstat64 glo b stpcpy) AC_CHECK_FUNCS(strchrnul setenv ftruncate64 truncate64 open64 stat64 fstat64 glo b stpcpy)
AC_CHECK_HEADERS(curses.h ncurses.h ncurses/ncurses.h gnuregex.h regex.h float.h sys/errno.h errno.h sys/ioctl.h dirent.h sys/wait.h termios.h sys/mman.h) AC_CHECK_HEADERS(curses.h ncurses.h ncurses/ncurses.h gnuregex.h regex.h float.h sys/errno.h errno.h sys/ioctl.h dirent.h sys/wait.h termios.h sys/mman.h re2/re 2.h)
AC_CHECK_HEADER(magic.h,HAVE_MAGIC_H=1) AC_CHECK_LIB(magic, magic_buffer, AC_SUBST(HAVE_MAGIC_H,1))
if test .$HAVE_MAGIC_H = .1
then #AC_CHECK_HEADER(magic.h,HAVE_MAGIC_H=1)
AC_SUBST(HAVE_MAGIC_H) #if test .$HAVE_MAGIC_H = .1
AC_DEFINE(HAVE_MAGIC_H) # then
fi # AC_SUBST(HAVE_MAGIC_H)
# AC_DEFINE(HAVE_MAGIC_H)
# fi
AC_CHECK_LIB($CURSESLIB,assume_default_colors,true,AC_DEFINE(NODEFAULTCOLORS)) AC_CHECK_LIB($CURSESLIB,assume_default_colors,true,AC_DEFINE(NODEFAULTCOLORS))
AC_CHECK_LIB($CURSESLIB,delscreen,AC_DEFINE(HASDELSCREEN),) AC_CHECK_LIB($CURSESLIB,delscreen,AC_DEFINE(HASDELSCREEN),)
AC_CHECK_LIB($CURSESLIB,wresize,AC_DEFINE(HAS_WRESIZE),) AC_CHECK_LIB($CURSESLIB,wresize,AC_DEFINE(HAS_WRESIZE),)
AC_EGREP_HEADER(tigetstr,$CURSESLIB.h,HAS_TIGETSTR_HEADER=1,unset HAS_TIGETSTR_H EADER) AC_EGREP_HEADER(tigetstr,$CURSESLIB.h,HAS_TIGETSTR_HEADER=1,unset HAS_TIGETSTR_H EADER)
AC_CHECK_LIB($CURSESLIB,tigetstr,[ AC_CHECK_LIB($CURSESLIB,tigetstr,[
if test $HAS_TIGETSTR_HEADER if test $HAS_TIGETSTR_HEADER
then then
echo HAS_TIGETSTR_HEADER and HAS_TIGETSTR echo HAS_TIGETSTR_HEADER and HAS_TIGETSTR
AC_DEFINE(HAS_TIGETSTR) AC_DEFINE(HAS_TIGETSTR)
skipping to change at line 223 skipping to change at line 226
x+=timezone; x+=timezone;
} }
,echo yes;AC_DEFINE(NOTIMEZONE),echo no) ,echo yes;AC_DEFINE(NOTIMEZONE),echo no)
fi fi
AC_LANG(C++) AC_LANG(C++)
AC_CHECK_LIB(c,strptime,,AC_DEFINE(OWNTRANSTIME)) AC_CHECK_LIB(c,strptime,,AC_DEFINE(OWNTRANSTIME))
#AC_COMPILE_IFELSE( #define _XOPEN_SOURCE #include <time.h> int main(void) { s truct tm uit; char formal[100]; strptime(formal,"%a %b %e %H:%M:%S " , &uit); r eturn 0; } ,,AC_DEFINE(OWNTRANSTIME)) #AC_COMPILE_IFELSE( #define _XOPEN_SOURCE #include <time.h> int main(void) { s truct tm uit; char formal[100]; strptime(formal,"%a %b %e %H:%M:%S " , &uit); r eturn 0; } ,,AC_DEFINE(OWNTRANSTIME))
AC_SEARCH_LIBS(clock_gettime,rt,AC_DEFINE(HAVE_CLOCK_GETTIME))
LIBS=$OLDLIBS LIBS=$OLDLIBS
AC_SEARCH_LIBS(xre_search_2,iberty,HAS_RE_SEARCH=y,HAS_RE_SEARCH=n) AC_SEARCH_LIBS(xre_search_2,iberty,HAS_RE_SEARCH=y,HAS_RE_SEARCH=n)
#AC_SEARCH_LIBS(re_search_2,gnuregex,HAS_RE_SEARCH=y,HAS_RE_SEARCH=n) #AC_SEARCH_LIBS(re_search_2,gnuregex,HAS_RE_SEARCH=y,HAS_RE_SEARCH=n)
if test $HAS_RE_SEARCH = n if test $HAS_RE_SEARCH = n
then then
if test -d regex-0.13 if test -d regex-0.13
then then
AC_CONFIG_SUBDIRS([regex-0.13]) AC_CONFIG_SUBDIRS([regex-0.13])
fi fi
fi fi
OLDLIBS=$LIBS OLDLIBS=$LIBS
LIBS="" LIBS=""
AC_SEARCH_LIBS(hs_scan_stream ,hs , USE_HYPERSCAN=1 ) AC_SEARCH_LIBS(hs_scan_stream ,hs , USE_HYPERSCAN=1 )
LIBHS=$LIBS LIBHS=$LIBS
AC_CHECK_HEADER(re2/re2.h,USE_RE2=1 ) #AC_CHECK_HEADER(re2/re2.h,USE_RE2=1 )
LIBS="" LIBS=""
AC_SEARCH_LIBS(_ZN3re23RE213PartialMatchNERKNS_11StringPieceERKS0_PKPKNS0_3ArgEi ,re2 , USE_RE2=1 ) AC_SEARCH_LIBS(_ZN3re23RE213PartialMatchNERKNS_11StringPieceERKS0_PKPKNS0_3ArgEi ,re2 , HAVE_RE2_RE2_H=1 )
LIBRE2=$LIBS LIBRE2=$LIBS
LIBS="" LIBS=""
AC_SEARCH_LIBS(pthread_create,pthread c_r,CONFIG_THREADS=y,CONFIG_THREADS=n) AC_SEARCH_LIBS(pthread_create,pthread c_r,CONFIG_THREADS=y,CONFIG_THREADS=n)
echo CONFIG_THREADS=$CONFIG_THREADS echo CONFIG_THREADS=$CONFIG_THREADS
if test $CONFIG_THREADS = y if test $CONFIG_THREADS = y
then then
AC_TRY_COMPILE( AC_TRY_COMPILE(
#include <pthread.h> #include <pthread.h>
, { , {
pthread_mutexattr_t mut; pthread_mutexattr_t mut;
skipping to change at line 347 skipping to change at line 352
fi fi
rm -f conftest rm -f conftest
fi fi
#if test .$SYSTEM = .Linux #if test .$SYSTEM = .Linux
#then #then
# AC_DEFINE(PROCARRAY) # AC_DEFINE(PROCARRAY)
#fi #fi
# AC_DEFINE(NOSTOPANDTHREADS) # AC_DEFINE(NOSTOPANDTHREADS)
AC_PROG_LN_S AC_PROG_LN_S
if $LN_S -fr $0 conftest
then
rm conftest
AC_SUBST(HAVE_LN_R,y)
else
AC_SUBST(HAVE_LN_R,n)
fi
AC_PATH_XTRA AC_PATH_XTRA
echo nox: $no_x echo nox: $no_x
if test .$no_x = .yes if test .$no_x = .yes
then then
HAS_X=n HAS_X=n
else else
HAS_X=y HAS_X=y
fi fi
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
skipping to change at line 404 skipping to change at line 416
then then
AC_DEFINE(HAS_SETNEWHANDLER) AC_DEFINE(HAS_SETNEWHANDLER)
echo yes echo yes
else else
echo no echo no
fi fi
rm conftest.cc conftest rm conftest.cc conftest
# Don't use c++14 because of "warning: taking sizeof array of runtime bound [-Wv la]" # Don't use c++14 because of "warning: taking sizeof array of runtime bound [-Wv la]"
# and sizeof returns 1 # and sizeof returns 1
for GXXVERSION in c++17 c++1z gnu++1z gnu++14 gnu++1y c++11 for GXXVERSION in c++20 c++2a c++17 c++1z gnu++1z c++14 c++1y gnu++14 gnu++1y c+ +11
do do
if $CXX -std=$GXXVERSION -x c++ - <<! echo -n "$GXXVERSION: "
int main(void) {} if test -z "`$CXX -std=$GXXVERSION -x c++ - 2>&1 <<!
int main(void) {
int x=20;
char buf[[x]];
return sizeof(buf);
}
! !
`"
then then
break break
fi fi
done done
echo take $GXXVERSION echo take $GXXVERSION
AC_CHECK_HEADER(features.h,,echo fea;EXTRAFLAGS="$EXTRAFLAGS -I\$(BEDSRCDIR)/uti ls") AC_CHECK_HEADER(features.h,,echo fea;EXTRAFLAGS="$EXTRAFLAGS -I\$(BEDSRCDIR)/uti ls")
AC_CHECK_HEADER(alloca.h,,echo allo;EXTRAFLAGS="$EXTRAFLAGS -I\$(BEDSRCDIR)/x11" ) AC_CHECK_HEADER(alloca.h,,echo allo;EXTRAFLAGS="$EXTRAFLAGS -I\$(BEDSRCDIR)/x11" )
HOSTCONF="conf-$host_alias.h" HOSTCONF="conf-$host_alias.h"
skipping to change at line 461 skipping to change at line 479
AC_SUBST(CONFIG_XBED) AC_SUBST(CONFIG_XBED)
AC_SUBST(RXVT) AC_SUBST(RXVT)
AC_SUBST(NRXVT) AC_SUBST(NRXVT)
AC_SUBST(CONFIG_PROGMAN) AC_SUBST(CONFIG_PROGMAN)
AC_SUBST(HAS_RE_SEARCH) AC_SUBST(HAS_RE_SEARCH)
AC_SUBST(CONFIG_PLUGIN) AC_SUBST(CONFIG_PLUGIN)
AC_SUBST(CONFIG_THREADS) AC_SUBST(CONFIG_THREADS)
AC_SUBST(USE_HYPERSCAN) AC_SUBST(USE_HYPERSCAN)
AC_SUBST(LIBHS) AC_SUBST(LIBHS)
AC_SUBST(LIBRE2) AC_SUBST(LIBRE2)
AC_SUBST(USE_RE2) AC_SUBST(USE_RE2,$HAVE_RE2_RE2_H)
AC_SUBST(CONFIG_LARGEFILES) AC_SUBST(CONFIG_LARGEFILES)
AC_SUBST(CONFIG_COLOR) AC_SUBST(CONFIG_COLOR)
AC_SUBST(DYNAMICCURSES) AC_SUBST(DYNAMICCURSES)
AC_SUBST(STATICCURSES) AC_SUBST(STATICCURSES)
AC_SUBST(CURSESLIB) AC_SUBST(CURSESLIB)
AC_SUBST(EXTRALIBS) AC_SUBST(EXTRALIBS)
AC_SUBST(VERSION) #AC_SUBST(VERSION)
AC_SUBST(LOWVERSION) #AC_SUBST(LOWVERSION)
AC_SUBST(MIDVERSION) #AC_SUBST(MIDVERSION)
AC_SUBST(UPVERSION) #AC_SUBST(UPVERSION)
AC_SUBST(PROGRAMC)
AC_SUBST(PROGRAMLD)
AC_SUBST(CXX)
AC_SUBST(CC) AC_SUBST(CC)
AC_SUBST(CXX) AC_SUBST(CXX)
AC_SUBST(LIBS) AC_SUBST(LIBS)
AC_SUBST(DLLIBS) AC_SUBST(DLLIBS)
AC_SUBST(THREADSLIB) AC_SUBST(THREADSLIB)
AC_SUBST(EXTRAFLAGS) AC_SUBST(EXTRAFLAGS)
AC_SUBST(CYGWIN) AC_SUBST(CYGWIN)
AC_SUBST(GNUSTRIP) AC_SUBST(GNUSTRIP)
AC_SUBST(CYGWINDLL) AC_SUBST(CYGWINDLL)
AC_SUBST(PDCURSES) AC_SUBST(PDCURSES)
AC_SUBST(CONFIG_LINKINPLUGINS) AC_SUBST(CONFIG_LINKINPLUGINS)
AC_SUBST(MAN2HTML) AC_SUBST(MAN2HTML)
AC_OUTPUT(config pkg/Makefile man2html/Makefile) AC_OUTPUT(config pkg/Makefile man2html/Makefile)
./buildinfo/configure ./buildinfo/configure
echo $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS hosttest.cc -o hosttest echo $CXX $PROGRAMC $CPPFLAGS $CXXFLAGS $PROGRAMLD $LDFLAGS hosttest.cc revers
$CXX $CPPFLAGS $CXXFLAGS $LDFLAGS hosttest.cc reversetime.cc -o hosttest etime.cc -o hosttest
$CXX $PROGRAMC $CPPFLAGS $CXXFLAGS $PROGRAMLD $LDFLAGS hosttest.cc reversetime
.cc -o hosttest
if test .$cross_compiling != .no if test .$cross_compiling != .no
then then
echo "****Cross Compiling: certain information about future host of bed not know n. Run ./hosttest on the host to get this information. ****" echo "****Cross Compiling: certain information about future host of bed not know n. Run ./hosttest on the host to get this information. ****"
echo "****information will be saved in $HOSTCONF ****" echo "****information will be saved in $HOSTCONF ****"
echo "****put the generated file $HOSTCONF in directory ./src ****" echo "****put the generated file $HOSTCONF in directory ./src ****"
else else
cd src;../hosttest cd src;../hosttest
fi fi
 End of changes. 14 change blocks. 
21 lines changed or deleted 43 lines changed or added

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