Merge lp:~mordred/libcpuinfo/add-perl-support into lp:libcpuinfo

[Monty Taylor]

[Monty Taylor (mordred)]

Adds Perl, Lua and Python3 support. (ignore the branch name. these are not the droids you are looking for)

Unmerged revisions

13. By Monty Taylor on 2009-08-24

Added python3 swig support macro call.

12. By Monty Taylor on 2009-08-23

Added Lua support.

11. By Monty Taylor on 2009-08-23

Added python3 support

10. By Monty Taylor on 2009-08-23

Added support for Perl.
Use installed version of pandora-build and don't copy the files in.
Rearranged a few things.

=== renamed file 'AUTHORS.txt' => 'AUTHORS'
--- AUTHORS.txt	2009-06-14 10:25:20 +0000
+++ AUTHORS	2009-08-23 00:03:39 +0000
@@ -3,3 +3,5 @@
 
 Robert Collins, 2009
 Matthew Fuller, 2009
+Monty Taylor, 2009
+Stewart Smith, 2009
 
=== added file 'ChangeLog'
=== modified file 'Makefile.am'
--- Makefile.am	2009-07-14 07:51:56 +0000
+++ Makefile.am	2009-08-23 22:30:03 +0000
@@ -5,9 +5,10 @@
 # licence. Please see COPYING.txt distributed with the source code for
 # details.
 
-ACLOCAL_AMFLAGS = -I acinclude -I m4
+ACLOCAL_AMFLAGS = -I acinclude
 BUILT_SOURCES=
 CLEANFILES=
+DISTCLEANFILES=
 EXTRA_DIST = libcpuinfo.pc.in AUTHORS.txt COPYING.txt INSTALL.txt interface/cpuinfo.i
 
 ## install libcpuinfo.pc
@@ -38,41 +39,120 @@
 pyexec_LTLIBRARIES=
 python_PYTHON=
 if BUILD_PYTHON
-  BUILT_SOURCES += cpuinfo_python.c cpuinfo.py
-  EXTRA_DIST += cpuinfo_python.c cpuinfo.py
-  CLEANFILES += cpuinfo_python.c cpuinfo.py 
-  pyexec_LTLIBRARIES += pycpuinfo.la
-  python_PYTHON += cpuinfo.py
-
-  pycpuinfo_la_CPPFLAGS=  ${AM_CPPFLAGS} ${PYTHON_CPPFLAGS}
-  pycpuinfo_la_CFLAGS=
-  pycpuinfo_la_SOURCES= cpuinfo_python.c
-  pycpuinfo_la_LDFLAGS = -avoid-version -module ${PYTHON_LDFLAGS}
-  pycpuinfo_la_LIBADD= libcpuinfo.la
-endif
-
-cpuinfo.py: cpuinfo_python.c
-
-cpuinfo_python.c: interface/cpuinfo.i
-	${SWIG} -python -O -interface pycpuinfo -o $@ $<
-
+  BUILT_SOURCES += python/_cpuinfo.c python/cpuinfo.py python/_cpuinfo.so
+  EXTRA_DIST += python/_cpuinfo.c python/cpuinfo.py
+  DISTCLEANFILES += python/_cpuinfo.c python/cpuinfo.py 
+  pyexec_LTLIBRARIES += python/_cpuinfo.la
+  python_PYTHON += python/cpuinfo.py
+
+  python__cpuinfo_la_CPPFLAGS=  ${AM_CPPFLAGS} ${PYTHON_CPPFLAGS}
+  python__cpuinfo_la_CFLAGS=
+  python__cpuinfo_la_SOURCES= python/_cpuinfo.c
+  python__cpuinfo_la_LDFLAGS = -avoid-version -module -disable-static ${PYTHON_LDFLAGS}
+  python__cpuinfo_la_LIBADD= libcpuinfo.la
+endif
+
+python/_cpuinfo.so:
+	@rm -f python/_cpuinfo.so
+	@ln -s .libs/_cpuinfo.so python/_cpuinfo.so
+
+python/cpuinfo.py: python/_cpuinfo.c
+
+python/_cpuinfo.c: interface/cpuinfo.i
+	${SWIG} -python -O -outdir python -interface _cpuinfo -o $@ $<
+
+python3dir= ${PYTHON3_SITE_PKG}
+python3_LTLIBRARIES= 
+python3_DATA=
+if BUILD_PYTHON3
+  BUILT_SOURCES += python3/_cpuinfo.c python3/cpuinfo.py python3/_cpuinfo.so
+  EXTRA_DIST += python3/_cpuinfo.c python3/cpuinfo.py
+  DISTCLEANFILES += python3/_cpuinfo.c python3/cpuinfo.py 
+  python3_LTLIBRARIES += python3/_cpuinfo.la
+  python3_DATA += python3/cpuinfo.py
+
+  python3__cpuinfo_la_CPPFLAGS=  ${AM_CPPFLAGS} ${PYTHON3_CPPFLAGS}
+  python3__cpuinfo_la_CFLAGS=
+  python3__cpuinfo_la_SOURCES= python3/_cpuinfo.c
+  python3__cpuinfo_la_LDFLAGS = -avoid-version -module -disable-static ${PYTHON3_LDFLAGS}
+  python3__cpuinfo_la_LIBADD= libcpuinfo.la
+endif
+
+python3/_cpuinfo.so:
+	@rm -f python3/_cpuinfo.so
+	@ln -s .libs/_cpuinfo.so python3/_cpuinfo.so
+
+python3/cpuinfo.py: python3/_cpuinfo.c
+
+python3/_cpuinfo.c: interface/cpuinfo.i
+	${SWIG} -python -py3 -O -outdir python3 -interface _cpuinfo -o $@ $<
+
+luaarchdir=${LUA_ARCHDIR}
+luaarch_LTLIBRARIES=
+if BUILD_LUA
+  BUILT_SOURCES+= lua/cpuinfo.c lua/cpuinfo.so
+  EXTRA_DIST+= lua/cpuinfo.c
+  DISTCLEANFILES+= lua/cpuinfo.c
+  luaarch_LTLIBRARIES+= lua/cpuinfo.la
+
+  lua_cpuinfo_la_SOURCES= lua/cpuinfo.c
+  lua_cpuinfo_la_CFLAGS= ${LUA_CFLAGS}
+  lua_cpuinfo_la_LDFLAGS= -module -avoid-version -disable-static ${LUA_LDFLAGS}
+  lua_cpuinfo_la_LIBADD= libcpuinfo.la
+endif
+
+lua/cpuinfo.so:
+	@rm -f lua/cpuinfo.so
+	@ln -s .libs/cpuinfo.so lua/cpuinfo.so
+
+lua/cpuinfo.c: interface/cpuinfo.i
+	$(SWIG) -lua -o $@ $<
+
+perldir= ${PERL_ARCHDIR}/auto
+perlpmdir= ${PERL_ARCHDIR}
+perl_LTLIBRARIES= 
+if BUILD_PERL
+  BUILT_SOURCES += perl/cpuinfo.c perl/cpuinfo.pm perl/cpuinfo.so
+  EXTRA_DIST += perl/cpuinfo.c perl/cpuinfo.pm
+  DISTCLEANFILES += perl/cpuinfo.c perl/cpuinfo.pm
+  perl_LTLIBRARIES += perl/cpuinfo.la
+  perlpm_DATA = perl/cpuinfo.pm
+
+  perl_cpuinfo_la_CPPFLAGS= ${AM_CPPFLAGS} ${PERL_CPPFLAGS}
+  perl_cpuinfo_la_CFLAGS=
+  perl_cpuinfo_la_SOURCES= perl/cpuinfo.c
+  perl_cpuinfo_la_LDFLAGS= -avoid-version -module -disable-static
+  perl_cpuinfo_la_LIBADD= libcpuinfo.la
+endif
+
+# we need to symlink in to the libtool dir for local testing.
+perl/cpuinfo.so:
+	@rm -f perl/cpuinfo.so
+	@ln -s .libs/cpuinfo.so perl/cpuinfo.so
+
+perl/cpuinfo.c: interface/cpuinfo.i
+	${SWIG} -perl -o $@ $<
 
 rubydir= ${RUBY_DIR}
 ruby_LTLIBRARIES=
 if BUILD_RUBY
-  BUILT_SOURCES += cpuinfo_ruby.c
-  EXTRA_DIST += cpuinfo_ruby.c
-  CLEANFILES += cpuinfo_ruby.c
-  ruby_LTLIBRARIES += rubycpuinfo.la
+  BUILT_SOURCES += ruby/cpuinfo.c ruby/cpuinfo.so
+  EXTRA_DIST += ruby/cpuinfo.c
+  DISTCLEANFILES += ruby/cpuinfo.c
+  ruby_LTLIBRARIES += ruby/cpuinfo.la
   
-  rubycpuinfo_la_CPPFLAGS=  ${AM_CPPFLAGS} ${RUBY_INCLUDES}
-  rubycpuinfo_la_CFLAGS=
-  rubycpuinfo_la_SOURCES= cpuinfo_ruby.c
-  rubycpuinfo_la_LDFLAGS = -avoid-version -module ${RUBY_LDFLAGS}
-  rubycpuinfo_la_LIBADD= libcpuinfo.la
+  ruby_cpuinfo_la_CPPFLAGS=  ${AM_CPPFLAGS} ${RUBY_INCLUDES}
+  ruby_cpuinfo_la_CFLAGS=
+  ruby_cpuinfo_la_SOURCES= ruby/cpuinfo.c
+  ruby_cpuinfo_la_LDFLAGS = -avoid-version -module ${RUBY_LDFLAGS}
+  ruby_cpuinfo_la_LIBADD= libcpuinfo.la
 
 endif
 
-cpuinfo_ruby.c: interface/cpuinfo.i
-	${SWIG} -ruby -o $@ $<
+ruby/cpuinfo.so:
+	@rm -f ruby/cpuinfo.so
+	@ln -s .libs/cpuinfo.so ruby/cpuinfo.so
+
+ruby/cpuinfo.c: interface/cpuinfo.i
+	${SWIG} -ruby -autorename -o $@ $<
 
 
=== modified file 'README'
--- README	2009-07-14 07:53:26 +0000
+++ README	2009-08-23 00:03:39 +0000
@@ -16,10 +16,16 @@
 
 Various language bindings bring in their own more complex dependencies.
 
-When building from bzr libtool, autoconf, automake, swig and some macros from
-autoconf-archive are needed. These are not needed when building from a release
-(a tar or zip file). The relevant development packages for any languages you
-want to support are also a build-time dependency.
+To build libcpuinfo from bzr, libtool, autoconf, automake are needed.
+Additionally, pandora-build and some macros from autoconf-archive are used.
+pandora-build can be found at http://launchpad.net/pandora-build.
+autoconf-archive can be found either at http://www.nongnu.org/autoconf-archive/
+or in OS packages such as the Ubuntu/Debian package autoconf-archive.
+
+These are not needed when building from a release (a tar or zip file).
+
+The relevant development packages for any languages you want to support are
+also a build-time dependency.
 
 Design Goals
 ************
 
=== modified file 'configure.ac'
--- configure.ac	2009-07-14 07:30:23 +0000
+++ configure.ac	2009-08-24 15:41:57 +0000
@@ -15,38 +15,14 @@
 AC_INIT([libcpuinfo], [CPUINFO_VERSION], [[e-mail]])
 AC_CONFIG_SRCDIR([cpuinfo/cpuinfo.h])
 AC_CONFIG_AUX_DIR([autotools])
-
-# We need to prevent canonical target
-# from injecting -O2 into CFLAGS - but we won't modify anything if we have
-# set CFLAGS on the command line, since that should take ultimate precedence
-AS_IF([test "x${ac_cv_env_CFLAGS_set}" = "x"],
-      [CFLAGS=""])
-AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"],
-      [CXXFLAGS=""])
-
-AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 AC_CONFIG_MACRO_DIR([acinclude])
 
+PANDORA_CANONICAL_TARGET(ignore-shared-ptr warnings-always-on)
+
 AC_DEFINE([CPUINFO_MAJOR_VERSION],LIBCPUINFO_MAJOR_VERSION,[Major version])
 AC_DEFINE([CPUINFO_MINOR_VERSION],LIBCPUINFO_MINOR_VERSION,[Minor version])
 AC_DEFINE([CPUINFO_MICRO_VERSION],LIBCPUINFO_MICRO_VERSION,[Micro version])
 
-
-AC_PROG_CC_C99
-AM_PROG_CC_C_O
-
-AC_USE_SYSTEM_EXTENSIONS
-
-# We use libtool
-LT_INIT
-LT_LANG(C)
-LT_LANG(C++)
-
-
-AC_PROG_INSTALL
-AC_PROG_LN_S
-
 # Checks for libraries.
 
 # Checks for header files.
@@ -54,10 +30,7 @@
 AC_CHECK_HEADERS([sys/sysctl.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
 AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_HEADER_TIME
 AC_STRUCT_TM
 
 AC_CHECK_SIZEOF(int, 4)
@@ -65,80 +38,17 @@
 AC_CHECK_SIZEOF(long, 4)
 
 # Checks for library functions.
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
 AC_CHECK_FUNCS(sysctlbyname)
 
-
-AC_DEFINE([SWIG_TYPE_TABLE],[cpuinfo],[Type Table name for SWIG symbol table])
-
-AC_PROG_SWIG(1.3.31)
-AC_SUBST(SWIG)
-
-WITH_PYTHON
-WITH_RUBY
-
-SWIG="${SWIG} -I\${top_srcdir} -I\${top_builddir}"
-
-
-dnl We need to inject error into the cflags to test if visibility works or not
-save_CFLAGS="${CFLAGS}"
-CFLAGS="${CFLAGS} -Werror"
-gl_VISIBILITY
-CFLAGS="${save_CFLAGS}"
-
-AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
-
-
-AS_IF([test "$GCC" = "yes"],[
-
-  AM_CPPFLAGS="-ggdb3 ${AM_CPPFLAGS}"
-
-  DEBUG_CFLAGS="-O0"
-  DEBUG_CXXFLAGS="-O0"
-
-  OPTIMIZE_CFLAGS="-O3"
-  OPTIMIZE_CXXFLAGS="-O3"
-])
-AS_IF([test "$SUNCC" = "yes"],[
-  AM_CFLAGS="-g -mt -xstrconst -Xa ${AM_CFLAGS}"
-  AM_CXXFLAGS="-mt -compat=5 -library=stlport4 -template=no%extdef ${AM_CXXFLAGS}"
-
-  DEBUG_CXXFLAGS="-g"
-
-  OPTIMIZE_FLAGS="-xO4 -xlibmil -xdepend -xbuiltin"
-  OPTIMIZE_CFLAGS="${OPTIMIZE_FLAGS}"
-  OPTIMIZE_CXXFLAGS="-g0 ${OPTIMIZE_FLAGS}"
-
-])
-
-AC_ARG_WITH([debug],
-	[AS_HELP_STRING([--with-debug],
-		 [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])],
-	[with_debug=$withval],
-	[with_debug=no])
-AS_IF([test "$with_debug" = "yes"],[
-	# Debugging. No optimization.
-	AM_CFLAGS="${AM_CFLAGS} ${DEBUG_CFLAGS} -DDEBUG"
-	AM_CXXFLAGS="${AM_CXXFLAGS} ${DEBUG_CXXFLAGS} -DDEBUG"
-],[
-	# Optimized version. No debug
-	AM_CFLAGS="${AM_CFLAGS} ${OPTIMIZE_CFLAGS}"
-	AM_CXXFLAGS="${AM_CXXFLAGS} ${OPTIMIZE_CXXFLAGS}"
-])
-
-
-ENABLE_64BIT
-
-AC_HEADER_ASSERT
-
-PANDORA_WARNINGS(warnings-always-on)
-
-AM_CFLAGS="${AM_CFLAGS} ${CC_WARNINGS} ${CC_PROFILING} ${CC_COVERAGE}"
-AM_CXXFLAGS="${AM_CXXFLAGS} ${CXX_WARNINGS} ${CC_PROFILING} ${CC_COVERAGE}"
-
-AC_SUBST([AM_CFLAGS])
-AC_SUBST([AM_CXXFLAGS])
+PANDORA_SWIG
+PANDORA_SWIG_PYTHON3
+
+PANDORA_WITH_LUA
+PANDORA_WITH_PERL
+PANDORA_WITH_PYTHON
+PANDORA_WITH_PYTHON3
+PANDORA_WITH_RUBY
+
 
 # Output files
 AC_CONFIG_HEADERS([config.h])
 
=== modified file 'interface/cpuinfo.i'
--- interface/cpuinfo.i	2009-07-14 07:30:23 +0000
+++ interface/cpuinfo.i	2009-08-23 00:03:39 +0000
@@ -1,6 +1,6 @@
 /*
  * libcpuinfo: Information about CPU's present on a machine.
- * Copyright (C) 2009 The libcpuinfo developers.
+ * Copyright (C) 2009 Monty Taylor
  *
  * This program is open source and copying is licenced under the BSD
  * licence. Please see COPYING.txt distributed with the source code for
 
=== added directory 'lua'
=== removed directory 'm4'
=== removed file 'm4/64bit.m4'
--- m4/64bit.m4	2009-07-14 07:30:23 +0000
+++ m4/64bit.m4	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-dnl ---------------------------------------------------------------------------
-dnl Macro: ENABLE_64BIT
-dnl ---------------------------------------------------------------------------
-AC_DEFUN([ENABLE_64BIT],[
-  AC_ARG_ENABLE([64bit],[
-    AS_HELP_STRING([--disable-64bit],
-      [Build 64 bit binary @<:@default=on@:>@])],
-             [ac_enable_64bit="$enableval"],
-             [ac_enable_64bit="yes"])
-
-  AC_CHECK_PROGS(ISAINFO, [isainfo], [no])
-  AS_IF([test "x$ISAINFO" != "xno"],
-        [isainfo_b=`${ISAINFO} -b`],
-        [isainfo_b="x"])
-
-  AS_IF([test "$isainfo_b" != "x"],[
-
-    isainfo_k=`${ISAINFO} -k` 
-    DTRACEFLAGS="${DTRACEFLAGS} -${isainfo_k}"
-
-    AS_IF([test "x${ac_cv_env_CPPFLAGS_set}" = "x"],[
-      CPPFLAGS="-I/usr/local ${CPPFLAGS}"
-    ])
-
-    AS_IF([test "x${ac_cv_env_LDFLAGS_set}" = "x"],[
-      LDFLAGS="-L/usr/local/lib/${isainfo_k} ${LDFLAGS}"
-    ])
-
-    AS_IF([test "x$ac_enable_64bit" = "xyes"],[
-      AS_IF([test "x$libdir" = "x\${exec_prefix}/lib"],[
-       dnl The user hasn't overridden the default libdir, so we'll 
-       dnl the dir suffix to match solaris 32/64-bit policy
-       libdir="${libdir}/${isainfo_k}"
-      ])
-
-      CPPFLAGS="-m64 ${CPPFLAGS}"
-      LDFLAGS="-m64 ${LDFLAGS}"
-      AS_IF([test "$target_cpu" = "sparc" -a "x$SUNCC" = "xyes"],[
-        AM_CFLAGS="-xmemalign=8s ${AM_CFLAGS}"
-        AM_CXXFLAGS="-xmemalign=8s ${AM_CXXFLAGS}"
-      ])
-    ])
-  ])
-])
-dnl ---------------------------------------------------------------------------
-dnl End Macro: ENABLE_64BIT
-dnl ---------------------------------------------------------------------------
 
=== removed file 'm4/pandora_vc_build.m4'
--- m4/pandora_vc_build.m4	2009-07-14 07:30:23 +0000
+++ m4/pandora_vc_build.m4	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([PANDORA_BUILDING_FROM_VC],[
-
-  ac_cv_building_from_vc=no
-
-  AS_IF([test -d "${srcdir}/.bzr"],[
-    ac_cv_building_from_bzr=yes
-    ac_cv_building_from_vc=yes
-    ],[
-    ac_cv_building_from_bzr=no
-  ])
-
-  AS_IF([test -d "${srcdir}/.svn"],[
-    ac_cv_building_from_svn=yes
-    ac_cv_building_from_vc=yes
-    ],[
-    ac_cv_building_from_svn=no
-  ])
-
-  AS_IF([test -d "${srcdir}/.hg"],[
-    ac_cv_building_from_hg=yes
-    ac_cv_building_from_vc=yes
-    ],[
-    ac_cv_building_from_hg=no
-  ])
-
-])
-  
 
=== removed file 'm4/pandora_warnings.m4'
--- m4/pandora_warnings.m4	2009-07-14 07:30:23 +0000
+++ m4/pandora_warnings.m4	1970-01-01 00:00:00 +0000
@@ -1,251 +0,0 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl AC_PANDORA_WARNINGS([less-warnings|warnings-always-on])
-dnl   less-warnings turn on a limited set of warnings
-dnl   warnings-always-on always set warnings=error regardless of tarball/vc
-
-dnl @TODO: remove less-warnings option as soon as Drizzle is clean enough to
-dnl        allow it
- 
-AC_DEFUN([PANDORA_WARNINGS],[
-  m4_define([PW_LESS_WARNINGS],[no])
-  m4_define([PW_WARN_ALWAYS_ON],[no])
-  ifdef([m4_define],,[define([m4_define],   defn([define]))])
-  ifdef([m4_undefine],,[define([m4_undefine],   defn([undefine]))])
-  m4_foreach([pw_arg],[$*],[
-    m4_case(pw_arg,
-      [less-warnings],[
-        m4_undefine([PW_LESS_WARNINGS])
-        m4_define([PW_LESS_WARNINGS],[yes])
-      ],
-      [warnings-always-on],[
-        m4_undefine([PW_WARN_ALWAYS_ON])
-        m4_define([PW_WARN_ALWAYS_ON],[yes])
-    ]) 
-  ])
-
-  AC_REQUIRE([PANDORA_BUILDING_FROM_VC])
-  m4_if(PW_WARN_ALWAYS_ON, [yes],
-    [ac_cv_warnings_as_errors=yes],
-    AS_IF([test "$ac_cv_building_from_vc" = "yes"],
-          [ac_cv_warnings_as_errors=yes],
-          [ac_cv_warnings_as_errors=no]))
-
-  AC_ARG_ENABLE([profiling],
-      [AS_HELP_STRING([--enable-profiling],
-         [Toggle profiling @<:@default=off@:>@])],
-      [ac_profiling="$enableval"],
-      [ac_profiling="no"])
-
-  AC_ARG_ENABLE([coverage],
-      [AS_HELP_STRING([--enable-coverage],
-         [Toggle coverage @<:@default=off@:>@])],
-      [ac_coverage="$enableval"],
-      [ac_coverage="no"])
-
-  AS_IF([test "$GCC" = "yes"],[
-
-    AS_IF([test "$ac_profiling" = "yes"],[
-      CC_PROFILING="-pg"
-      save_LIBS="${LIBS}"
-      LIBS=""
-      AC_CHECK_LIB(c_p, read)
-      LIBC_P="${LIBS}"
-      LIBS="${save_LIBS}"
-      AC_SUBST(LIBC_P)
-    ],[
-      CC_PROFILING=" "
-    ])
-
-    AS_IF([test "$ac_coverage" = "yes"],
-          [CC_COVERAGE="-fprofile-arcs -ftest-coverage"])
-	 
-    AS_IF([test "$ac_cv_warnings_as_errors" = "yes"],
-          [W_FAIL="-Werror"])
-
-    AC_CACHE_CHECK([whether it is safe to use -fdiagnostics-show-option],
-      [ac_cv_safe_to_use_fdiagnostics_show_option_],
-      [save_CFLAGS="$CFLAGS"
-       CFLAGS="-fdiagnostics-show-option ${AM_CFLAGS} ${CFLAGS}"
-       AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM([],[])],
-         [ac_cv_safe_to_use_fdiagnostics_show_option_=yes],
-         [ac_cv_safe_to_use_fdiagnostics_show_option_=no])
-       CFLAGS="$save_CFLAGS"])
-
-    AS_IF([test "$ac_cv_safe_to_use_fdiagnostics_show_option_" = "yes"],
-          [
-            F_DIAGNOSTICS_SHOW_OPTION="-fdiagnostics-show-option"
-          ])
-
-    AC_CACHE_CHECK([whether it is safe to use -Wconversion],
-      [ac_cv_safe_to_use_wconversion_],
-      [save_CFLAGS="$CFLAGS"
-       dnl Use -Werror here instead of ${W_FAIL} so that we don't spew
-       dnl conversion warnings to all the tarball folks
-       CFLAGS="-Wconversion -Werror -pedantic ${AM_CFLAGS} ${CFLAGS}"
-       AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM([[
-#include <stdbool.h>
-void foo(bool a)
-{
-  (void)a;
-}
-         ]],[[
-foo(0);
-         ]])],
-         [ac_cv_safe_to_use_wconversion_=yes],
-         [ac_cv_safe_to_use_wconversion_=no])
-       CFLAGS="$save_CFLAGS"])
-
-    AS_IF([test "$ac_cv_safe_to_use_wconversion_" = "yes"],
-      [W_CONVERSION="-Wconversion"
-      AC_CACHE_CHECK([whether it is safe to use -Wconversion with htons],
-        [ac_cv_safe_to_use_Wconversion_],
-        [save_CFLAGS="$CFLAGS"
-         dnl Use -Werror here instead of ${W_FAIL} so that we don't spew
-         dnl conversion warnings to all the tarball folks
-         CFLAGS="-Wconversion -Werror -pedantic ${AM_CFLAGS} ${CFLAGS}"
-         AC_COMPILE_IFELSE(
-           [AC_LANG_PROGRAM(
-             [[
-#include <netinet/in.h>
-             ]],[[
-uint16_t x= htons(80);
-             ]])],
-           [ac_cv_safe_to_use_Wconversion_=yes],
-           [ac_cv_safe_to_use_Wconversion_=no])
-         CFLAGS="$save_CFLAGS"])
-
-      AS_IF([test "$ac_cv_safe_to_use_Wconversion_" = "no"],
-            [NO_CONVERSION="-Wno-conversion"])
-    ])
-
-    NO_STRICT_ALIASING="-fno-strict-aliasing -Wno-strict-aliasing"
-    NO_SHADOW="-Wno-shadow"
-
-    m4_if(PW_LESS_WARNINGS,[no],[
-      BASE_WARNINGS_FULL="-Wformat=2 ${W_CONVERSION} -Wstrict-aliasing"
-      CC_WARNINGS_FULL="-Wswitch-default -Wswitch-enum -Wwrite-strings"
-      CXX_WARNINGS_FULL="-Weffc++ -Wold-style-cast"
-    ],[
-      BASE_WARNINGS_FULL="-Wformat ${NO_STRICT_ALIASING}"
-    ])
-
-    AS_IF([test "${ac_cv_assert}" = "no"],
-          [NO_UNUSED="-Wno-unused-variable -Wno-unused-parameter"])
-
-    BASE_WARNINGS="${W_FAIL} -pedantic -Wall -Wextra -Wundef -Wshadow ${NO_UNUSED} ${F_DIAGNOSTICS_SHOW_OPTION} ${CFLAG_VISIBILITY} ${BASE_WARNINGS_FULL}"
-    CC_WARNINGS="${BASE_WARNINGS} -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations -Wcast-align ${CC_WARNINGS_FULL}"
-    CXX_WARNINGS="${BASE_WARNINGS} -Woverloaded-virtual -Wnon-virtual-dtor -Wctor-dtor-privacy -Wno-long-long ${CXX_WARNINGS_FULL}"
-
-    AC_CACHE_CHECK([whether it is safe to use -Wmissing-declarations from C++],
-      [ac_cv_safe_to_use_Wmissing_declarations_],
-      [AC_LANG_PUSH(C++)
-       save_CXXFLAGS="$CXXFLAGS"
-       CXXFLAGS="-Werror -pedantic -Wmissing-declarations ${AM_CXXFLAGS}"
-       AC_COMPILE_IFELSE([
-         AC_LANG_PROGRAM(
-         [[
-#include <stdio.h>
-         ]], [[]])
-      ],
-      [ac_cv_safe_to_use_Wmissing_declarations_=yes],
-      [ac_cv_safe_to_use_Wmissing_declarations_=no])
-      CXXFLAGS="$save_CXXFLAGS"
-      AC_LANG_POP()
-    ])
-    AS_IF([test "$ac_cv_safe_to_use_Wmissing_declarations_" = "yes"],
-          [CXX_WARNINGS="${CXX_WARNINGS} -Wmissing-declarations"])
-
-    AC_CACHE_CHECK([whether it is safe to use -Wlogical-op],
-      [ac_cv_safe_to_use_Wlogical_op_],
-      [save_CFLAGS="$CFLAGS"
-       CFLAGS="${W_FAIL} -pedantic -Wlogical-op ${AM_CFLAGS} ${CFLAGS}"
-       AC_COMPILE_IFELSE([
-         AC_LANG_PROGRAM(
-         [[
-#include <stdio.h>
-         ]], [[]])
-      ],
-      [ac_cv_safe_to_use_Wlogical_op_=yes],
-      [ac_cv_safe_to_use_Wlogical_op_=no])
-    CFLAGS="$save_CFLAGS"])
-    AS_IF([test "$ac_cv_safe_to_use_Wlogical_op_" = "yes"],
-          [CC_WARNINGS="${CC_WARNINGS} -Wlogical-op"])
-
-    AC_CACHE_CHECK([whether it is safe to use -Wredundant-decls from C++],
-      [ac_cv_safe_to_use_Wredundant_decls_],
-      [AC_LANG_PUSH(C++)
-       save_CXXFLAGS="${CXXFLAGS}"
-       CXXFLAGS="${W_FAIL} -pedantic -Wredundant-decls ${AM_CXXFLAGS}"
-       AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM([
-template <typename E> struct C { void foo(); };
-template <typename E> void C<E>::foo() { }
-template <> void C<int>::foo();
-          AC_INCLUDES_DEFAULT])],
-          [ac_cv_safe_to_use_Wredundant_decls_=yes],
-          [ac_cv_safe_to_use_Wredundant_decls_=no])
-        CXXFLAGS="${save_CXXFLAGS}"
-        AC_LANG_POP()])
-    AS_IF([test "$ac_cv_safe_to_use_Wredundant_decls_" = "yes"],
-          [CXX_WARNINGS="${CXX_WARNINGS} -Wredundant-decls"],
-          [CXX_WARNINGS="${CXX_WARNINGS} -Wno-redundant-decls"])
-
-    NO_REDUNDANT_DECLS="-Wno-redundant-decls"
-    PROTOSKIP_WARNINGS="-Wno-effc++ -Wno-shadow"
-    
-  ])
-
-  AS_IF([test "$SUNCC" = "yes"],[
-
-    AS_IF([test "$ac_profiling" = "yes"],
-          [CC_PROFILING="-xinstrument=datarace"])
-
-    AS_IF([test "$ac_cv_warnings_as_errors" = "yes"],
-          [W_FAIL="-errwarn=%all"])
-
-    AC_CACHE_CHECK([whether E_PASTE_RESULT_NOT_TOKEN is usable],
-      [ac_cv_paste_result],
-      [
-        save_CFLAGS="${CFLAGS}"
-        CFLAGS="-errwarn=%all -erroff=E_PASTE_RESULT_NOT_TOKEN ${CFLAGS}"
-        AC_COMPILE_IFELSE(
-          [AC_LANG_PROGRAM([
-            AC_INCLUDES_DEFAULT
-          ],[
-            int x= 0;])],
-          [ac_cv_paste_result=yes],
-          [ac_cv_paste_result=no])
-        CFLAGS="${save_CFLAGS}"
-      ])
-    AS_IF([test $ac_cv_paste_result = yes],
-      [W_PASTE_RESULT=",E_PASTE_RESULT_NOT_TOKEN"])
-
-
-    m4_if(PW_LESS_WARNINGS, [no],[
-      CC_WARNINGS_FULL="-erroff=E_INTEGER_OVERFLOW_DETECTED${W_PASTE_RESULT}"
-    ],[
-      CC_WARNINGS_FULL="-erroff=E_ATTRIBUTE_NOT_VAR"
-      CXX_WARNINGS_FULL="-erroff=attrskipunsup,doubunder,reftotemp,inllargeuse,truncwarn1,signextwarn,inllargeint"
-    ])
-
-    CC_WARNINGS="-v -errtags=yes ${W_FAIL} ${CC_WARNINGS_FULL}"
-    CXX_WARNINGS="+w +w2 -xwe -xport64 -errtags=yes ${CXX_WARNINGS_FULL} ${W_FAIL}"
-    PROTOSKIP_WARNINGS="-erroff=attrskipunsup,doubunder,reftotemp,wbadinitl,identexpected,inllargeuse,truncwarn1,signextwarn"
-    NO_UNREACHED="-erroff=E_STATEMENT_NOT_REACHED"
-
-  ])
-
-  AC_SUBST(NO_CONVERSION)
-  AC_SUBST(NO_REDUNDANT_DECLS)
-  AC_SUBST(NO_UNREACHED)
-  AC_SUBST(NO_SHADOW)
-  AC_SUBST(NO_STRICT_ALIASING)
-  AC_SUBST(PROTOSKIP_WARNINGS)
-
-])
 
=== removed file 'm4/with_python.m4'
--- m4/with_python.m4	2009-07-14 07:30:23 +0000
+++ m4/with_python.m4	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-dnl Find python developement
-dnl Copyright (C) 2008 Sun Microsystems, Inc.
-dnl 
-dnl This program is free software: you can redistribute it and/or modify it
-dnl under the terms of the GNU General Public License as published by the
-dnl Free Software Foundation, either version 3 of the License, or (at your
-dnl option) any later version.
-dnl 
-dnl This program is distributed in the hope that it will be useful, but
-dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-dnl Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License along
-dnl with this program. If not, see <http://www.gnu.org/licenses/>.
-dnl 
-dnl As a special exception, the respective Autoconf Macro's copyright owner
-dnl gives unlimited permission to copy, distribute and modify the configure
-dnl scripts that are the output of Autoconf when processing the Macro. You
-dnl need not follow the terms of the GNU General Public License when using
-dnl or distributing such scripts, even though portions of the text of the
-dnl Macro appear in them. The GNU General Public License (GPL) does govern
-dnl all other use of the material that constitutes the Autoconf Macro.
-
-
-AC_DEFUN([WITH_PYTHON], [
-
-  AC_ARG_WITH([python], 
-    [AS_HELP_STRING([--with-python],
-      [Build Python Bindings @<:@default=yes@:>@])],
-    [with_python=$withval], 
-    [with_python=yes])
-
-  AS_IF([test "x$with_python" != "xno"],[
-    AS_IF([test "x$with_python" != "xyes"],[PYTHON=$with_python])
-    AM_PATH_PYTHON([2.4],,[with_python="no"])
-    AC_PYTHON_DEVEL()
-    AS_IF([test "x$pythonexists" = "xno"],[with_python="no"])
-  ])
-  AM_CONDITIONAL(BUILD_PYTHON, [test "$with_python" = "yes"])
-
-])
 
=== removed file 'm4/with_ruby.m4'
--- m4/with_ruby.m4	2009-07-14 07:30:23 +0000
+++ m4/with_ruby.m4	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-dnl Find ruby developemnt
-dnl Copyright (C) 2008 Sun Microsystems, Inc.
-dnl 
-dnl This program is free software: you can redistribute it and/or modify it
-dnl under the terms of the GNU General Public License as published by the
-dnl Free Software Foundation, either version 3 of the License, or (at your
-dnl option) any later version.
-dnl 
-dnl This program is distributed in the hope that it will be useful, but
-dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-dnl Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License along
-dnl with this program. If not, see <http://www.gnu.org/licenses/>.
-dnl 
-dnl As a special exception, the respective Autoconf Macro's copyright owner
-dnl gives unlimited permission to copy, distribute and modify the configure
-dnl scripts that are the output of Autoconf when processing the Macro. You
-dnl need not follow the terms of the GNU General Public License when using
-dnl or distributing such scripts, even though portions of the text of the
-dnl Macro appear in them. The GNU General Public License (GPL) does govern
-dnl all other use of the material that constitutes the Autoconf Macro.
-
-AC_DEFUN([WITH_RUBY], [
-
-  AC_ARG_WITH([ruby],
-    [AS_HELP_STRING([--with-ruby],
-      [Build Ruby Bindings @<:@default=yes@:>@])],
-      [with_ruby=$withval],
-      [with_ruby=ruby])
-
-  AS_IF([test "x$with_ruby" != "xno"],[
-    AS_IF([test "x$with_ruby" != "xyes"],
-      [ac_chk_ruby=$with_ruby],
-      [ac_chk_ruby=ruby1.8 ruby])
-    AC_CHECK_PROGS(RUBY,$ac_chk_ruby)
-  ])
-
-  AS_IF([test "x$RUBY" != "x"],[
-
-    AC_MSG_CHECKING(for ruby devel)
-
-    dnl need to change quotes to allow square brackets
-    changequote(<<, >>)dnl
-    ruby_prefix=`$RUBY -rrbconfig -e "print Config::CONFIG['archdir']"`
-    strip_ruby_prefix=`$RUBY -rrbconfig -e "print Config::CONFIG['prefix']" | sed 's/\//./g'`
-    
-    RUBY_LIB=`$RUBY -rrbconfig -e "puts Config::CONFIG['ruby_install_name']"`
-    LIBRUBYARG_SHARED=`$RUBY -rrbconfig -e "puts Config::CONFIG['LIBRUBYARG_SHARED']"`
-    RUBY_DIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['archdir']"`
-    RUBY_ARCH_DIR=`echo $RUBY_DIR | sed "s/$strip_ruby_prefix//"`
-    RUBY_LIBDIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['rubylibdir']"`
-    RUBY_INCLUDES="-I$ruby_prefix"
-    changequote([, ])dnl
-
-    ac_save_CFLAGS="$CFLAGS"
-    ac_save_CPPFLAGS="$CPPFLAGS"
-    ac_save_LDFLAGS="$LDFLAGS"
-    CFLAGS="$ac_save_CFLAGS $RUBY_INCLUDES"
-    CPPFLAGS="$ac_save_CPPFLAGS $RUBY_INCLUDES"
-    LDFLAGS="$ac_save_LDFLAGS $LIBRUBYARG_SHARED"
-    
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ruby.h>]], [[VALUE rb_ac_test = rb_define_module("actest");]])],[with_ruby="yes";AC_MSG_RESULT(found)],[with_ruby="no";AC_MSG_RESULT(missing)])
-
-    CPPFLAGS="$ac_save_CPPFLAGS"
-    CFLAGS="$ac_save_CFLAGS"
-    LDFLAGS="$ac_save_LDFLAGS"
-  ],[
-    # This allows 'make clean' in the ruby directory to work when
-    # ruby isn't available
-    RUBY=
-    RUBY_INCLUDES=
-    LIBRUBYARG_SHARED=
-    RUBY_LIB=
-    RUBY_DIR=
-    RUBY_LIBDIR=
-    RUBY_ARCH_DIR=
-    with_ruby="no"
-  ])
-
-  AC_SUBST(RUBY_INCLUDES)
-  AC_SUBST(LIBRUBYARG_SHARED)
-  AC_SUBST(RUBY_LIB)
-  AC_SUBST(RUBY_DIR)
-  AC_SUBST(RUBY_LIBDIR)
-  AC_SUBST(RUBY_ARCH_DIR)
-
-  AS_IF([test "x$RUBY_DIR" = "x"],[with_ruby="no"])
-  AM_CONDITIONAL(BUILD_RUBY, test "$with_ruby" = "yes")
-])
 
=== added directory 'perl'
=== added directory 'python'
=== added directory 'python3'
=== added directory 'ruby'