]>
Commit | Line | Data |
---|---|---|
446a640e AF |
1 | --- beecrypt-3.0.0pre/python/Makefile.am.wiget 2003-06-11 01:05:29.000000000 +0200 |
2 | +++ beecrypt-3.0.0pre/python/Makefile.am 2003-06-11 01:07:13.000000000 +0200 | |
3 | @@ -24,18 +24,11 @@ | |
4 | LDADD = | |
5 | ||
6 | pythondir = $(pylibdir)/site-packages | |
7 | -python_PROGRAMS = _bc.so | |
8 | ||
9 | -_bc_so_SOURCES = | |
10 | -_bc_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,_bc.so | |
11 | +python_LTLIBRARIES = _bc.la | |
12 | +_bc_la_LDFLAGS = $(mylibs) $(LIBS) -avoid-version -module | |
13 | +_bc_la_SOURCES = _bc-py.c mpw-py.c rng-py.c | |
14 | ||
15 | -noinst_LTLIBRARIES = libbc.la | |
16 | -libbc_la_SOURCES = _bc-py.c mpw-py.c rng-py.c | |
17 | - | |
18 | -_bc.so$(EXEEXT): $(libbc_la_OBJECTS) | |
05e5457c | 19 | - $(LINK) -o $@ $(libbc_la_OBJECTS) $(_bc_so_LDFLAGS) |
446a640e AF |
20 | - |
21 | -splint_srcs = _bc-py.c $(libbc_la_sources) | |
22 | ||
23 | .PHONY: lint | |
24 | lint: | |
3e7032a4 | 25 | --- beecrypt-3.0.0/python/Makefile.am.orig 2003-06-29 15:10:28.000000000 +0200 |
26 | +++ beecrypt-3.0.0/python/Makefile.am 2003-06-29 15:12:10.000000000 +0200 | |
27 | @@ -4,11 +4,11 @@ | |
28 | ||
29 | LINT = splint | |
30 | ||
31 | -PYVER= 2.2 | |
32 | - | |
33 | +PYVER= @WITH_PYTHON_VERSION@ | |
34 | + | |
35 | SUBDIRS = test | |
36 | ||
37 | -pylibdir = $(shell python -c 'import sys; print sys.path[1]') | |
38 | +pylibdir = $(prefix)/lib/python${PYVER} | |
39 | pyincdir = $(prefix)/include/python${PYVER} | |
40 | ||
41 | EXTRA_DIST = debug-py.c | |
42 | --- beecrypt-3.0.0/python/test/Makefile.am.orig 2003-06-29 15:12:33.000000000 +0200 | |
43 | +++ beecrypt-3.0.0/python/test/Makefile.am 2003-06-29 15:13:45.000000000 +0200 | |
44 | @@ -2,9 +2,10 @@ | |
45 | ||
46 | AUTOMAKE_OPTIONS = 1.4 foreign | |
47 | ||
48 | -PYVER= 2.2 | |
49 | +PYVER= @WITH_PYTHON_VERSION@ | |
50 | ||
51 | -pylibdir = $(shell python -c 'import sys; print sys.path[1]') | |
52 | + | |
53 | +pylibdir = $(prefix)/lib/python${PYVER} | |
54 | VALGRIND = # valgrind --verbose --leak-check=yes | |
55 | ||
56 | EXTRA_DIST = \ | |
57 | --- beecrypt-3.0.0/configure.ac.orig 2003-06-29 15:32:40.000000000 +0200 | |
58 | +++ beecrypt-3.0.0/configure.ac 2003-06-29 15:32:47.000000000 +0200 | |
59 | @@ -174,13 +174,7 @@ | |
60 | fi | |
61 | ],[ac_with_java=no]) | |
62 | ||
63 | -AC_ARG_WITH(python,[ --with-python creates the python bindings code [default=no]],[ | |
64 | - if test "$withval" = no; then | |
65 | - ac_with_python=no | |
66 | - else | |
67 | - ac_with_python=yes | |
68 | - fi | |
69 | - ],[ac_with_python=no]) | |
70 | +AC_ARG_WITH(python,[ --with-python creates the python bindings code]) | |
71 | ||
72 | # Check for Unix variants | |
73 | AC_AIX | |
74 | @@ -561,6 +555,49 @@ | |
75 | AC_DEFINE([JAVAGLUE],1) | |
76 | fi | |
77 | ||
78 | +# CHECK for python | |
79 | +if test $withval = yes ; then | |
80 | +AC_MSG_CHECKING(for python 2.2) | |
81 | +AC_TRY_RUN([ | |
82 | +#include <python2.2/Python.h> | |
83 | +main() { | |
84 | + exit(strncmp("2.2", PY_VERSION, 3)); | |
85 | +} ], | |
86 | + withval=yes, withval=no, withval=yes) | |
87 | + AC_MSG_RESULT($withval) | |
88 | + if test $withval = yes ; then | |
89 | + WITH_PYTHON_VERSION="2.2" | |
90 | + else | |
91 | + | |
92 | + AC_MSG_CHECKING(for python 1.5.2) | |
93 | + AC_TRY_RUN([ | |
94 | +#include <python1.5/Python.h> | |
95 | +main() { | |
96 | + exit(strcmp("1.5.2", PY_VERSION)); | |
97 | +} ], | |
98 | + withval=yes, withval=no, withval=yes) | |
99 | + AC_MSG_RESULT($withval) | |
100 | + if test $withval = yes ; then | |
101 | + WITH_PYTHON_VERSION="1.5" | |
102 | + else | |
103 | + AC_MSG_CHECKING(for python 2.3) | |
104 | + AC_TRY_RUN([ | |
105 | + #include <python2.3/Python.h> | |
106 | + main() { | |
107 | + exit(strncmp("2.3", PY_VERSION, 3)); | |
108 | + } ], | |
109 | + withval=yes, withval=no, withval=yes) | |
110 | + AC_MSG_RESULT($withval) | |
111 | + if test $withval = yes ; then | |
112 | + WITH_PYTHON_VERSION="2.3" | |
113 | + fi | |
114 | + fi | |
115 | + fi | |
116 | +fi | |
117 | + | |
118 | + | |
119 | +AC_SUBST(WITH_PYTHON_VERSION) | |
120 | + | |
121 | # Checks for entropy sources. | |
122 | AS_MESSAGE(checking for specific entropy devices...) | |
123 | case $target_os in |