Skip to content

Commit 7708199

Browse files
committed
Fixes to autotools for python detection
1 parent d001bcd commit 7708199

File tree

7 files changed

+228
-255
lines changed

7 files changed

+228
-255
lines changed

‎Makefile.in

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ CFLAGS=@CFLAGS@
44
LDFLAGS=@LDFLAGS@ @OPENSSL_LDFLAGS@
55
CPPFLAGS=@CPPFLAGS@ @OPENSSL_INCLUDES@
66
DEFS=@DEFS@
7-
COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Wextra -Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer -ggdb -Wno-unused-parameter -fPIC
8-
#TODO re-add -Werror
7+
COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Werror -Wextra -Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer -ggdb -Wno-unused-parameter -fPIC
98
EXTRA_LIBS=@LIBS@ @EXTRA_LIBS@ @OPENSSL_LIBS@
109
LOCAL_LDFLAGS=-rdynamic -ggdb -levent ${EXTRA_LIBS}
1110
LINK_FLAGS=${LDFLAGS} ${LOCAL_LDFLAGS}

‎autotools.sh

-1
This file was deleted.

‎ax_python.m4

+11-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
AC_DEFUN([AX_PYTHON],
5757
[AC_MSG_CHECKING(for python build information)
5858
AC_MSG_RESULT([])
59-
for python in python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
59+
for python in python3.4 python3.3 python3.2 python3.1 python2.7 python2.6 python3, python2, python; do
60+
6061
AC_CHECK_PROGS(PYTHON_BIN, [$python])
6162
ax_python_bin=$PYTHON_BIN
6263
if test x$ax_python_bin != x; then
@@ -87,12 +88,21 @@ AC_MSG_RESULT([ Binary: $ax_python_bin])
8788
AC_MSG_RESULT([ Library: $ax_python_lib])
8889
AC_MSG_RESULT([ Include Dir: $ax_python_header])
8990
91+
92+
PYTHON_FOUND=yes
9093
if test x$ax_python_header != xno; then
9194
PYTHON_INCLUDE_DIR=$ax_python_header
9295
AC_SUBST(PYTHON_INCLUDE_DIR)
96+
else
97+
PYTHON_FOUND=no
9398
fi
99+
94100
if test x$ax_python_lib != xno; then
95101
PYTHON_LIB=$ax_python_lib
96102
AC_SUBST(PYTHON_LIB)
103+
else
104+
PYTHON_FOUND=no
97105
fi
106+
AC_SUBST(PYTHON_FOUND)
107+
98108
])dnl

‎bootstrap

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#! /bin/sh
2+
3+
aclocal
4+
autoheader
5+
automake --gnu --add-missing
6+
autoconf

‎config.h.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,12 @@
164164
/* use lua */
165165
#undef USE_LUA
166166

167-
/* fixed for correct valgrind work */
168-
#undef VALGRIND_FIXES
169-
170167
/* use python */
171168
#undef USE_PYTHON
172169

170+
/* fixed for correct valgrind work */
171+
#undef VALGRIND_FIXES
172+
173173
/* Define to `int' if <sys/types.h> doesn't define. */
174174
#undef gid_t
175175

0 commit comments

Comments
 (0)