External/energymech
1
0
Fork 0
mirror of https://github.com/EnergyMech/energymech.git synced 2025-12-17 15:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'kroseneg-master'

Browse Source 
PR #2 branch 'kroseneg-master'
This commit is contained in:
MadCamel 2016-07-05 13:21:50 -04:00
commit 5c9210e82c
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
configure vendored
View File

@ -716,13 +716,34 @@ has_tcl=no
if [ ! "$ft_tcl" = no ]; then if [ ! "$ft_tcl" = no ]; then
echo $ac_n "checking for tcl ... "$ac_c echo $ac_n "checking for tcl ... "$ac_c
TESTC=config/tcl.c TESTC=config/tcl.c
tclconfig=
if [ -f /usr/lib/tclConfig.sh ]; then
tclconfig=tclconfig
. /usr/lib/tclConfig.sh
fi
libtcl= libtcl=
for tclver in empty 8.9 8.8 8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 inctcl=
for tclver in $tclconfig empty 8.9 8.8 8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0
do do
if [ -z "$libtcl" ]; then if [ -z "$libtcl" ]; then
test "$tclver" = "empty" && TCLLIB=-ltcl || TCLLIB=-ltcl$tclver case "$tclver" in
if $CC -o $TESTP $TESTC $TCLLIB 1> /dev/null 2> /dev/null; then "tclconfig")
TCLLIB=$TCL_LIB_FLAG
TCLINCLUDE=$TCL_INCLUDE_SPEC
tclver=$TCL_VERSION
;;
"empty")
TCLLIB=-ltcl
TCLINCLUDE=
;;
*)
TCLLIB=-ltcl$tclver
TCLINCLUDE=
;;
esac
if $CC -o $TESTP $TESTC $TCLLIB $TCLINCLUDE 1> /dev/null 2> /dev/null; then
libtcl=$TCLLIB libtcl=$TCLLIB
inctcl=$TCLINCLUDE
has_tcl=$TCLLIB has_tcl=$TCLLIB
test "$tclver" = "empty" && echo $ac_t "yes" || echo $ac_t "yes (version $tclver)" test "$tclver" = "empty" && echo $ac_t "yes" || echo $ac_t "yes (version $tclver)"
fi fi
@ -1027,7 +1048,10 @@ else
test -z "$ft_tcl" && read ans test -z "$ft_tcl" && read ans
test "$ans" = y -o "$ans" = Y -o "$ans" = yes -o "$ans" = YES -o "$ans" = Yes && def_tcl='#define TCL' test "$ans" = y -o "$ans" = Y -o "$ans" = yes -o "$ans" = YES -o "$ans" = Yes && def_tcl='#define TCL'
fi fi
test "$def_tcl" = '#undef TCL' && libtcl='' if [ "$def_tcl" = '#undef TCL' ]; then
libtcl=
inctcl=
fi
def_telnet='#undef TELNET' def_telnet='#undef TELNET'
unset ans unset ans
@ -1080,6 +1104,7 @@ s%@gdbflag@%$cc_g_flag%;
/@W_FLAGS@/ { s/@W_FLAGS@/$W_FLAGS/; }; /@W_FLAGS@/ { s/@W_FLAGS@/$W_FLAGS/; };
/@O_FLAGS@/ { s/@O_FLAGS@/$O_FLAGS/; }; /@O_FLAGS@/ { s/@O_FLAGS@/$O_FLAGS/; };
/@PYINCLUDE@/ { s,@PYINCLUDE@,$incpython,; }; /@PYINCLUDE@/ { s,@PYINCLUDE@,$incpython,; };
/@TCLINCLUDE@/ { s,@TCLINCLUDE@,$inctcl,; };
s|@MD5_O@|$MD5_O|; s|@MD5_O@|$MD5_O|;
s%@oc@%$objcomment%; s%@oc@%$objcomment%;
s%@sz@%$sizecomment%; s%@sz@%$sizecomment%;

7
src/Makefile.in
View File

@ -30,6 +30,7 @@ GDBFLAG = @gdbflag@
WARNFLAG = @W_FLAGS@ WARNFLAG = @W_FLAGS@
OPTIMIZE = @O_FLAGS@ OPTIMIZE = @O_FLAGS@
PYINCLUDE = @PYINCLUDE@ PYINCLUDE = @PYINCLUDE@
TCLINCLUDE = @TCLINCLUDE@
CFLAGS = $(PIPEFLAG) $(GDBFLAG) $(WARNFLAG) $(OPTIMIZE) CFLAGS = $(PIPEFLAG) $(GDBFLAG) $(WARNFLAG) $(OPTIMIZE)
LFLAGS = $(PIPEFLAG) $(GDBFLAG) LFLAGS = $(PIPEFLAG) $(GDBFLAG)
@ -74,7 +75,7 @@ $(INSTALLNAME): $(OFILES)
@sz@ size $(INSTALLNAME) @sz@ size $(INSTALLNAME)
mega: $(SRCFILES) $(INCS) usage.h mega: $(SRCFILES) $(INCS) usage.h
$(CROSS_COMPILE)$(CC) $(CFLAGS) -o $(INSTALLNAME) mega.c $(LPROF) $(LIBS) $(LDSCRIPT) $(PYINCLUDE) $(CROSS_COMPILE)$(CC) $(CFLAGS) -o $(INSTALLNAME) mega.c $(LPROF) $(LIBS) $(LDSCRIPT) $(PYINCLUDE) $(TCLINCLUDE)
@oc@ $(CROSS_COMPILE)objcopy -R .note -R .comment $(INSTALLNAME) @oc@ $(CROSS_COMPILE)objcopy -R .note -R .comment $(INSTALLNAME)
@sz@ size $(INSTALLNAME) @sz@ size $(INSTALLNAME)
@ -88,7 +89,7 @@ $(INSTALLNAME)-static: $(OFILES)
@sz@ size $(INSTALLNAME) @sz@ size $(INSTALLNAME)
mega-static: $(SRCFILES) $(INCS) usage.h mega-static: $(SRCFILES) $(INCS) usage.h
$(CROSS_COMPILE)$(CC) $(CFLAGS) -o $(INSTALLNAME) mega.c $(LPROF) $(LIBS) $(LDSCRIPT) $(PYINCLUDE) -static $(CROSS_COMPILE)$(CC) $(CFLAGS) -o $(INSTALLNAME) mega.c $(LPROF) $(LIBS) $(LDSCRIPT) $(PYINCLUDE) $(TCLINCLUDE) -static
@oc@ $(CROSS_COMPILE)objcopy -R .note -R .comment $(INSTALLNAME) @oc@ $(CROSS_COMPILE)objcopy -R .note -R .comment $(INSTALLNAME)
@sz@ size $(INSTALLNAME) @sz@ size $(INSTALLNAME)
@ -193,7 +194,7 @@ stats.o: stats.c $(INCS)
$(CROSS_COMPILE)$(CC) $(CFLAGS) -c $< $(CPROF) $(CROSS_COMPILE)$(CC) $(CFLAGS) -c $< $(CPROF)
tcl.o: tcl.c $(INCS) tcl.o: tcl.c $(INCS)
$(CROSS_COMPILE)$(CC) $(CFLAGS) -c $< $(CPROF) $(CROSS_COMPILE)$(CC) $(CFLAGS) -c $< $(CPROF) $(TCLINCLUDE)
telnet.o: telnet.c $(INCS) telnet.o: telnet.c $(INCS)
$(CROSS_COMPILE)$(CC) $(CFLAGS) -c $< $(CPROF) $(CROSS_COMPILE)$(CC) $(CFLAGS) -c $< $(CPROF)