Skip to content

Commit 3c6b54c

Browse files
committed
Merging to remove bad branch
1 parent 5fcb825 commit 3c6b54c

5 files changed

Lines changed: 564 additions & 4 deletions

File tree

‎Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ DIR_LIST=${DEP} ${AUTO} ${EXE} ${OBJ} ${LIB} ${DEP}/auto ${OBJ}/auto
1919

2020
EXE_LIST=${EXE}/telegram-cli
2121

22-
TG_OBJECTS=${OBJ}/main.o ${OBJ}/loop.o ${OBJ}/interface.o ${OBJ}/lua-tg.o ${OBJ}/json-tg.o
22+
TG_OBJECTS=${OBJ}/main.o ${OBJ}/loop.o ${OBJ}/interface.o ${OBJ}/lua-tg.o ${OBJ}/json-tg.o ${OBJ}/python-tg.o
2323

2424
INCLUDE=-I. -I${srcdir} -I${srcdir}/tgl
2525
CC=@CC@

‎config.h.in‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,9 @@
167167
/* fixed for correct valgrind work */
168168
#undef VALGRIND_FIXES
169169

170+
/* use python */
171+
#undef USE_PYTHON
172+
170173
/* Define to `int' if <sys/types.h> doesn't define. */
171174
#undef gid_t
172175

0 commit comments

Comments
 (0)