Skip to content

Commit 912f341

Browse files
author
Sebastiano Merlino
committed
Removed wrappers
1 parent aeb66c6 commit 912f341

File tree

12 files changed

+4
-830
lines changed

12 files changed

+4
-830
lines changed

‎Makefile.am‎

Lines changed: 4 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -24,57 +24,16 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
2424
AUTOMAKE_OPTIONS = foreign 1.4
2525
ACLOCAL_AMFLAGS = -I m4
2626

27-
SUBDIRS = src test $(PYTHON_DIR) $(JAVA_DIR) $(PHP_DIR) $(LUA_DIR) $(PERL_DIR) $(RUBY_DIR) $(GUILE_DIR)
28-
DIST_SUBDIRS = src test $(PYTHON_DIST_DIR) $(JAVA_DIST_DIR) $(PHP_DIST_DIR) $(LUA_DIST_DIR) $(PERL_DIST_DIR) $(RUBY_DIST_DIR) $(GUILE_DIST_DIR)
29-
EXTRA_DIST = libhttpserver.pc.in debian/changelog.in debian/control.in debian/copyright.in debian/rules.in debian/libhttpserver-dev.install.in debian/libhttpserver.install.in redhat/libhttpserver.SPEC.in $(DX_CONFIG) $(PYTHON_EXTRA) $(PHP_EXTRA) $(PERL_EXTRA)
27+
SUBDIRS = src test
28+
DIST_SUBDIRS = src test
29+
EXTRA_DIST = libhttpserver.pc.in debian/changelog.in debian/control.in debian/copyright.in debian/rules.in debian/libhttpserver-dev.install.in debian/libhttpserver.install.in redhat/libhttpserver.SPEC.in $(DX_CONFIG)
3030

31-
JAVACLEANFILES = $(top_srcdir)/src/java/*.java $(top_srcdir)/src/java/webserver_wrap.*
32-
PYTHONCLEANFILES = $(top_srcdir)/src/python/*.py $(top_srcdir)/src/python/webserver_wrap.*
33-
34-
MOSTLYCLEANFILES = $(DX_CLEANFILES) redhat/SOURCES/* $(JAVACLEANFILES) $(PYTHONCLEANFILES)
31+
MOSTLYCLEANFILES = $(DX_CLEANFILES) redhat/SOURCES/*
3532
DISTCLEANFILES = redhat/SOURCES/* redhat/SPEC/* redhat/RPMS/* redhat/SRPMS/* redhat/* debian/* DIST_REVISION
3633

3734
pkgconfigdir = $(libdir)/pkgconfig
3835
pkgconfig_DATA = libhttpserver.pc
3936

40-
PYTHON_DIST_DIR = src/python
41-
if PYTHON
42-
PYTHON_DIR = $(PYTHON_DIST_DIR)
43-
PYTHON_EXTRA = src/python/libhttpserver_python.py
44-
endif
45-
46-
JAVA_DIST_DIR = src/java
47-
if JAVA
48-
JAVA_DIR = $(JAVA_DIST_DIR)
49-
endif
50-
51-
PHP_DIST_DIR = src/php
52-
if PHP
53-
PHP_DIR = $(PHP_DIST_DIR)
54-
PHP_EXTRA = src/php/libhttpserver_php.php
55-
endif
56-
57-
LUA_DIST_DIR = src/lua
58-
if LUA
59-
LUA_DIR = $(LUA_DIST_DIR)
60-
endif
61-
62-
PERL_DIST_DIR = src/perl
63-
if PERL
64-
PERL_DIR = $(PERL_DIST_DIR)
65-
PERL_EXTRA = src/php/libhttpserver_perl.pm
66-
endif
67-
68-
RUBY_DIST_DIR = src/ruby
69-
if RUBY
70-
RUBY_DIR = $(RUBY_DIST_DIR)
71-
endif
72-
73-
GUILE_DIST_DIR = src/guile
74-
if GUILE
75-
GUILE_DIR = $(GUILE_DIST_DIR)
76-
endif
77-
7837
include $(top_srcdir)/aminclude.am
7938

8039
# Update libtool, if needed.

‎configure.ac‎

Lines changed: 0 additions & 261 deletions
Original file line numberDiff line numberDiff line change
@@ -88,54 +88,6 @@ AC_TYPE_UINT64_T
8888

8989
LHT_LIBDEPS="-lmicrohttpd"
9090

91-
AC_ARG_WITH([python],
92-
[ --with-python Compile PYTHON libraries],
93-
[python=true; swig=true])
94-
95-
AC_ARG_WITH([php],
96-
[ --with-php Compile PHP libraries],
97-
[php=true; swig=true])
98-
99-
AC_ARG_WITH([ruby],
100-
[ --with-ruby Compile RUBY libraries],
101-
[ruby=true; swig=true])
102-
103-
AC_ARG_WITH([perl],
104-
[ --with-perl Compile PERL libraries],
105-
[perl=true; swig=true])
106-
107-
AC_ARG_WITH([lua],
108-
[ --with-lua Compile LUA libraries],
109-
[lua=true; swig=true])
110-
111-
AC_ARG_WITH(lua-include-dir,
112-
[ --with-lua-include-dir=DIR where to look for lua headers],
113-
[
114-
luahead=""
115-
if test -d "$withval"
116-
then
117-
luahead="$withval"
118-
fi
119-
])
120-
121-
AC_ARG_WITH([java],
122-
[ --with-java Compile JAVA libraries],
123-
[java=true; swig=true])
124-
125-
AC_ARG_WITH(java-dir,
126-
[ --with-java-dir=DIR where to look for jni headers and libs. We search for jni.h in 'java-dir/include/'],
127-
[
128-
javaloc=""
129-
if test -d "$withval"
130-
then
131-
javaloc="$withval"
132-
fi
133-
])
134-
135-
AC_ARG_WITH([guile],
136-
[ --with-guile Compile GUILE libraries],
137-
[guile=true; swig=true])
138-
13991
AC_MSG_CHECKING([whether to build with debug information])
14092
AC_ARG_ENABLE([debug],
14193
[AS_HELP_STRING([--enable-debug],
@@ -172,18 +124,6 @@ else
172124
AC_DEFINE([NCPP0X],[],[standard Mode])
173125
fi
174126

175-
AM_CONDITIONAL([PYTHON], [test x$python = xtrue])
176-
AM_CONDITIONAL([JAVA], [test x$java = xtrue])
177-
AM_CONDITIONAL([PHP], [test x$php = xtrue])
178-
AM_CONDITIONAL([PERL], [test x$perl = xtrue])
179-
AM_CONDITIONAL([LUA], [test x$lua = xtrue])
180-
AM_CONDITIONAL([RUBY], [test x$ruby = xtrue])
181-
AM_CONDITIONAL([GUILE], [test x$guile = xtrue])
182-
AM_CONDITIONAL([DOC], [test x$doc = xtrue])
183-
184-
LANGUAGES="C++"
185-
OUTPUT_LANG=""
186-
187127
DX_HTML_FEATURE(ON)
188128
DX_CHM_FEATURE(OFF)
189129
DX_CHI_FEATURE(OFF)
@@ -194,199 +134,6 @@ DX_PDF_FEATURE(OFF)
194134
DX_PS_FEATURE(OFF)
195135
DX_INIT_DOXYGEN([$PACKAGE_NAME],[doxyconfig.in])
196136

197-
if test x$swig = xtrue; then
198-
AC_CHECK_PROG([SWIG], [swig], ["yes"], ["no"])
199-
if test "SWIG" = "no"
200-
then
201-
AC_MSG_ERROR(swig not found)
202-
fi
203-
fi
204-
205-
if test x$python = xtrue; then
206-
AC_CHECK_PROG([PYTHONCONFIG],[python-config],["yes"], ["no"])
207-
if test "$PYTHONCONFIG" = "no"
208-
then
209-
AC_MSG_ERROR(python-config not found)
210-
fi
211-
AC_CHECK_PROG([PYTHONINT],[python],["yes"], ["no"])
212-
if test "$PYTHONINT" = "no"
213-
then
214-
AC_MSG_ERROR(python interpreter not found)
215-
fi
216-
217-
AM_PATH_PYTHON()
218-
if test -n "$PYTHON" ; then
219-
AC_MSG_CHECKING([$PYTHON include dir])
220-
if $PYTHON -c 'import distutils.sysconfig' 2>/dev/null ; then
221-
PYTHON_INC=`$PYTHON -c 'import os,distutils.sysconfig;print(distutils.sysconfig.get_python_inc().replace(os.sep,"/"))'`
222-
AC_SUBST(PYTHON_INC)
223-
else
224-
if test yes = "$with_python" ; then
225-
AC_MSG_ERROR([Could not import Python module distutils.sysconfig - you probably need to install a python-dev or python-devel package])
226-
else
227-
AC_MSG_WARN([Couldn not import Python module distutils.sysconfig - you probably do not have a python-dev or python-devel package installed])
228-
fi
229-
fi
230-
AC_MSG_RESULT([$PYTHON_INC])
231-
AC_MSG_CHECKING([for directory to install python wrapper in])
232-
if test -z "$PYTHON_LIB" ; then
233-
PYTHON_LIB=`$PYTHON -c 'import os,distutils.sysconfig;print(distutils.sysconfig.get_python_lib(1).replace(os.sep,"/"))'`
234-
fi
235-
AC_MSG_RESULT([$PYTHON_LIB])
236-
AC_ARG_VAR(PYTHON_LIB, [Directory to install python wrapper in])
237-
238-
AC_MSG_CHECKING([for python libraries to link against])
239-
PYTHON_LIBS=`$PYTHON -c 'import os,sys;print("-L"+os.path.join(sys.path[[3]],"config")+" -lpython"+sys.version[[:3]])'`
240-
AC_SUBST(PYTHON_LIBS)
241-
AC_MSG_RESULT([$PYTHON_LIBS])
242-
fi
243-
PYINCLUDES="`python-config --includes`"
244-
PYDEFINES="-DWITHPYTHON"
245-
PYLDFLAGS="$LDFLAGS -L`python-config --prefix`/lib"
246-
PYLIBS="$LIBS `python-config --libs`"
247-
AC_SUBST(PYINCLUDES)
248-
AC_SUBST(PYDEFINES)
249-
AC_SUBST(PYLDFLAGS)
250-
AC_SUBST(PYLIBS)
251-
AC_SUBST_FILE([PYTHON_AUTOGENERATION])
252-
LANGUAGES="$LANGUAGES Python"
253-
OUTPUT_LANG="$OUTPUT_LANG src/python/Makefile"
254-
fi
255-
PYTHON_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
256-
257-
if test x$java = xtrue; then
258-
JAVAINCLUDES=""
259-
JAVALDFLAGS="$LDFLAGS"
260-
JAVALIBS="$LIBS"
261-
found=""
262-
for loc in $javaloc /usr /usr/local
263-
do
264-
265-
if test "x$found" = "x"
266-
then
267-
AC_MSG_CHECKING([for jni in])
268-
AC_MSG_RESULT($loc)
269-
AC_CHECK_FILE("$loc/include/jni.h",
270-
[JAVAINCLUDES="$CXXFLAGS -I$loc/include -I$loc/include/linux"; found=1],[])
271-
272-
fi
273-
274-
done
275-
if test "x$found" = "x"
276-
then
277-
AC_MSG_ERROR([Unable to find jni headers. Please provide a --with-java-dir=<dir> location])
278-
fi
279-
AC_SUBST(JAVAINCLUDES)
280-
AC_SUBST(JAVALDFLAGS)
281-
AC_SUBST(JABALIBS)
282-
AC_SUBST_FILE([JAVA_AUTOGENERATION])
283-
LANGUAGES="$LANGUAGES Java"
284-
OUTPUT_LANG="$OUTPUT_LANG src/java/Makefile"
285-
fi
286-
JAVA_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
287-
288-
if test x$php = xtrue; then
289-
AC_CHECK_PROG([PHPCONFIG],[php-config],["yes"], ["no"])
290-
if test "$PHPCONFIG" = "no"
291-
then
292-
AC_MSG_ERROR(php-config not found)
293-
fi
294-
PHPINCLUDES="`php-config --includes`"
295-
PHPLDFLAGS="$LDFLAGS -L`php-config --prefix`/lib"
296-
AC_SUBST(PHPINCLUDES)
297-
AC_SUBST(PHPLDFLAGS)
298-
AC_SUBST_FILE([PHP_AUTOGENERATION])
299-
LANGUAGES="$LANGUAGES PHP"
300-
OUTPUT_LANG="$OUTPUT_LANG src/php/Makefile"
301-
fi
302-
PHP_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
303-
304-
if test x$lua = xtrue; then
305-
LUAINCLUDES=""
306-
found=""
307-
for loc in $luahead /usr/include /usr/local/include
308-
do
309-
310-
if test "x$found" = "x"
311-
then
312-
AC_MSG_CHECKING([for lua.h in])
313-
AC_MSG_RESULT($loc)
314-
AC_CHECK_FILE("$loc/lua.h",
315-
[LUAINCLUDES="$LUACXXFLAGS -I$loc";
316-
found=1],[])
317-
318-
fi
319-
done
320-
if test "x$found" = "x"
321-
then
322-
AC_MSG_ERROR([Unable to find lua headers. Please provide a --with-lua-include-dir=<dir> location])
323-
fi
324-
AC_SUBST(LUAINCLUDES)
325-
AC_SUBST_FILE([LUA_AUTOGENERATION])
326-
LANGUAGES="$LANGUAGES LUA"
327-
OUTPUT_LANG="$OUTPUT_LANG src/lua/Makefile"
328-
fi
329-
LUA_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
330-
331-
if test x$perl = xtrue; then
332-
AC_CHECK_PROG([PERLINT],[perl],["yes"], ["no"])
333-
if test "$PERLINT" = "no"
334-
then
335-
AC_MSG_ERROR(perl interpreter not found)
336-
fi
337-
PERLINCLUDES="$PERLINCLUDES -I`perl -e 'use Config; print $Config{archlib};'`/CORE"
338-
PERLDEFINES="-D_GNU_SOURCE"
339-
AC_SUBST(PERLINCLUDES)
340-
AC_SUBST(PERLDEFINES)
341-
AC_SUBST_FILE([PERL_AUTOGENERATION])
342-
LANGUAGES="$LANGUAGES Perl"
343-
OUTPUT_LANG="$OUTPUT_LANG src/perl/Makefile"
344-
fi
345-
PERL_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
346-
347-
if test x$ruby = xtrue; then
348-
AC_CHECK_PROG([RUBYINT],[ruby],["yes"], ["no"])
349-
RUBYINCLUDES=""
350-
if test "$RUBYINT" = "no"
351-
then
352-
AC_MSG_ERROR(ruby interpreter not found)
353-
fi
354-
found=""
355-
for loc in `ruby -e 'puts $:.join(" ")'`
356-
do
357-
358-
if test "x$found" = "x"
359-
then
360-
AC_MSG_CHECKING([for ruby.h in])
361-
AC_MSG_RESULT($loc)
362-
AC_CHECK_FILE("$loc/ruby.h", [RUBYINCLUDES="$RUBYINCLUDES -I$loc";found=1],[])
363-
fi
364-
done
365-
if test "x$found" = "x"
366-
then
367-
AC_MSG_ERROR([Unable to find ruby headers.])
368-
fi
369-
RUBYDEFINES="-fno-strict-aliasing -D_FILE_OFFSET_BITS=64"
370-
AC_SUBST(RUBYINCLUDES)
371-
AC_SUBST(RUBYDEFINES)
372-
AC_SUBST_FILE([RUBY_AUTOGENERATION])
373-
LANGUAGES="$LANGUAGES Ruby"
374-
OUTPUT_LANG="$OUTPUT_LANG src/ruby/Makefile"
375-
fi
376-
RUBY_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
377-
378-
if test x$guile = xtrue; then
379-
AC_CHECK_PROG([GUILEINT],[guile],["yes"], ["no"])
380-
if test "$GUILEINT" = "no"
381-
then
382-
AC_MSG_ERROR(guile interpreter not found)
383-
fi
384-
AC_SUBST_FILE([GUILE_AUTOGENERATION])
385-
LANGUAGES="$LANGUAGES Guile"
386-
OUTPUT_LANG="$OUTPUT_LANG src/guile/Makefile"
387-
fi
388-
GUILE_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
389-
390137
LDFLAGS="$LDFLAGS -version-number libhttpserver_LDF_VERSION"
391138

392139
AC_SUBST(LHT_LIBDEPS)
@@ -401,13 +148,6 @@ AC_OUTPUT(
401148
libhttpserver.pc
402149
Makefile
403150
src/Makefile
404-
src/python/Makefile
405-
src/java/Makefile
406-
src/php/Makefile
407-
src/lua/Makefile
408-
src/perl/Makefile
409-
src/ruby/Makefile
410-
src/guile/Makefile
411151
test/Makefile
412152
debian/changelog
413153
debian/copyright
@@ -422,7 +162,6 @@ AC_MSG_NOTICE([Configuration Summary:
422162
Operating System: ${host_os}
423163
Target directory: ${prefix}
424164
License : LGPL only
425-
Languages : ${LANGUAGES}
426165
Debug : ${debugit}
427166
TLS Enabled : ${have_gnutls}
428167
C++0x : ${cpp0x}

‎src/autogen_helpers/support_command‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)