summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am52
-rw-r--r--README2
-rw-r--r--RELEASE6
-rwxr-xr-xautogen.sh18
-rw-r--r--configure.ac297
-rw-r--r--doc/Makefile.am116
-rw-r--r--doc/building.xml40
-rw-r--r--examples/Makefile.am64
-rw-r--r--gtk-doc.make327
-rw-r--r--m4/ac_libtool_tags.m457
-rw-r--r--m4/as-compiler-flag.m433
-rw-r--r--m4/as-host-defines.m456
-rw-r--r--m4/as-nano.m427
-rw-r--r--m4/ax_create_stdint_h.m4734
-rw-r--r--m4/gtk-doc.m488
-rw-r--r--m4/pkg.m4214
-rw-r--r--orc-test-uninstalled.pc.in11
-rw-r--r--orc-test/Makefile.am23
-rw-r--r--orc-uninstalled.pc.in13
-rw-r--r--orc/Makefile.am135
-rw-r--r--testsuite/Makefile.am49
-rw-r--r--testsuite/benchmorc/Makefile.am6
-rw-r--r--testsuite/orcc/Makefile.am34
-rw-r--r--tools/Makefile.am13
24 files changed, 25 insertions, 2390 deletions
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 167046d..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-
-AUTOMAKE_OPTIONS = foreign
-
-if BUILD_TESTS
-ORCTEST_DIR = orc-test
-TESTSUITE_DIR= testsuite
-else
-ORCTEST_DIR =
-TESTSUITE_DIR =
-endif
-
-SUBDIRS = orc $(ORCTEST_DIR) tools $(TESTSUITE_DIR) examples doc
-
-DIST_SUBDIRS = orc orc-test tools examples testsuite doc
-
-
-EXTRA_DIST = COPYING RELEASE autogen.sh gtk-doc.make orc.m4 \
- $(shell find "$(top_srcdir)" -type f -name meson.build ! -path "$(top_srcdir)/orc-0.4.*" ) \
- meson_options.txt
-
-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
-
-pkgconfig_DATA = orc-$(ORC_MAJORMINOR).pc orc-test-$(ORC_MAJORMINOR).pc
-
-cp_v_gen = $(cp_v_gen_$(V))
-cp_v_gen_ = $(cp_v_gen_$(AM_DEFAULT_VERBOSITY))
-cp_v_gen_0 = @echo " CP $@";
-
-orc-$(ORC_MAJORMINOR).pc: orc.pc
- $(cp_v_gen)cp orc.pc orc-$(ORC_MAJORMINOR).pc
-
-orc-test-$(ORC_MAJORMINOR).pc: orc-test.pc
- $(cp_v_gen)cp orc-test.pc orc-test-$(ORC_MAJORMINOR).pc
-
-orc-$(ORC_MAJORMINOR)-uninstalled.pc: orc-uninstalled.pc
- $(cp_v_gen)cp orc-uninstalled.pc orc-$(ORC_MAJORMINOR)-uninstalled.pc
-
-orc-test-$(ORC_MAJORMINOR)-uninstalled.pc: orc-test-uninstalled.pc
- $(cp_v_gen)cp orc-test-uninstalled.pc orc-test-$(ORC_MAJORMINOR)-uninstalled.pc
-
-BUILT_SOURCES=orc-$(ORC_MAJORMINOR)-uninstalled.pc \
- orc-test-$(ORC_MAJORMINOR)-uninstalled.pc
-
-CLEANFILES = orc-$(ORC_MAJORMINOR).pc orc-$(ORC_MAJORMINOR)-uninstalled.pc \
- orc-test-$(ORC_MAJORMINOR).pc orc-test-$(ORC_MAJORMINOR)-uninstalled.pc
-
-ACLOCAL_AMFLAGS = -I m4
-
-aclocaldir = $(datadir)/aclocal
-aclocal_DATA = orc.m4
-
-
diff --git a/README b/README
index 680ffc8..afeabd4 100644
--- a/README
+++ b/README
@@ -70,7 +70,7 @@ Questions and Answers:
- Q: How big is the Orc library?
- A: For embedded users, the --enable-backend configure option can
+ A: For embedded users, the orc-backend meson option can
be used to disable irrelvant targets. Compiled with only one target
(SSE), the library size is about 150 kB uncompressed, or 48 kB
compressed. The goal was to keep the uncompressed size under
diff --git a/RELEASE b/RELEASE
index 16dd3f8..5bfe70a 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,3 +1,9 @@
+0.4.30 (unreleased)
+===================
+
+ - autotools support has been dropped in favour of Meson as build system
+ - FILL ME
+
0.4.29
======
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 19ee6d8..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-
-test -n "$srcdir" || srcdir=`dirname "$0"`
-test -n "$srcdir" || srcdir=.
-
-olddir=`pwd`
-cd "$srcdir"
-
-autoreconf -i -f
-
-cd "$olddir"
-
-if test -z "$NOCONFIGURE"; then
- exec $srcdir/configure --disable-static --enable-maintainer-mode --enable-gtk-doc $@
-fi
-
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 5c4235f..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,297 +0,0 @@
-AC_PREREQ([2.68])
-AC_INIT([orc], [0.4.29.1], [https://gitlab.freedesktop.org/gstreamer/orc/issues/],[orc])
-dnl don't forget to update libversion
-
-AS_NANO(ORC_GIT=no,ORC_GIT=yes)
-
-AC_CANONICAL_HOST()
-AM_INIT_AUTOMAKE([-Wno-portability 1.11 no-dist-gzip dist-xz tar-ustar subdir-objects])
-
-dnl use pretty build output with automake >= 1.11
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],
- [AM_DEFAULT_VERBOSITY=1
- AC_SUBST(AM_DEFAULT_VERBOSITY)])
-
-ORC_MAJORMINOR=0.4
-AC_SUBST(ORC_MAJORMINOR)
-
-AC_CONFIG_HEADER(config.h)
-
-dnl CURRENT, REVISION, AGE
-dnl - library source changed -> increment REVISION
-dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
-dnl - interfaces added -> increment AGE
-dnl - interfaces removed -> AGE = 0
-ORC_LIBVERSION="29:0:29"
-AC_SUBST(ORC_LIBVERSION)
-LT_PREREQ([2.2.6])
-LT_INIT([dlopen win32-dll disable-static])
-
-AC_PROG_CC
-AC_PROG_CC_STDC
-AM_PROG_CC_C_O
-AM_PROG_AS
-
-AC_CONFIG_MACRO_DIR([m4])
-
-AC_CONFIG_SRCDIR([orc/orc.h])
-
-AM_MAINTAINER_MODE([enable])
-
-ACLOCAL_AMFLAGS="-I m4 $ACLOCAL_AMFLAGS"
-AC_SUBST(ACLOCAL_AMFLAGS)
-
-AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = "xyes")
-AC_CHECK_FUNCS([posix_memalign])
-
-##################################################
-# Check for gtk-doc.
-##################################################
-
-if test "x$cross_compiling" = "xyes" ; then
- enable_gtk_doc=no
-fi
-GTK_DOC_CHECK([1.12], [--flavour no-tmpl])
-
-AS_HOST_DEFINES()
-
-AC_C_BIGENDIAN
-
-AC_FUNC_MMAP()
-
-AC_HEADER_STDC
-AC_CHECK_HEADERS([inttypes.h])
-AC_CHECK_HEADERS([sys/time.h])
-AC_CHECK_HEADERS([unistd.h])
-
-AC_CHECK_FUNCS([gettimeofday])
-
-AC_CHECK_LIBM
-AC_SUBST(LIBM)
-
-AC_CHECK_LIB(rt, clock_gettime,
- AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Defined if we have clock_gettime()])
- LIBRT=-lrt
- )
-AC_SUBST(LIBRT)
-
-dnl Android liblog
-case "${host_os}" in
- *android*)
- AC_CHECK_LIB(log, __android_log_print,
- AC_DEFINE(HAVE_ANDROID_LIBLOG, 1, [Defined if we have __android_log_print()])
- LIBLOG=-llog
- )
- ;;
- *)
- ;;
-esac
-AC_SUBST(LIBLOG)
-
-AC_CACHE_CHECK(for monotonic clocks,
- orc_cv_monotonic_clock,AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-#include <time.h>
-#include <unistd.h>
-int main() {
-#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 && defined(CLOCK_MONOTONIC))
- #error No monotonic clock
-#endif
- return 0;
-}
-]])],orc_cv_monotonic_clock=yes,orc_cv_monotonic_clock=no))
-if test "$orc_cv_monotonic_clock" = "yes"; then
- AC_DEFINE(HAVE_MONOTONIC_CLOCK,1,[Defined if we have a monotonic clock])
-fi
-
-AC_CHECK_HEADERS([valgrind/valgrind.h])
-
-AS_COMPILER_FLAG(-Wall, ORC_CFLAGS="$ORC_CFLAGS -Wall")
-if test "x$ORC_GIT" = "xyes"
-then
- AS_COMPILER_FLAG(-Werror, ERROR_CFLAGS="-Werror")
-fi
-
-case "${host_os}" in
- nobody_is_using_this_currently)
- AC_DEFINE(HAVE_CODEMEM_MALLOC, 1, [Use malloc to allocate code for execution])
- ;;
- mingw*|pw32*|cygwin*)
- AC_DEFINE(HAVE_CODEMEM_VIRTUALALLOC, 1, [Use VirtualAlloc to allocate code for execution])
- ;;
- linux*|darwin*|solaris*|netbsd*|freebsd*|openbsd*|kfreebsd*|dragonfly*|gnu*)
- AC_DEFINE(HAVE_CODEMEM_MMAP, 1, [Use mmap to allocate code for execution])
- ;;
- *)
- AC_ERROR([no code allocation backend])
- ;;
-esac
-
-case "${host_os}" in
- mingw*|pw32*|cygwin*)
- AC_DEFINE(HAVE_THREAD_WIN32, 1, [Use Windows thread code])
- ;;
- *android*)
- AC_DEFINE(HAVE_THREAD_PTHREAD, 1, [Use pthread thread code])
- PTHREAD_CFLAGS=
- PTHREAD_LIBS=
- ;;
- *)
- AC_DEFINE(HAVE_THREAD_PTHREAD, 1, [Use pthread thread code])
- PTHREAD_CFLAGS=
- PTHREAD_LIBS=-lpthread
- ;;
-esac
-AC_SUBST(PTHREAD_CFLAGS)
-AC_SUBST(PTHREAD_LIBS)
-
-AC_ARG_ENABLE(backend,
- AC_HELP_STRING([--enable-backend],[sse,mmx,neon,mips,all (default all)]),
- [], [enable_backend=all])
-case "${enable_backend}" in
- sse)
- ENABLE_BACKEND_SSE=yes
- AC_DEFINE(ENABLE_BACKEND_SSE, 1, [Enable SSE backend])
- ;;
- mmx)
- ENABLE_BACKEND_MMX=yes
- AC_DEFINE(ENABLE_BACKEND_MMX, 1, [Enable MMX backend])
- ;;
- altivec)
- ENABLE_BACKEND_ALTIVEC=yes
- AC_DEFINE(ENABLE_BACKEND_ALTIVEC, 1, [Enable Altivec backend])
- ;;
- neon)
- ENABLE_BACKEND_NEON=yes
- AC_DEFINE(ENABLE_BACKEND_NEON, 1, [Enable NEON backend])
- ;;
-### ARM backend is disabled until it has decent coverage
-# arm)
-# ENABLE_BACKEND_ARM=yes
-# AC_DEFINE(ENABLE_BACKEND_ARM, 1, [Enable Arm backend])
-# ;;
- c64x)
- ENABLE_BACKEND_C64X=yes
- AC_DEFINE(ENABLE_BACKEND_C64X, 1, [Enable c64x backend])
- ;;
- mips)
- ENABLE_BACKEND_MIPS=yes
- AC_DEFINE(ENABLE_BACKEND_MIPS, 1, [Enable MIPS backend])
- ;;
- all|auto)
- ENABLE_BACKEND_SSE=yes
- AC_DEFINE(ENABLE_BACKEND_SSE, 1, [Enable SSE backend])
- ENABLE_BACKEND_MMX=yes
- AC_DEFINE(ENABLE_BACKEND_MMX, 1, [Enable MMX backend])
- ENABLE_BACKEND_ALTIVEC=yes
- AC_DEFINE(ENABLE_BACKEND_ALTIVEC, 1, [Enable Altivec backend])
- ENABLE_BACKEND_NEON=yes
- AC_DEFINE(ENABLE_BACKEND_NEON, 1, [Enable NEON backend])
-# ENABLE_BACKEND_ARM=yes
-# AC_DEFINE(ENABLE_BACKEND_ARM, 1, [Enable Arm backend])
- ENABLE_BACKEND_C64X=yes
- AC_DEFINE(ENABLE_BACKEND_C64X, 1, [Enable c64x backend])
- ENABLE_BACKEND_MIPS=yes
- AC_DEFINE(ENABLE_BACKEND_MIPS, 1, [Enable MIPS backend])
- ;;
-esac
-AM_CONDITIONAL(ENABLE_BACKEND_SSE, test "x$ENABLE_BACKEND_SSE" = "xyes")
-AM_CONDITIONAL(ENABLE_BACKEND_MMX, test "x$ENABLE_BACKEND_MMX" = "xyes")
-AM_CONDITIONAL(ENABLE_BACKEND_ALTIVEC, test "x$ENABLE_BACKEND_ALTIVEC" = "xyes")
-AM_CONDITIONAL(ENABLE_BACKEND_NEON, test "x$ENABLE_BACKEND_NEON" = "xyes")
-AM_CONDITIONAL(ENABLE_BACKEND_ARM, test "x$ENABLE_BACKEND_ARM" = "xyes")
-AM_CONDITIONAL(ENABLE_BACKEND_C64X, test "x$ENABLE_BACKEND_C64X" = "xyes")
-AM_CONDITIONAL(ENABLE_BACKEND_MIPS, test "x$ENABLE_BACKEND_MIPS" = "xyes")
-
-dnl building of tests
-AC_ARG_ENABLE(tests,
- AS_HELP_STRING([--disable-tests],[disable building test apps]),
- [
- case "${enableval}" in
- yes) BUILD_TESTS=yes ;;
- no) BUILD_TESTS=no ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --disable-tests) ;;
- esac
- ],
-[BUILD_TESTS=yes]) dnl Default value
-AM_CONDITIONAL(BUILD_TESTS, test "x$BUILD_TESTS" = "xyes")
-
-dnl Symbol visibility
-AS_COMPILER_FLAG([-fvisibility=hidden], [
- VISIBILITY_CFLAGS="-fvisibility=hidden"
- AC_DEFINE(ORC_API_EXPORT, [extern __attribute__ ((visibility ("default")))], [public symbol export define])
-], [
- VISIBILITY_CFLAGS=""
- AC_DEFINE(ORC_API_EXPORT, [extern], [public symbol export define])
-])
-AC_SUBST(VISIBILITY_CFLAGS)
-
-dnl Check for -Bsymbolic-functions linker flag used to avoid
-dnl intra-library PLT jumps, if available.
-AC_ARG_ENABLE(Bsymbolic,
- [AS_HELP_STRING([--disable-Bsymbolic],[avoid linking with -Bsymbolic])],,
- [SAVED_LDFLAGS="${LDFLAGS}" SAVED_LIBS="${LIBS}"
- AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
- LDFLAGS=-Wl,-Bsymbolic-functions
- LIBS=
- AC_TRY_LINK([], [return 0],
- AC_MSG_RESULT(yes)
- enable_Bsymbolic=yes,
- AC_MSG_RESULT(no)
- enable_Bsymbolic=no)
- LDFLAGS="${SAVED_LDFLAGS}" LIBS="${SAVED_LIBS}"])
-
-ORC_CFLAGS="$ORC_CFLAGS \$(VISIBILITY_CFLAGS) \$(ERROR_CFLAGS) -I\$(top_srcdir) -D_GNU_SOURCE"
-AC_SUBST(ERROR_CFLAGS)
-AC_SUBST(ORC_CFLAGS)
-
-ORC_LIBS="\$(top_builddir)/orc/liborc-$ORC_MAJORMINOR.la $LIBM $LIBRT"
-AC_SUBST(ORC_LIBS)
-
-#CFLAGS=`echo $CFLAGS | sed s/O2/O0/`
-
-ORC_LDFLAGS="-version-info \$(ORC_LIBVERSION) -no-undefined -export-symbols-regex \^orc_"
-if test "x${enable_Bsymbolic}" = "xyes"; then
- ORC_LDFLAGS="$ORC_LDFLAGS -Wl,-Bsymbolic-functions"
-fi
-AC_SUBST(ORC_LDFLAGS)
-
-pkgconfigdir="\$(libdir)/pkgconfig"
-AC_SUBST(pkgconfigdir)
-
-AC_CONFIG_FILES([
-Makefile
-doc/Makefile
-doc/version.entities
-orc/Makefile
-orc-test/Makefile
-testsuite/Makefile
-testsuite/orcc/Makefile
-testsuite/benchmorc/Makefile
-examples/Makefile
-tools/Makefile
-orc-uninstalled.pc
-orc.pc
-orc-test.pc
-orc-test-uninstalled.pc
-])
-AC_OUTPUT
-
-echo "
-
-Configuration
- Version : ${VERSION}
- Source code location : ${srcdir}
- Prefix : ${prefix}
- Compiler : ${CC}
-
- API Documentation : ${enable_gtk_doc}
-
- Enable SSE backend : ${ENABLE_BACKEND_SSE}
- Enable MMX backend : ${ENABLE_BACKEND_MMX}
- Enable ALTIVEC backend : ${ENABLE_BACKEND_ALTIVEC}
- Enable NEON backend : ${ENABLE_BACKEND_NEON}
- Enable C64X backend : ${ENABLE_BACKEND_C64X}
- Enable MIPS backend : ${ENABLE_BACKEND_MIPS}
-
- Building test apps : ${BUILD_TESTS}
-"
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index da3fc9a..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,116 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# We require automake 1.6 at least.
-AUTOMAKE_OPTIONS = 1.6
-
-BUILT_SOURCES = version.entities
-
-# This is a blank Makefile.am for using gtk-doc.
-# Copy this to your project's API docs directory and modify the variables to
-# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
-# of using the various options.
-
-# The name of the module, e.g. 'glib'.
-DOC_MODULE=orc
-
-# Uncomment for versioned docs and specify the version of the module, e.g. '2'.
-#DOC_MODULE_VERSION=2
-
-
-# The top-level SGML file. You can change this if you want to.
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
-
-# The directory containing the source code. Relative to $(srcdir).
-# gtk-doc will search all .c & .h files beneath here for inline comments
-# documenting the functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../orc
-
-# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=
-
-# Extra options to supply to gtkdoc-scan.
-# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
-SCAN_OPTIONS=
-
-# Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS=--sgml-mode --output-format=xml
-
-# Extra options to supply to gtkdoc-mkhtml
-MKHTML_OPTIONS=
-
-# Extra options to supply to gtkdoc-fixref. Not normally needed.
-# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-FIXXREF_OPTIONS=
-
-# Used for dependencies. The docs will be rebuilt if any of these change.
-# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
-# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/orc/*.h
-CFILE_GLOB=$(top_srcdir)/orc/*.c
-
-# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
-# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
-EXTRA_HFILES=
-
-# Header files to ignore when scanning. Use base file name, no paths
-# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=orc-stdint.h
-
-# Images to copy into HTML directory.
-# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
-HTML_IMAGES=
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=building.xml concepts.xml opcode_table.xml opcodes.xml \
- program.xml running.xml tutorial.xml table.xml
-
-# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
-# These files must be listed here *and* in content_files
-# e.g. expand_content_files=running.sgml
-expand_content_files=
-
-# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
-# Only needed if you are using gtkdoc-scangobj to dynamically query widget
-# signals and properties.
-# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
-# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-GTKDOC_CFLAGS=
-GTKDOC_LIBS=
-
-# This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-# e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += version.entities.in
-
-# Files not to distribute
-# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
-# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
-#DISTCLEANFILES +=
-
-# Comment this out if you want your docs-status tested during 'make check'
-if ENABLE_GTK_DOC
-#TESTS_ENVIRONMENT = cd $(srcsrc) &&
-#TESTS = $(GTKDOC_CHECK)
-endif
-
--include $(top_srcdir)/git.mk
-
-DOC_SERVER = gstreamer.freedesktop.org
-DOC_BASE = /srv/gstreamer.freedesktop.org/www/data/doc
-DOC_URL = $(DOC_SERVER):$(DOC_BASE)
-
-upload:
- echo Uploading documentation to $(DOC_SERVER):$(DOC_BASE)/orc
- ssh $(DOC_SERVER) mkdir -p $(DOC_BASE)/orc
- rsync -rv -e ssh --delete html/* $(DOC_SERVER):$(DOC_BASE)/orc
- ssh $(DOC_SERVER) chmod -R g+w $(DOC_BASE)/orc
-
-update-tables: $(top_builddir)/testsuite/generate_xml_table $(top_builddir)/testsuite/generate_xml_table2
- $(top_builddir)/testsuite/generate_xml_table >table.xml
- $(top_builddir)/testsuite/generate_xml_table2 >opcode_table.xml
-
diff --git a/doc/building.xml b/doc/building.xml
index 8c989a2..0de7364 100644
--- a/doc/building.xml
+++ b/doc/building.xml
@@ -5,7 +5,7 @@
%version-entities;
<!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'">
]>
-<refentry id="orc-building" revision="29 may 2009">
+<refentry id="orc-building" revision="23 aug 2019">
<refmeta>
<refentrytitle>Building Orc and Applications That Use Orc</refentrytitle>
<manvolnum>3</manvolnum>
@@ -20,41 +20,37 @@ How to build Orc and applications using it.
</refnamediv>
<refsect1>
-<title>Building Orc on UNIX</title>
+<title>Building Orc</title>
<!-- this has been borrowed from the glib docs via gstreamer -->
<para>
- On UNIX, Orc uses the standard GNU build system,
- using <application>autoconf</application> for package
- configuration and resolving portability issues,
- <application>automake</application> for building makefiles
- that comply with the GNU Coding Standards, and
- <application>libtool</application> for building shared
- libraries on multiple platforms. The normal sequence for
- compiling and installing the Orc library is thus:
-
+ Orc uses the <ulink role="online-location" url="https://mesonbuild.com">Meson build system</ulink>
+ When using the Meson ninja backend (which is the default), the normal
+ sequence for compiling and installing the Orc library is thus:
<literallayout>
- <userinput>./configure</userinput>
- <userinput>make</userinput>
- <userinput>make install</userinput>
+ <userinput>meson builddir</userinput>
+ <userinput>ninja -C builddir</userinput>
+ <userinput>ninja -C builddir install</userinput>
</literallayout>
</para>
<para>
- The standard options provided by <application>GNU
- autoconf</application> may be passed to the
- <command>configure</command> script. Please see the
- <application>autoconf</application> documentation or run
- <command>./configure --help</command> for information about
- the standard options.
+ To see build options, check the meson_options.txt file and
+ <command>meson setup --help</command>, or run
+ <command>meson configure builddir</command> (after the first meson
+ configure run). You can pass build options directly when running meson
+ for the first time, or you can change options with
+ <command>meson configure builddir -Doption=xyz</command> after the
+ initial meson run.
</para>
<para>
By default, code generators for all targets are built into the
library. Embedded system developers may wish to use the
- --enable-backed option, which will disable all other code
+ <userinput>orc-backend</userinput> option, which will disable all other code
generators, saving about 200 kB in binary size. Outside of
- embedded systems, using --enable-backend is not recommended.
+ embedded systems, using the <userinput>orc-backend</userinput> option
+ is not recommended.
</para>
</refsect1>
diff --git a/examples/Makefile.am b/examples/Makefile.am
deleted file mode 100644
index def7aac..0000000
--- a/examples/Makefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-
-noinst_PROGRAMS =
-if CROSS_COMPILING
-else
-noinst_PROGRAMS += example1 example2 example3 mt19937ar
-
-BUILT_SOURCES = example1orc.c example1orc.h \
- example2orc.c example2orc.h \
- example3orc.c example3orc.h \
- mt19937arorc.c mt19937arorc.h
-endif
-
-if ENABLE_BACKEND_MMX
-noinst_PROGRAMS += volscale
-endif
-
-AM_LDFLAGS = $(ORC_LIBS)
-AM_CFLAGS = $(ORC_CFLAGS)
-
-EXTRA_DIST = example1orc.orc example2orc.orc example3orc.orc mt19937arorc.orc
-
-CLEANFILES = example1orc.c example1orc.h \
- example2orc.c example2orc.h \
- example3orc.c example3orc.h \
- mt19937arorc.c mt19937arorc.h
-
-example1_SOURCES = example1.c
-nodist_example1_SOURCES = example1orc.c example1orc.h
-example2_SOURCES = example2.c
-nodist_example2_SOURCES = example2orc.c example2orc.h
-example3_SOURCES = example3.c
-nodist_example3_SOURCES = example3orc.c example3orc.h
-mt19937ar_SOURCES = mt19937ar.c
-nodist_mt19937ar_SOURCES = mt19937arorc.c mt19937arorc.h
-
-orcc_v_gen = $(orcc_v_gen_$(V))
-orcc_v_gen_ = $(orcc_v_gen_$(AM_DEFAULT_VERBOSITY))
-orcc_v_gen_0 = @echo " ORCC $@";
-
-example1orc.c: $(srcdir)/example1orc.orc
- $(orcc_v_gen)$(top_builddir)/tools/orcc$(EXEEXT) --implementation -o example1orc.c $(srcdir)/example1orc.orc
-
-example1orc.h: $(srcdir)/example1orc.orc
- $(orcc_v_gen)$(top_builddir)/tools/orcc$(EXEEXT) --header -o example1orc.h $(srcdir)/example1orc.orc
-
-example2orc.c: $(srcdir)/example2orc.orc
- $(orcc_v_gen)$(top_builddir)/tools/orcc$(EXEEXT) --implementation -o example2orc.c $(srcdir)/example2orc.orc
-
-example2orc.h: $(srcdir)/example2orc.orc
- $(orcc_v_gen)$(top_builddir)/tools/orcc$(EXEEXT) --header -o example2orc.h $(srcdir)/example2orc.orc
-
-example3orc.c: $(srcdir)/example3orc.orc
- $(orcc_v_gen)$(top_builddir)/tools/orcc$(EXEEXT) --implementation -o example3orc.c $(srcdir)/example3orc.orc
-
-example3orc.h: $(srcdir)/example3orc.orc
- $(orcc_v_gen)$(top_builddir)/tools/orcc$(EXEEXT) --header -o example3orc.h $(srcdir)/example3orc.orc
-
-mt19937arorc.c: $(srcdir)/mt19937arorc.orc
- $(orcc_v_gen)$(top_builddir)/tools/orcc$(EXEEXT) --implementation -o mt19937arorc.c $(srcdir)/mt19937arorc.orc
-
-mt19937arorc.h: $(srcdir)/mt19937arorc.orc
- $(orcc_v_gen)$(top_builddir)/tools/orcc$(EXEEXT) --header -o mt19937arorc.h $(srcdir)/mt19937arorc.orc
-
-
diff --git a/gtk-doc.make b/gtk-doc.make
deleted file mode 100644
index 0ae1802..0000000
--- a/gtk-doc.make
+++ /dev/null
@@ -1,327 +0,0 @@
-# -*- mode: makefile -*-
-#
-# gtk-doc.make - make rules for gtk-doc
-# Copyright (C) 2003 James Henstridge
-# 2004-2007 Damon Chaplin
-# 2007-2017 Stefan Sauer
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-####################################
-# Everything below here is generic #
-####################################
-
-if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-GTKDOC_RUN = $(LIBTOOL) --mode=execute
-else
-GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-GTKDOC_RUN =
-endif
-
-# We set GPATH here; this gives us semantics for GNU make
-# which are more like other make's VPATH, when it comes to
-# whether a source that is a target of one rule is then
-# searched for in VPATH/GPATH.
-#
-GPATH = $(srcdir)
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-SETUP_FILES = \
- $(content_files) \
- $(expand_content_files) \
- $(DOC_MAIN_SGML_FILE) \
- $(DOC_MODULE)-sections.txt \
- $(DOC_MODULE)-overrides.txt
-
-EXTRA_DIST = \
- $(HTML_IMAGES) \
- $(SETUP_FILES)
-
-DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
- html-build.stamp pdf-build.stamp \
- sgml.stamp html.stamp pdf.stamp
-
-SCANOBJ_FILES = \
- $(DOC_MODULE).args \
- $(DOC_MODULE).hierarchy \
- $(DOC_MODULE).interfaces \
- $(DOC_MODULE).prerequisites \
- $(DOC_MODULE).signals
-
-REPORT_FILES = \
- $(DOC_MODULE)-undocumented.txt \
- $(DOC_MODULE)-undeclared.txt \
- $(DOC_MODULE)-unused.txt
-
-gtkdoc-check.test: Makefile
- $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
- echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \
- chmod +x $@
-
-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test
-
-if GTK_DOC_BUILD_HTML
-HTML_BUILD_STAMP=html-build.stamp
-else
-HTML_BUILD_STAMP=
-endif
-if GTK_DOC_BUILD_PDF
-PDF_BUILD_STAMP=pdf-build.stamp
-else
-PDF_BUILD_STAMP=
-endif
-
-all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-.PHONY: all-gtk-doc
-
-if ENABLE_GTK_DOC
-all-local: all-gtk-doc
-endif
-
-docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-
-$(REPORT_FILES): sgml-build.stamp
-
-#### setup ####
-
-GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_@AM_V@)
-GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_@AM_DEFAULT_V@)
-GTK_DOC_V_SETUP_0=@echo " DOC Preparing build";
-
-setup-build.stamp:
- -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
- files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
- if test "x$$files" != "x" ; then \
- for file in $$files ; do \
- destdir=`dirname $(abs_builddir)/$$file`; \
- test -d "$$destdir" || mkdir -p "$$destdir"; \
- test -f $(abs_srcdir)/$$file && \
- cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
- done; \
- fi; \
- fi
- $(AM_V_at)touch setup-build.stamp
-
-#### scan ####
-
-GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_@AM_V@)
-GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_@AM_DEFAULT_V@)
-GTK_DOC_V_SCAN_0=@echo " DOC Scanning header files";
-
-GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_@AM_V@)
-GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_@AM_DEFAULT_V@)
-GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects";
-
-scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
- $(GTK_DOC_V_SCAN)_source_dir='' ; \
- for i in $(DOC_SOURCE_DIR) ; do \
- _source_dir="$${_source_dir} --source-dir=$$i" ; \
- done ; \
- gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
- $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
- scanobj_options=""; \
- gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \
- if test "$$?" = "0"; then \
- if test "x$(V)" = "x1"; then \
- scanobj_options="--verbose"; \
- fi; \
- fi; \
- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
- gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
- else \
- for i in $(SCANOBJ_FILES) ; do \
- test -f $$i || touch $$i ; \
- done \
- fi
- $(AM_V_at)touch scan-build.stamp
-
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
- @true
-
-#### xml ####
-
-GTK_DOC_V_XML=$(GTK_DOC_V_XML_@AM_V@)
-GTK_DOC_V_XML_=$(GTK_DOC_V_XML_@AM_DEFAULT_V@)
-GTK_DOC_V_XML_0=@echo " DOC Building XML";
-
-sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent xml/version.entities
- $(GTK_DOC_V_XML)_source_dir='' ; \
- for i in $(DOC_SOURCE_DIR) ; do \
- _source_dir="$${_source_dir} --source-dir=$$i" ; \
- done ; \
- gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
- $(AM_V_at)touch sgml-build.stamp
-
-sgml.stamp: sgml-build.stamp
- @true
-
-$(DOC_MAIN_SGML_FILE): sgml-build.stamp
- @true
-
-xml/gtkdocentities.ent: Makefile
- $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \
- echo "<!ENTITY package \"$(PACKAGE)\">"; \
- echo "<!ENTITY package_bugreport \"$(PACKAGE_BUGREPORT)\">"; \
- echo "<!ENTITY package_name \"$(PACKAGE_NAME)\">"; \
- echo "<!ENTITY package_string \"$(PACKAGE_STRING)\">"; \
- echo "<!ENTITY package_tarname \"$(PACKAGE_TARNAME)\">"; \
- echo "<!ENTITY package_url \"$(PACKAGE_URL)\">"; \
- echo "<!ENTITY package_version \"$(PACKAGE_VERSION)\">"; \
- ) > $@
-
-xml/version.entities: Makefile
- $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \
- echo "<!ENTITY ORC_MAJORMINOR \"$(ORC_MAJORMINOR)\">"; \
- echo "<!ENTITY ORC_VERSION \"$(PACKAGE_VERSION)\">"; \
- ) > $@
-
-#### html ####
-
-GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_@AM_V@)
-GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_@AM_DEFAULT_V@)
-GTK_DOC_V_HTML_0=@echo " DOC Building HTML";
-
-GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_@AM_V@)
-GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_@AM_DEFAULT_V@)
-GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references";
-
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
- $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
- mkhtml_options=""; \
- gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \
- if test "$$?" = "0"; then \
- if test "x$(V)" = "x1"; then \
- mkhtml_options="$$mkhtml_options --verbose"; \
- fi; \
- fi; \
- gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
- if test "$$?" = "0"; then \
- mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
- fi; \
- cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
- -@test "x$(HTML_IMAGES)" = "x" || \
- for file in $(HTML_IMAGES) ; do \
- test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
- test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \
- test -f $$file && cp $$file $(abs_builddir)/html; \
- done;
- $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
- $(AM_V_at)touch html-build.stamp
-
-#### pdf ####
-
-GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_@AM_V@)
-GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_@AM_DEFAULT_V@)
-GTK_DOC_V_PDF_0=@echo " DOC Building PDF";
-
-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
- $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
- mkpdf_options=""; \
- gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \
- if test "$$?" = "0"; then \
- if test "x$(V)" = "x1"; then \
- mkpdf_options="$$mkpdf_options --verbose"; \
- fi; \
- fi; \
- if test "x$(HTML_IMAGES)" != "x"; then \
- for img in $(HTML_IMAGES); do \
- part=`dirname $$img`; \
- echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \
- if test $$? != 0; then \
- mkpdf_options="$$mkpdf_options --imgdir=$$part"; \
- fi; \
- done; \
- fi; \
- gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
- $(AM_V_at)touch pdf-build.stamp
-
-##############
-
-clean-local:
- @rm -f *~ *.bak
- @rm -rf .libs
- @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
- rm -f $(DOC_MODULE).types; \
- fi
- @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
- rm -f $(DOC_MODULE)-sections.txt; \
- fi
-
-distclean-local:
- @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
- $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
- @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
- rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
- fi
-
-maintainer-clean-local:
- @rm -rf xml html
-
-install-data-local:
- @installfiles=`echo $(builddir)/html/*`; \
- if test "$$installfiles" = '$(builddir)/html/*'; \
- then echo 1>&2 'Nothing to install' ; \
- else \
- if test -n "$(DOC_MODULE_VERSION)"; then \
- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
- else \
- installdir="$(DESTDIR)$(TARGET_DIR)"; \
- fi; \
- $(mkinstalldirs) $${installdir} ; \
- for i in $$installfiles; do \
- echo ' $(INSTALL_DATA) '$$i ; \
- $(INSTALL_DATA) $$i $${installdir}; \
- done; \
- if test -n "$(DOC_MODULE_VERSION)"; then \
- mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
- fi; \
- $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
- fi
-
-uninstall-local:
- @if test -n "$(DOC_MODULE_VERSION)"; then \
- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
- else \
- installdir="$(DESTDIR)$(TARGET_DIR)"; \
- fi; \
- rm -rf $${installdir}
-
-#
-# Require gtk-doc when making dist
-#
-if HAVE_GTK_DOC
-dist-check-gtkdoc: docs
-else
-dist-check-gtkdoc:
- @echo "*** gtk-doc is needed to run 'make dist'. ***"
- @echo "*** gtk-doc was not found when 'configure' ran. ***"
- @echo "*** please install gtk-doc and rerun 'configure'. ***"
- @false
-endif
-
-dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
- @mkdir $(distdir)/html
- @cp ./html/* $(distdir)/html
- @-cp ./$(DOC_MODULE).pdf $(distdir)/
- @-cp ./$(DOC_MODULE).types $(distdir)/
- @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/
- @cd $(distdir) && rm -f $(DISTCLEANFILES)
- @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
-
-.PHONY : dist-hook-local docs
diff --git a/m4/ac_libtool_tags.m4 b/m4/ac_libtool_tags.m4
deleted file mode 100644
index d0ddb2e..0000000
--- a/m4/ac_libtool_tags.m4
+++ /dev/null
@@ -1,57 +0,0 @@
-
-# backported from libtool 1.6 by Paolo Bonzini
-# When AC_LIBTOOL_TAGS is used, I redefine _LT_AC_TAGCONFIG
-# to be more similar to the libtool 1.6 implementation, which
-# uses an m4 loop and m4 case instead of a shell loop. This
-# way the CXX/GCJ/F77/RC tests are not always expanded.
-
-# AC_LIBTOOL_TAGS
-# ---------------
-# tags to enable
-AC_DEFUN([AC_LIBTOOL_TAGS],
-[m4_define([_LT_TAGS],[$1])
-m4_define([_LT_AC_TAGCONFIG], [
- if test -f "$ltmain"; then
- if test ! -f "${ofile}"; then
- AC_MSG_WARN([output file `$ofile' does not exist])
- fi
-
- if test -z "$LTCC"; then
- eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
- if test -z "$LTCC"; then
- AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
- else
- AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
- fi
- fi
-
- AC_FOREACH([_LT_TAG], _LT_TAGS,
- [m4_case(_LT_TAG,
- [CXX], [
- if test -n "$CXX" && test "X$CXX" != "Xno"; then
- AC_LIBTOOL_LANG_CXX_CONFIG
- available_tags="$available_tags _LT_TAG"
- fi],
- [F77], [
- if test -n "$F77" && test "X$F77" != "Xno"; then
- AC_LIBTOOL_LANG_F77_CONFIG
- available_tags="$available_tags _LT_TAG"
- fi],
- [GCJ], [
- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
- AC_LIBTOOL_LANG_GCJ_CONFIG
- available_tags="$available_tags _LT_TAG"
- fi],
- [RC], [
- if test -n "$RC" && test "X$RC" != "Xno"; then
- AC_LIBTOOL_LANG_RC_CONFIG
- available_tags="$available_tags _LT_TAG"
- fi],
- [m4_errprintn(m4_location[: error: invalid tag name: ]"_LT_TAG")
- m4_exit(1)])
- ])
- fi
-
-])dnl _LT_AC_TAG_CONFIG
-])
-
diff --git a/m4/as-compiler-flag.m4 b/m4/as-compiler-flag.m4
deleted file mode 100644
index ebb2853..0000000
--- a/m4/as-compiler-flag.m4
+++ /dev/null
@@ -1,33 +0,0 @@
-dnl as-compiler-flag.m4 0.1.0
-
-dnl autostars m4 macro for detection of compiler flags
-
-dnl David Schleef <ds@schleef.org>
-
-dnl $Id: as-compiler-flag.m4,v 1.1 2004-08-20 22:25:22 ds Exp $
-
-dnl AS_COMPILER_FLAG(CFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED])
-dnl Tries to compile with the given CFLAGS.
-dnl Runs ACTION-IF-ACCEPTED if the compiler can compile with the flags,
-dnl and ACTION-IF-NOT-ACCEPTED otherwise.
-
-AC_DEFUN([AS_COMPILER_FLAG],
-[
- AC_MSG_CHECKING([to see if compiler understands $1])
-
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $1"
-
- AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no])
- CFLAGS="$save_CFLAGS"
-
- if test "X$flag_ok" = Xyes ; then
- $2
- true
- else
- $3
- true
- fi
- AC_MSG_RESULT([$flag_ok])
-])
-
diff --git a/m4/as-host-defines.m4 b/m4/as-host-defines.m4
deleted file mode 100644
index 4a6ae45..0000000
--- a/m4/as-host-defines.m4
+++ /dev/null
@@ -1,56 +0,0 @@
-dnl as-host-defines.m4 0.1.0
-
-dnl autostars m4 macro for generating defines for various host architectures
-
-dnl David Schleef <ds@schleef.org>
-
-dnl $Id: as-host-defines.m4,v 1.3 2007-08-22 20:55:24 uid2631 Exp $
-
-dnl AS_HOST_DEFINES()
-
-AC_DEFUN([AS_HOST_DEFINES],
-[
- case "x${host_cpu}" in
- xi?86 | xk?)
- HAVE_I386=yes
- AC_DEFINE(HAVE_I386, 1, [Defined if host is i386])
- ;;
- xx86_64|xamd64)
- HAVE_AMD64=yes
- AC_DEFINE(HAVE_AMD64, 1, [Defined if host is amd64])
- ;;
- xpowerpc|xppc|xpowerpc64*|xppc64*)
- HAVE_POWERPC=yes
- AC_DEFINE(HAVE_POWERPC, 1, [Defined if host is powerpc])
- ;;
- xarm*)
- HAVE_ARM=yes
- AC_DEFINE(HAVE_ARM, 1, [Defined if host is arm])
- ;;
- xmipsel*)
- HAVE_MIPSEL=yes
- AC_DEFINE(HAVE_MIPSEL, 1, [Defined if host is mipsel])
- esac
-
-AM_CONDITIONAL(HAVE_I386, test "x$HAVE_I386" = "xyes")
-AM_CONDITIONAL(HAVE_AMD64, test "x$HAVE_AMD64" = "xyes")
-AM_CONDITIONAL(HAVE_POWERPC, test "x$HAVE_POWERPC" = "xyes")
-AM_CONDITIONAL(HAVE_ARM, test "x$HAVE_ARM" = "xyes")
-AM_CONDITIONAL(HAVE_MIPSEL, test "x$HAVE_MIPSEL" = "xyes")
-
- case "${host_os}" in
- mingw*)
- HAVE_OS_WIN32=yes
- AC_DEFINE(HAVE_OS_WIN32, 1, [Defined if host OS is MS Windows])
- ;;
- linux*)
- HAVE_OS_LINUX=yes
- AC_DEFINE(HAVE_OS_LINUX, 1, [Defined if host OS is linux])
- ;;
- esac
-
-AM_CONDITIONAL(HAVE_OS_WIN32, test "$HAVE_OS_WIN32" = "yes")
-AM_CONDITIONAL(HAVE_OS_LINUX, test "$HAVE_OS_LINUX" = "yes")
-
-])
-
diff --git a/m4/as-nano.m4 b/m4/as-nano.m4
deleted file mode 100644
index 119666c..0000000
--- a/m4/as-nano.m4
+++ /dev/null
@@ -1,27 +0,0 @@
-dnl as-version.m4 0.1.0
-
-dnl autostars m4 macro for versioning (modified)
-
-dnl Thomas Vander Stichele <thomas at apestaart dot org>
-dnl David Schleef <ds@schleef.org>
-
-dnl $Id: as-nano.m4,v 1.2 2007-03-16 23:30:02 ds Exp $
-
-dnl AS_VERSION(ACTION-IF-NO-NANO, [ACTION-IF-NANO])
-
-AC_DEFUN([AS_NANO],
-[
- AC_MSG_CHECKING(nano version)
-
- NANO=$(echo AC_PACKAGE_VERSION | sed ['s/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.*//'])
- AC_SUBST(NANO)
-
- if test x"$NANO" = x || test "x$NANO" = "x0" ; then
- AC_MSG_RESULT([0 (release)])
- NANO=0
- ifelse([$1], , :, [$1])
- else
- AC_MSG_RESULT($NANO)
- ifelse([$2], , :, [$2])
- fi
-])
diff --git a/m4/ax_create_stdint_h.m4 b/m4/ax_create_stdint_h.m4
deleted file mode 100644
index 13bf699..0000000
--- a/m4/ax_create_stdint_h.m4
+++ /dev/null
@@ -1,734 +0,0 @@
-##### http://autoconf-archive.cryp.to/ax_create_stdint_h.html
-#
-# SYNOPSIS
-#
-# AX_CREATE_STDINT_H [( HEADER-TO-GENERATE [, HEDERS-TO-CHECK])]
-#
-# DESCRIPTION
-#
-# the "ISO C9X: 7.18 Integer types <stdint.h>" section requires the
-# existence of an include file <stdint.h> that defines a set of
-# typedefs, especially uint8_t,int32_t,uintptr_t. Many older
-# installations will not provide this file, but some will have the
-# very same definitions in <inttypes.h>. In other enviroments we can
-# use the inet-types in <sys/types.h> which would define the typedefs
-# int8_t and u_int8_t respectivly.
-#
-# This macros will create a local "_stdint.h" or the headerfile given
-# as an argument. In many cases that file will just "#include
-# <stdint.h>" or "#include <inttypes.h>", while in other environments
-# it will provide the set of basic 'stdint's definitions/typedefs:
-#
-# int8_t,uint8_t,int16_t,uint16_t,int32_t,uint32_t,intptr_t,uintptr_t
-# int_least32_t.. int_fast32_t.. intmax_t
-#
-# which may or may not rely on the definitions of other files, or
-# using the AC_CHECK_SIZEOF macro to determine the actual sizeof each
-# type.
-#
-# if your header files require the stdint-types you will want to
-# create an installable file mylib-int.h that all your other
-# installable header may include. So if you have a library package
-# named "mylib", just use
-#
-# AX_CREATE_STDINT_H(mylib-int.h)
-#
-# in configure.ac and go to install that very header file in
-# Makefile.am along with the other headers (mylib.h) - and the
-# mylib-specific headers can simply use "#include <mylib-int.h>" to
-# obtain the stdint-types.
-#
-# Remember, if the system already had a valid <stdint.h>, the
-# generated file will include it directly. No need for fuzzy
-# HAVE_STDINT_H things... (oops, GCC 4.2.x has deliberatly disabled
-# its stdint.h for non-c99 compilation and the c99-mode is not the
-# default. Therefore this macro will not use the compiler's stdint.h
-# - please complain to the GCC developers).
-#
-# LAST MODIFICATION
-#
-# 2007-06-27
-#
-# COPYLEFT
-#
-# Copyright (c) 2007 Guido U. Draheim <guidod@gmx.de>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-#
-# As a special exception, the respective Autoconf Macro's copyright
-# owner gives unlimited permission to copy, distribute and modify the
-# configure scripts that are the output of Autoconf when processing
-# the Macro. You need not follow the terms of the GNU General Public
-# License when using or distributing such scripts, even though
-# portions of the text of the Macro appear in them. The GNU General
-# Public License (GPL) does govern all other use of the material that
-# constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the
-# Autoconf Macro released by the Autoconf Macro Archive. When you
-# make and distribute a modified version of the Autoconf Macro, you
-# may extend this special exception to the GPL to apply to your
-# modified version as well.
-
-AC_DEFUN([AX_CHECK_DATA_MODEL],[
- AC_CHECK_SIZEOF(char)
- AC_CHECK_SIZEOF(short)
- AC_CHECK_SIZEOF(int)
- AC_CHECK_SIZEOF(long)
- AC_CHECK_SIZEOF(void*)
- ac_cv_char_data_model=""
- ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_char"
- ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_short"
- ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_int"
- ac_cv_long_data_model=""
- ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_int"
- ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_long"
- ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_voidp"
- AC_MSG_CHECKING([data model])
- case "$ac_cv_char_data_model/$ac_cv_long_data_model" in
- 122/242) ac_cv_data_model="IP16" ; n="standard 16bit machine" ;;
- 122/244) ac_cv_data_model="LP32" ; n="standard 32bit machine" ;;
- 122/*) ac_cv_data_model="i16" ; n="unusual int16 model" ;;
- 124/444) ac_cv_data_model="ILP32" ; n="standard 32bit unixish" ;;
- 124/488) ac_cv_data_model="LP64" ; n="standard 64bit unixish" ;;
- 124/448) ac_cv_data_model="LLP64" ; n="unusual 64bit unixish" ;;
- 124/*) ac_cv_data_model="i32" ; n="unusual int32 model" ;;
- 128/888) ac_cv_data_model="ILP64" ; n="unusual 64bit numeric" ;;
- 128/*) ac_cv_data_model="i64" ; n="unusual int64 model" ;;
- 222/*2) ac_cv_data_model="DSP16" ; n="strict 16bit dsptype" ;;
- 333/*3) ac_cv_data_model="DSP24" ; n="strict 24bit dsptype" ;;
- 444/*4) ac_cv_data_model="DSP32" ; n="strict 32bit dsptype" ;;
- 666/*6) ac_cv_data_model="DSP48" ; n="strict 48bit dsptype" ;;
- 888/*8) ac_cv_data_model="DSP64" ; n="strict 64bit dsptype" ;;
- 222/*|333/*|444/*|666/*|888/*) :
- ac_cv_data_model="iDSP" ; n="unusual dsptype" ;;
- *) ac_cv_data_model="none" ; n="very unusual model" ;;
- esac
- AC_MSG_RESULT([$ac_cv_data_model ($ac_cv_long_data_model, $n)])
-])
-
-dnl AX_CHECK_HEADER_STDINT_X([HEADERLIST][,ACTION-IF])
-AC_DEFUN([AX_CHECK_HEADER_STDINT_X],[
-AC_CACHE_CHECK([for stdint uintptr_t], [ac_cv_header_stdint_x],[
- ac_cv_header_stdint_x="" # the 1997 typedefs (inttypes.h)
- AC_MSG_RESULT([(..)])
- for i in m4_ifval([$1],[$1],[stdint.h inttypes.h sys/inttypes.h sys/types.h])
- do
- unset ac_cv_type_uintptr_t
- unset ac_cv_type_uint64_t
- AC_CHECK_TYPE(uintptr_t,[ac_cv_header_stdint_x=$i],continue,[#include <$i>])
- AC_CHECK_TYPE(uint64_t,[and64="/uint64_t"],[and64=""],[#include<$i>])
- m4_ifvaln([$2],[$2]) break
- done
- AC_MSG_CHECKING([for stdint uintptr_t])
- ])
-])
-
-AC_DEFUN([AX_CHECK_HEADER_STDINT_O],[
-AC_CACHE_CHECK([for stdint uint32_t], [ac_cv_header_stdint_o],[
- ac_cv_header_stdint_o="" # the 1995 typedefs (sys/inttypes.h)
- AC_MSG_RESULT([(..)])
- for i in m4_ifval([$1],[$1],[inttypes.h sys/inttypes.h sys/types.h stdint.h])
- do
- unset ac_cv_type_uint32_t
- unset ac_cv_type_uint64_t
- AC_CHECK_TYPE(uint32_t,[ac_cv_header_stdint_o=$i],continue,[#include <$i>])
- AC_CHECK_TYPE(uint64_t,[and64="/uint64_t"],[and64=""],[#include<$i>])
- m4_ifvaln([$2],[$2]) break
- break;
- done
- AC_MSG_CHECKING([for stdint uint32_t])
- ])
-])
-
-AC_DEFUN([AX_CHECK_HEADER_STDINT_U],[
-AC_CACHE_CHECK([for stdint u_int32_t], [ac_cv_header_stdint_u],[
- ac_cv_header_stdint_u="" # the BSD typedefs (sys/types.h)
- AC_MSG_RESULT([(..)])
- for i in m4_ifval([$1],[$1],[sys/types.h inttypes.h sys/inttypes.h]) ; do
- unset ac_cv_type_u_int32_t
- unset ac_cv_type_u_int64_t
- AC_CHECK_TYPE(u_int32_t,[ac_cv_header_stdint_u=$i],continue,[#include <$i>])
- AC_CHECK_TYPE(u_int64_t,[and64="/u_int64_t"],[and64=""],[#include<$i>])
- m4_ifvaln([$2],[$2]) break
- break;
- done
- AC_MSG_CHECKING([for stdint u_int32_t])
- ])
-])
-
-AC_DEFUN([AX_CREATE_STDINT_H],
-[# ------ AX CREATE STDINT H -------------------------------------
-AC_MSG_CHECKING([for stdint types])
-ac_stdint_h=`echo ifelse($1, , _stdint.h, $1)`
-# try to shortcircuit - if the default include path of the compiler
-# can find a "stdint.h" header then we assume that all compilers can.
-AC_CACHE_VAL([ac_cv_header_stdint_t],[
-old_CXXFLAGS="$CXXFLAGS" ; CXXFLAGS=""
-old_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS=""
-old_CFLAGS="$CFLAGS" ; CFLAGS=""
-AC_TRY_COMPILE([#include <stdint.h>],[int_least32_t v = 0;],
-[ac_cv_stdint_result="(assuming C99 compatible system)"
- ac_cv_header_stdint_t="stdint.h"; ],
-[ac_cv_header_stdint_t=""])
-if test "$GCC" = "yes" && test ".$ac_cv_header_stdint_t" = "."; then
-CFLAGS="-std=c99"
-AC_TRY_COMPILE([#include <stdint.h>],[int_least32_t v = 0;],
-[AC_MSG_WARN(your GCC compiler has a defunct stdint.h for its default-mode)])
-fi
-CXXFLAGS="$old_CXXFLAGS"
-CPPFLAGS="$old_CPPFLAGS"
-CFLAGS="$old_CFLAGS" ])
-
-v="... $ac_cv_header_stdint_h"
-if test "$ac_stdint_h" = "stdint.h" ; then
- AC_MSG_RESULT([(are you sure you want them in ./stdint.h?)])
-elif test "$ac_stdint_h" = "inttypes.h" ; then
- AC_MSG_RESULT([(are you sure you want them in ./inttypes.h?)])
-elif test "_$ac_cv_header_stdint_t" = "_" ; then
- AC_MSG_RESULT([(putting them into $ac_stdint_h)$v])
-else
- ac_cv_header_stdint="$ac_cv_header_stdint_t"
- AC_MSG_RESULT([$ac_cv_header_stdint (shortcircuit)])
-fi
-
-if test "_$ac_cv_header_stdint_t" = "_" ; then # can not shortcircuit..
-
-dnl .....intro message done, now do a few system checks.....
-dnl btw, all old CHECK_TYPE macros do automatically "DEFINE" a type,
-dnl therefore we use the autoconf implementation detail CHECK_TYPE_NEW
-dnl instead that is triggered with 3 or more arguments (see types.m4)
-
-inttype_headers=`echo $2 | sed -e 's/,/ /g'`
-
-ac_cv_stdint_result="(no helpful system typedefs seen)"
-AX_CHECK_HEADER_STDINT_X(dnl
- stdint.h inttypes.h sys/inttypes.h $inttype_headers,
- ac_cv_stdint_result="(seen uintptr_t$and64 in $i)")
-
-if test "_$ac_cv_header_stdint_x" = "_" ; then
-AX_CHECK_HEADER_STDINT_O(dnl,
- inttypes.h sys/inttypes.h stdint.h $inttype_headers,
- ac_cv_stdint_result="(seen uint32_t$and64 in $i)")
-fi
-
-if test "_$ac_cv_header_stdint_x" = "_" ; then
-if test "_$ac_cv_header_stdint_o" = "_" ; then
-AX_CHECK_HEADER_STDINT_U(dnl,
- sys/types.h inttypes.h sys/inttypes.h $inttype_headers,
- ac_cv_stdint_result="(seen u_int32_t$and64 in $i)")
-fi fi
-
-dnl if there was no good C99 header file, do some typedef checks...
-if test "_$ac_cv_header_stdint_x" = "_" ; then
- AC_MSG_CHECKING([for stdint datatype model])
- AC_MSG_RESULT([(..)])
- AX_CHECK_DATA_MODEL
-fi
-
-if test "_$ac_cv_header_stdint_x" != "_" ; then
- ac_cv_header_stdint="$ac_cv_header_stdint_x"
-elif test "_$ac_cv_header_stdint_o" != "_" ; then
- ac_cv_header_stdint="$ac_cv_header_stdint_o"
-elif test "_$ac_cv_header_stdint_u" != "_" ; then
- ac_cv_header_stdint="$ac_cv_header_stdint_u"
-else
- ac_cv_header_stdint="stddef.h"
-fi
-
-AC_MSG_CHECKING([for extra inttypes in chosen header])
-AC_MSG_RESULT([($ac_cv_header_stdint)])
-dnl see if int_least and int_fast types are present in _this_ header.
-unset ac_cv_type_int_least32_t
-unset ac_cv_type_int_fast32_t
-AC_CHECK_TYPE(int_least32_t,,,[#include <$ac_cv_header_stdint>])
-AC_CHECK_TYPE(int_fast32_t,,,[#include<$ac_cv_header_stdint>])
-AC_CHECK_TYPE(intmax_t,,,[#include <$ac_cv_header_stdint>])
-
-fi # shortcircut to system "stdint.h"
-# ------------------ PREPARE VARIABLES ------------------------------
-if test "$GCC" = "yes" ; then
-ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1`
-else
-ac_cv_stdint_message="using $CC"
-fi
-
-AC_MSG_RESULT([make use of $ac_cv_header_stdint in $ac_stdint_h dnl
-$ac_cv_stdint_result])
-
-dnl -----------------------------------------------------------------
-# ----------------- DONE inttypes.h checks START header -------------
-AC_CONFIG_COMMANDS([$ac_stdint_h],[
-AC_MSG_NOTICE(creating $ac_stdint_h : $_ac_stdint_h)
-ac_stdint=$tmp/_stdint.h
-
-echo "#ifndef" $_ac_stdint_h >$ac_stdint
-echo "#define" $_ac_stdint_h "1" >>$ac_stdint
-echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint
-echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint
-echo "/* generated $ac_cv_stdint_message */" >>$ac_stdint
-if test "_$ac_cv_header_stdint_t" != "_" ; then
-echo "#define _STDINT_HAVE_STDINT_H" "1" >>$ac_stdint
-echo "#include <stdint.h>" >>$ac_stdint
-echo "#endif" >>$ac_stdint
-echo "#endif" >>$ac_stdint
-else
-
-cat >>$ac_stdint <<STDINT_EOF
-
-/* ................... shortcircuit part ........................... */
-
-#if defined HAVE_STDINT_H || defined _STDINT_HAVE_STDINT_H
-#include <stdint.h>
-#else
-#include <stddef.h>
-
-/* .................... configured part ............................ */
-
-STDINT_EOF
-
-echo "/* whether we have a C99 compatible stdint header file */" >>$ac_stdint
-if test "_$ac_cv_header_stdint_x" != "_" ; then
- ac_header="$ac_cv_header_stdint_x"
- echo "#define _STDINT_HEADER_INTPTR" '"'"$ac_header"'"' >>$ac_stdint
-else
- echo "/* #undef _STDINT_HEADER_INTPTR */" >>$ac_stdint
-fi
-
-echo "/* whether we have a C96 compatible inttypes header file */" >>$ac_stdint
-if test "_$ac_cv_header_stdint_o" != "_" ; then
- ac_header="$ac_cv_header_stdint_o"
- echo "#define _STDINT_HEADER_UINT32" '"'"$ac_header"'"' >>$ac_stdint
-else
- echo "/* #undef _STDINT_HEADER_UINT32 */" >>$ac_stdint
-fi
-
-echo "/* whether we have a BSD compatible inet types header */" >>$ac_stdint
-if test "_$ac_cv_header_stdint_u" != "_" ; then
- ac_header="$ac_cv_header_stdint_u"
- echo "#define _STDINT_HEADER_U_INT32" '"'"$ac_header"'"' >>$ac_stdint
-else
- echo "/* #undef _STDINT_HEADER_U_INT32 */" >>$ac_stdint
-fi
-
-echo "" >>$ac_stdint
-
-if test "_$ac_header" != "_" ; then if test "$ac_header" != "stddef.h" ; then
- echo "#include <$ac_header>" >>$ac_stdint
- echo "" >>$ac_stdint
-fi fi
-
-echo "/* which 64bit typedef has been found */" >>$ac_stdint
-if test "$ac_cv_type_uint64_t" = "yes" ; then
-echo "#define _STDINT_HAVE_UINT64_T" "1" >>$ac_stdint
-else
-echo "/* #undef _STDINT_HAVE_UINT64_T */" >>$ac_stdint
-fi
-if test "$ac_cv_type_u_int64_t" = "yes" ; then
-echo "#define _STDINT_HAVE_U_INT64_T" "1" >>$ac_stdint
-else
-echo "/* #undef _STDINT_HAVE_U_INT64_T */" >>$ac_stdint
-fi
-echo "" >>$ac_stdint
-
-echo "/* which type model has been detected */" >>$ac_stdint
-if test "_$ac_cv_char_data_model" != "_" ; then
-echo "#define _STDINT_CHAR_MODEL" "$ac_cv_char_data_model" >>$ac_stdint
-echo "#define _STDINT_LONG_MODEL" "$ac_cv_long_data_model" >>$ac_stdint
-else
-echo "/* #undef _STDINT_CHAR_MODEL // skipped */" >>$ac_stdint
-echo "/* #undef _STDINT_LONG_MODEL // skipped */" >>$ac_stdint
-fi
-echo "" >>$ac_stdint
-
-echo "/* whether int_least types were detected */" >>$ac_stdint
-if test "$ac_cv_type_int_least32_t" = "yes"; then
-echo "#define _STDINT_HAVE_INT_LEAST32_T" "1" >>$ac_stdint
-else
-echo "/* #undef _STDINT_HAVE_INT_LEAST32_T */" >>$ac_stdint
-fi
-echo "/* whether int_fast types were detected */" >>$ac_stdint
-if test "$ac_cv_type_int_fast32_t" = "yes"; then
-echo "#define _STDINT_HAVE_INT_FAST32_T" "1" >>$ac_stdint
-else
-echo "/* #undef _STDINT_HAVE_INT_FAST32_T */" >>$ac_stdint
-fi
-echo "/* whether intmax_t type was detected */" >>$ac_stdint
-if test "$ac_cv_type_intmax_t" = "yes"; then
-echo "#define _STDINT_HAVE_INTMAX_T" "1" >>$ac_stdint
-else
-echo "/* #undef _STDINT_HAVE_INTMAX_T */" >>$ac_stdint
-fi
-echo "" >>$ac_stdint
-
- cat >>$ac_stdint <<STDINT_EOF
-/* .................... detections part ............................ */
-
-/* whether we need to define bitspecific types from compiler base types */
-#ifndef _STDINT_HEADER_INTPTR
-#ifndef _STDINT_HEADER_UINT32
-#ifndef _STDINT_HEADER_U_INT32
-#define _STDINT_NEED_INT_MODEL_T
-#else
-#define _STDINT_HAVE_U_INT_TYPES
-#endif
-#endif
-#endif
-
-#ifdef _STDINT_HAVE_U_INT_TYPES
-#undef _STDINT_NEED_INT_MODEL_T
-#endif
-
-#ifdef _STDINT_CHAR_MODEL
-#if _STDINT_CHAR_MODEL+0 == 122 || _STDINT_CHAR_MODEL+0 == 124
-#ifndef _STDINT_BYTE_MODEL
-#define _STDINT_BYTE_MODEL 12
-#endif
-#endif
-#endif
-
-#ifndef _STDINT_HAVE_INT_LEAST32_T
-#define _STDINT_NEED_INT_LEAST_T
-#endif
-
-#ifndef _STDINT_HAVE_INT_FAST32_T
-#define _STDINT_NEED_INT_FAST_T
-#endif
-
-#ifndef _STDINT_HEADER_INTPTR
-#define _STDINT_NEED_INTPTR_T
-#ifndef _STDINT_HAVE_INTMAX_T
-#define _STDINT_NEED_INTMAX_T
-#endif
-#endif
-
-
-/* .................... definition part ............................ */
-
-/* some system headers have good uint64_t */
-#ifndef _HAVE_UINT64_T
-#if defined _STDINT_HAVE_UINT64_T || defined HAVE_UINT64_T
-#define _HAVE_UINT64_T
-#elif defined _STDINT_HAVE_U_INT64_T || defined HAVE_U_INT64_T
-#define _HAVE_UINT64_T
-typedef u_int64_t uint64_t;
-#endif
-#endif
-
-#ifndef _HAVE_UINT64_T
-/* .. here are some common heuristics using compiler runtime specifics */
-#if defined __STDC_VERSION__ && defined __STDC_VERSION__ >= 199901L
-#define _HAVE_UINT64_T
-#define _HAVE_LONGLONG_UINT64_T
-typedef long long int64_t;
-typedef unsigned long long uint64_t;
-
-#elif !defined __STRICT_ANSI__
-#if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
-#define _HAVE_UINT64_T
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-
-#elif defined __GNUC__ || defined __MWERKS__ || defined __ELF__
-/* note: all ELF-systems seem to have loff-support which needs 64-bit */
-#if !defined _NO_LONGLONG
-#define _HAVE_UINT64_T
-#define _HAVE_LONGLONG_UINT64_T
-typedef long long int64_t;
-typedef unsigned long long uint64_t;
-#endif
-
-#elif defined __alpha || (defined __mips && defined _ABIN32)
-#if !defined _NO_LONGLONG
-typedef long int64_t;
-typedef unsigned long uint64_t;
-#endif
- /* compiler/cpu type to define int64_t */
-#endif
-#endif
-#endif
-
-#if defined _STDINT_HAVE_U_INT_TYPES
-/* int8_t int16_t int32_t defined by inet code, redeclare the u_intXX types */
-typedef u_int8_t uint8_t;
-typedef u_int16_t uint16_t;
-typedef u_int32_t uint32_t;
-
-/* glibc compatibility */
-#ifndef __int8_t_defined
-#define __int8_t_defined
-#endif
-#endif
-
-#ifdef _STDINT_NEED_INT_MODEL_T
-/* we must guess all the basic types. Apart from byte-adressable system, */
-/* there a few 32-bit-only dsp-systems that we guard with BYTE_MODEL 8-} */
-/* (btw, those nibble-addressable systems are way off, or so we assume) */
-
-dnl /* have a look at "64bit and data size neutrality" at */
-dnl /* http://unix.org/version2/whatsnew/login_64bit.html */
-dnl /* (the shorthand "ILP" types always have a "P" part) */
-
-#if defined _STDINT_BYTE_MODEL
-#if _STDINT_LONG_MODEL+0 == 242
-/* 2:4:2 = IP16 = a normal 16-bit system */
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned long uint32_t;
-#ifndef __int8_t_defined
-#define __int8_t_defined
-typedef char int8_t;
-typedef short int16_t;
-typedef long int32_t;
-#endif
-#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL == 444
-/* 2:4:4 = LP32 = a 32-bit system derived from a 16-bit */
-/* 4:4:4 = ILP32 = a normal 32-bit system */
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-#ifndef __int8_t_defined
-#define __int8_t_defined
-typedef char int8_t;
-typedef short int16_t;
-typedef int int32_t;
-#endif
-#elif _STDINT_LONG_MODEL+0 == 484 || _STDINT_LONG_MODEL+0 == 488
-/* 4:8:4 = IP32 = a 32-bit system prepared for 64-bit */
-/* 4:8:8 = LP64 = a normal 64-bit system */
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-#ifndef __int8_t_defined
-#define __int8_t_defined
-typedef char int8_t;
-typedef short int16_t;
-typedef int int32_t;
-#endif
-/* this system has a "long" of 64bit */
-#ifndef _HAVE_UINT64_T
-#define _HAVE_UINT64_T
-typedef unsigned long uint64_t;
-typedef long int64_t;
-#endif
-#elif _STDINT_LONG_MODEL+0 == 448
-/* LLP64 a 64-bit system derived from a 32-bit system */
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-#ifndef __int8_t_defined
-#define __int8_t_defined
-typedef char int8_t;
-typedef short int16_t;
-typedef int int32_t;
-#endif
-/* assuming the system has a "long long" */
-#ifndef _HAVE_UINT64_T
-#define _HAVE_UINT64_T
-#define _HAVE_LONGLONG_UINT64_T
-typedef unsigned long long uint64_t;
-typedef long long int64_t;
-#endif
-#else
-#define _STDINT_NO_INT32_T
-#endif
-#else
-#define _STDINT_NO_INT8_T
-#define _STDINT_NO_INT32_T
-#endif
-#endif
-
-/*
- * quote from SunOS-5.8 sys/inttypes.h:
- * Use at your own risk. As of February 1996, the committee is squarely
- * behind the fixed sized types; the "least" and "fast" types are still being
- * discussed. The probability that the "fast" types may be removed before
- * the standard is finalized is high enough that they are not currently
- * implemented.
- */
-
-#if defined _STDINT_NEED_INT_LEAST_T
-typedef int8_t int_least8_t;
-typedef int16_t int_least16_t;
-typedef int32_t int_least32_t;
-#ifdef _HAVE_UINT64_T
-typedef int64_t int_least64_t;
-#endif
-
-typedef uint8_t uint_least8_t;
-typedef uint16_t uint_least16_t;
-typedef uint32_t uint_least32_t;
-#ifdef _HAVE_UINT64_T
-typedef uint64_t uint_least64_t;
-#endif
- /* least types */
-#endif
-
-#if defined _STDINT_NEED_INT_FAST_T
-typedef int8_t int_fast8_t;
-typedef int int_fast16_t;
-typedef int32_t int_fast32_t;
-#ifdef _HAVE_UINT64_T
-typedef int64_t int_fast64_t;
-#endif
-
-typedef uint8_t uint_fast8_t;
-typedef unsigned uint_fast16_t;
-typedef uint32_t uint_fast32_t;
-#ifdef _HAVE_UINT64_T
-typedef uint64_t uint_fast64_t;
-#endif
- /* fast types */
-#endif
-
-#ifdef _STDINT_NEED_INTMAX_T
-#ifdef _HAVE_UINT64_T
-typedef int64_t intmax_t;
-typedef uint64_t uintmax_t;
-#else
-typedef long intmax_t;
-typedef unsigned long uintmax_t;
-#endif
-#endif
-
-#ifdef _STDINT_NEED_INTPTR_T
-#ifndef __intptr_t_defined
-#define __intptr_t_defined
-/* we encourage using "long" to store pointer values, never use "int" ! */
-#if _STDINT_LONG_MODEL+0 == 242 || _STDINT_LONG_MODEL+0 == 484
-typedef unsigned int uintptr_t;
-typedef int intptr_t;
-#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL+0 == 444
-typedef unsigned long uintptr_t;
-typedef long intptr_t;
-#elif _STDINT_LONG_MODEL+0 == 448 && defined _HAVE_UINT64_T
-typedef uint64_t uintptr_t;
-typedef int64_t intptr_t;
-#else /* matches typical system types ILP32 and LP64 - but not IP16 or LLP64 */
-typedef unsigned long uintptr_t;
-typedef long intptr_t;
-#endif
-#endif
-#endif
-
-/* The ISO C99 standard specifies that in C++ implementations these
- should only be defined if explicitly requested. */
-#if !defined __cplusplus || defined __STDC_CONSTANT_MACROS
-#ifndef UINT32_C
-
-/* Signed. */
-# define INT8_C(c) c
-# define INT16_C(c) c
-# define INT32_C(c) c
-# ifdef _HAVE_LONGLONG_UINT64_T
-# define INT64_C(c) c ## L
-# else
-# define INT64_C(c) c ## LL
-# endif
-
-/* Unsigned. */
-# define UINT8_C(c) c ## U
-# define UINT16_C(c) c ## U
-# define UINT32_C(c) c ## U
-# ifdef _HAVE_LONGLONG_UINT64_T
-# define UINT64_C(c) c ## UL
-# else
-# define UINT64_C(c) c ## ULL
-# endif
-
-/* Maximal type. */
-# ifdef _HAVE_LONGLONG_UINT64_T
-# define INTMAX_C(c) c ## L
-# define UINTMAX_C(c) c ## UL
-# else
-# define INTMAX_C(c) c ## LL
-# define UINTMAX_C(c) c ## ULL
-# endif
-
- /* literalnumbers */
-#endif
-#endif
-
-/* These limits are merily those of a two complement byte-oriented system */
-
-/* Minimum of signed integral types. */
-# define INT8_MIN (-128)
-# define INT16_MIN (-32767-1)
-# define INT32_MIN (-2147483647-1)
-# define INT64_MIN (-__INT64_C(9223372036854775807)-1)
-/* Maximum of signed integral types. */
-# define INT8_MAX (127)
-# define INT16_MAX (32767)
-# define INT32_MAX (2147483647)
-# define INT64_MAX (__INT64_C(9223372036854775807))
-
-/* Maximum of unsigned integral types. */
-# define UINT8_MAX (255)
-# define UINT16_MAX (65535)
-# define UINT32_MAX (4294967295U)
-# define UINT64_MAX (__UINT64_C(18446744073709551615))
-
-/* Minimum of signed integral types having a minimum size. */
-# define INT_LEAST8_MIN INT8_MIN
-# define INT_LEAST16_MIN INT16_MIN
-# define INT_LEAST32_MIN INT32_MIN
-# define INT_LEAST64_MIN INT64_MIN
-/* Maximum of signed integral types having a minimum size. */
-# define INT_LEAST8_MAX INT8_MAX
-# define INT_LEAST16_MAX INT16_MAX
-# define INT_LEAST32_MAX INT32_MAX
-# define INT_LEAST64_MAX INT64_MAX
-
-/* Maximum of unsigned integral types having a minimum size. */
-# define UINT_LEAST8_MAX UINT8_MAX
-# define UINT_LEAST16_MAX UINT16_MAX
-# define UINT_LEAST32_MAX UINT32_MAX
-# define UINT_LEAST64_MAX UINT64_MAX
-
- /* shortcircuit*/
-#endif
- /* once */
-#endif
-#endif
-STDINT_EOF
-fi
- if cmp -s $ac_stdint_h $ac_stdint 2>/dev/null; then
- AC_MSG_NOTICE([$ac_stdint_h is unchanged])
- else
- ac_dir=`AS_DIRNAME(["$ac_stdint_h"])`
- AS_MKDIR_P(["$ac_dir"])
- rm -f $ac_stdint_h
- mv $ac_stdint $ac_stdint_h
- fi
-],[# variables for create stdint.h replacement
-PACKAGE="$PACKAGE"
-VERSION="$VERSION"
-ac_stdint_h="$ac_stdint_h"
-_ac_stdint_h=AS_TR_CPP(_$PACKAGE-$ac_stdint_h)
-ac_cv_stdint_message="$ac_cv_stdint_message"
-ac_cv_header_stdint_t="$ac_cv_header_stdint_t"
-ac_cv_header_stdint_x="$ac_cv_header_stdint_x"
-ac_cv_header_stdint_o="$ac_cv_header_stdint_o"
-ac_cv_header_stdint_u="$ac_cv_header_stdint_u"
-ac_cv_type_uint64_t="$ac_cv_type_uint64_t"
-ac_cv_type_u_int64_t="$ac_cv_type_u_int64_t"
-ac_cv_char_data_model="$ac_cv_char_data_model"
-ac_cv_long_data_model="$ac_cv_long_data_model"
-ac_cv_type_int_least32_t="$ac_cv_type_int_least32_t"
-ac_cv_type_int_fast32_t="$ac_cv_type_int_fast32_t"
-ac_cv_type_intmax_t="$ac_cv_type_intmax_t"
-])
-])
diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4
deleted file mode 100644
index 3675543..0000000
--- a/m4/gtk-doc.m4
+++ /dev/null
@@ -1,88 +0,0 @@
-dnl -*- mode: autoconf -*-
-
-# serial 2
-
-dnl Usage:
-dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
-AC_DEFUN([GTK_DOC_CHECK],
-[
- AC_REQUIRE([PKG_PROG_PKG_CONFIG])
- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-
- ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"])
- AC_MSG_CHECKING([for gtk-doc])
- PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no])
- AC_MSG_RESULT($have_gtk_doc)
-
- if test "$have_gtk_doc" = "no"; then
- AC_MSG_WARN([
- You will not be able to create source packages with 'make dist'
- because $gtk_doc_requires is not found.])
- fi
-
- dnl check for tools we added during development
- dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that
- dnl may not be writable by the user. Currently, automake requires that the
- dnl test name must end in '.test'.
- dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638
- AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test])
- AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check])
- AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
- AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
-
- dnl for overriding the documentation installation directory
- AC_ARG_WITH([html-dir],
- AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
- [with_html_dir='${datadir}/gtk-doc/html'])
- HTML_DIR="$with_html_dir"
- AC_SUBST([HTML_DIR])
-
- dnl enable/disable documentation building
- AC_ARG_ENABLE([gtk-doc],
- AS_HELP_STRING([--enable-gtk-doc],
- [use gtk-doc to build documentation [[default=no]]]),,
- [enable_gtk_doc=no])
-
- AC_MSG_CHECKING([whether to build gtk-doc documentation])
- AC_MSG_RESULT($enable_gtk_doc)
-
- if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then
- AC_MSG_ERROR([
- You must have $gtk_doc_requires installed to build documentation for
- $PACKAGE_NAME. Please install gtk-doc or disable building the
- documentation by adding '--disable-gtk-doc' to '[$]0'.])
- fi
-
- dnl don't check for glib if we build glib
- if test "x$PACKAGE_NAME" != "xglib"; then
- dnl don't fail if someone does not have glib
- PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:])
- fi
-
- dnl enable/disable output formats
- AC_ARG_ENABLE([gtk-doc-html],
- AS_HELP_STRING([--enable-gtk-doc-html],
- [build documentation in html format [[default=yes]]]),,
- [enable_gtk_doc_html=yes])
- AC_ARG_ENABLE([gtk-doc-pdf],
- AS_HELP_STRING([--enable-gtk-doc-pdf],
- [build documentation in pdf format [[default=no]]]),,
- [enable_gtk_doc_pdf=no])
-
- if test -z "$GTKDOC_MKPDF"; then
- enable_gtk_doc_pdf=no
- fi
-
- if test -z "$AM_DEFAULT_VERBOSITY"; then
- AM_DEFAULT_VERBOSITY=1
- fi
- AC_SUBST([AM_DEFAULT_VERBOSITY])
-
- AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes])
- AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
- AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
- AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
- AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
- AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
-])
diff --git a/m4/pkg.m4 b/m4/pkg.m4
deleted file mode 100644
index c5b26b5..0000000
--- a/m4/pkg.m4
+++ /dev/null
@@ -1,214 +0,0 @@
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-#
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=m4_default([$1], [0.9.0])
- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- PKG_CONFIG=""
- fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists. Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
- m4_default([$2], [:])
-m4_ifvaln([$3], [else
- $3])dnl
-fi])
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes ],
- [pkg_failed=yes])
- else
- pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
- AC_MSG_RESULT([no])
- _PKG_SHORT_ERRORS_SUPPORTED
- if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
- else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
- m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])[]dnl
- ])
-elif test $pkg_failed = untried; then
- AC_MSG_RESULT([no])
- m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
- ])
-else
- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
- AC_MSG_RESULT([yes])
- $3
-fi[]dnl
-])# PKG_CHECK_MODULES
-
-
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
-AC_DEFUN([PKG_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-m4_pushdef([pkg_description],
- [pkg-config installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([pkgconfigdir],
- [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
- [with_pkgconfigdir=]pkg_default)
-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
-
-
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
-AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-m4_pushdef([pkg_description],
- [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([noarch-pkgconfigdir],
- [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
- [with_noarch_pkgconfigdir=]pkg_default)
-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
-
-
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
-AC_DEFUN([PKG_CHECK_VAR],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-
-_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-AS_VAR_COPY([$1], [pkg_cv_][$1])
-
-AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
diff --git a/orc-test-uninstalled.pc.in b/orc-test-uninstalled.pc.in
deleted file mode 100644
index 6c1c649..0000000
--- a/orc-test-uninstalled.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=
-exec_prefix=
-libdir=${pcfiledir}/orc-test/.libs
-includedir=${pcfiledir}/
-
-Name: orc-@ORC_MAJORMINOR@ uninstalled
-Description: Test Library of Optimized Inner Loops Runtime Compiler
-Version: @VERSION@
-Requires: orc-@ORC_MAJORMINOR@
-Libs: -L${libdir} -lorc-test-@ORC_MAJORMINOR@ @LIBM@ @LIBRT@
-Cflags: -I${includedir}
diff --git a/orc-test/Makefile.am b/orc-test/Makefile.am
deleted file mode 100644
index 78554cf..0000000
--- a/orc-test/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-pkgincludedir = $(includedir)/orc-@ORC_MAJORMINOR@/orc-test
-
-lib_LTLIBRARIES = liborc-test-@ORC_MAJORMINOR@.la
-
-liborc_test_@ORC_MAJORMINOR@_la_LIBADD = $(ORC_LIBS)
-liborc_test_@ORC_MAJORMINOR@_la_LDFLAGS = $(ORC_LDFLAGS)
-liborc_test_@ORC_MAJORMINOR@_la_CFLAGS = $(ORC_CFLAGS) \
- -DBUILDING_ORC_TEST \
- -DORC_ENABLE_UNSTABLE_API
-
-liborc_test_@ORC_MAJORMINOR@_la_SOURCES = \
- orctest.c \
- orcarray.c \
- orcrandom.c \
- orcprofile.c
-
-pkginclude_HEADERS = \
- orctest.h \
- orcarray.h \
- orcrandom.h \
- orcprofile.h
-
diff --git a/orc-uninstalled.pc.in b/orc-uninstalled.pc.in
deleted file mode 100644
index 71a51e1..0000000
--- a/orc-uninstalled.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=
-exec_prefix=
-libdir=${pcfiledir}/orc/.libs
-libtestdir=${pcfiledir}/orc-test/.libs
-includedir=${pcfiledir}/
-
-Name: orc-@ORC_MAJORMINOR@ uninstalled
-Description: Library of Optimized Inner Loops Runtime Compiler
-Version: @VERSION@
-Libs: -L${libdir} -L${libtestdir} -lorc-@ORC_MAJORMINOR@ @LIBM@ @LIBRT@
-Cflags: -I${includedir}
-
-orcc=${pcfiledir}/tools/orcc@EXEEXT@
diff --git a/orc/Makefile.am b/orc/Makefile.am
deleted file mode 100644
index 16b2541..0000000
--- a/orc/Makefile.am
+++ /dev/null
@@ -1,135 +0,0 @@
-
-pkgincludedir = $(includedir)/orc-@ORC_MAJORMINOR@/orc
-
-lib_LTLIBRARIES = liborc-@ORC_MAJORMINOR@.la
-
-liborc_@ORC_MAJORMINOR@_la_LIBADD = $(LIBM) $(LIBRT) $(PTHREAD_LIBS) $(LIBLOG)
-liborc_@ORC_MAJORMINOR@_la_LDFLAGS = $(ORC_LDFLAGS)
-liborc_@ORC_MAJORMINOR@_la_CFLAGS = $(ORC_CFLAGS) \
- -DBUILDING_ORC \
- -DORC_ENABLE_UNSTABLE_API
-
-liborc_@ORC_MAJORMINOR@_la_SOURCES = \
- orc.c \
- orcbytecode.c \
- orcemulateopcodes.c \
- orcexecutor.c \
- orcfunctions.c \
- orcutils.c \
- orcrule.c \
- orccodemem.c \
- orcprogram.c \
- orccompiler.c \
- orcprogram-c.c \
- orcprogram.h \
- orcopcodes.c \
- orcparse.c \
- orconce.c \
- orcdebug.c \
- orccode.c
-
-if ENABLE_BACKEND_SSE
-liborc_@ORC_MAJORMINOR@_la_SOURCES += orcsse.c orcrules-sse.c orcprogram-sse.c
-liborc_@ORC_MAJORMINOR@_la_SOURCES += orcx86.c orcx86insn.c
-endif
-if ENABLE_BACKEND_MMX
-liborc_@ORC_MAJORMINOR@_la_SOURCES += orcmmx.c orcrules-mmx.c orcprogram-mmx.c
-if ENABLE_BACKEND_SSE
-else
-liborc_@ORC_MAJORMINOR@_la_SOURCES += orcx86.c
-endif
-endif
-if ENABLE_BACKEND_ALTIVEC
-liborc_@ORC_MAJORMINOR@_la_SOURCES += \
- orcrules-altivec.c orcprogram-altivec.c orcpowerpc.c
-endif
-if ENABLE_BACKEND_NEON
-liborc_@ORC_MAJORMINOR@_la_SOURCES += orcprogram-neon.c orcrules-neon.c
-liborc_@ORC_MAJORMINOR@_la_SOURCES += orcarm.c
-endif
-if ENABLE_BACKEND_ARM
-liborc_@ORC_MAJORMINOR@_la_SOURCES += orcprogram-arm.c orcrules-arm.c
-if ENABLE_BACKEND_NEON
-else
-liborc_@ORC_MAJORMINOR@_la_SOURCES += orcarm.c
-endif
-endif
-if ENABLE_BACKEND_C64X
-liborc_@ORC_MAJORMINOR@_la_SOURCES += orcprogram-c64x-c.c
-endif
-if ENABLE_BACKEND_MIPS
-liborc_@ORC_MAJORMINOR@_la_SOURCES += orcmips.c orcprogram-mips.c orcrules-mips.c
-endif
-
-if HAVE_I386
-liborc_@ORC_MAJORMINOR@_la_SOURCES += orccpu-x86.c
-endif
-if HAVE_AMD64
-liborc_@ORC_MAJORMINOR@_la_SOURCES += orccpu-x86.c
-endif
-if HAVE_POWERPC
-liborc_@ORC_MAJORMINOR@_la_SOURCES += orccpu-powerpc.c
-endif
-if HAVE_ARM
-liborc_@ORC_MAJORMINOR@_la_SOURCES += orccpu-arm.c
-endif
-if HAVE_MIPSEL
-liborc_@ORC_MAJORMINOR@_la_SOURCES += orccpu-mips.c
-endif
-
-# FIXME: orcemulateopcodes.h probably shouldn't be installed, symbols are not exported or useful
-# FIXME: orcinternal.h should probably also not be installed
-pkginclude_HEADERS = \
- orc-stdint.h \
- orc.h \
- orcarm.h \
- orcbytecode.h \
- orcbytecodes.h \
- orccode.h \
- orccompiler.h \
- orcconstant.h \
- orccpu.h \
- orccpuinsn.h \
- orcdebug.h \
- orcemulateopcodes.h \
- orcexecutor.h \
- orcfunctions.h \
- orcinstruction.h \
- orcinternal.h \
- orclimits.h \
- orcmmx.h \
- orcneon.h \
- orconce.h \
- orcopcode.h \
- orcparse.h \
- orcpowerpc.h \
- orcprogram.h \
- orcrule.h \
- orcsse.h \
- orctarget.h \
- orcutils.h \
- orcvariable.h \
- orcx86.h \
- orcx86insn.h \
- orcmips.h
-
-noinst_HEADERS = \
- opcodes.h
-
-noinst_PROGRAMS = generate-emulation generate-bytecode
-
-generate_emulation_LDADD = $(ORC_LIBS)
-generate_emulation_CFLAGS = $(ORC_CFLAGS)
-generate_emulation_DEPENDENCIES = liborc-0.4.la
-
-generate_bytecode_LDADD = $(ORC_LIBS)
-generate_bytecode_CFLAGS = $(ORC_CFLAGS)
-generate_bytecode_DEPENDENCIES = liborc-0.4.la
-
-update: generate-emulation generate-bytecode
- $(top_builddir)/tools/orcc$(EXEEXT) --implementation -o orcfunctions.c orcfunctions.orc
- $(top_builddir)/tools/orcc$(EXEEXT) --decorator ORC_API --include orc/orcutils.h --header -o orcfunctions.h orcfunctions.orc
- ./generate-emulation$(EXEEXT) -o orcemulateopcodes.c
- ./generate-emulation$(EXEEXT) --header -o orcemulateopcodes.h
- ./generate-bytecode$(EXEEXT) --header -o orcbytecodes.h
-
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
deleted file mode 100644
index 918662f..0000000
--- a/testsuite/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-
-DIST_SUBDIRS = orcc benchmorc
-
-SUBDIRS = orcc benchmorc
-
-AM_TESTS_ENVIRONMENT = \
- testfile="$(srcdir)/test.orc"
-
-TESTS = \
- test_accsadubl test-schro \
- exec_opcodes_sys \
- exec_parse \
- perf_opcodes_sys perf_parse \
- memcpy_speed \
- abi \
- test-limits test_parse
-
-noinst_PROGRAMS = $(TESTS) generate_xml_table generate_xml_table2 \
- generate_opcodes_sys compile_parse compile_parse_c memcpy_speed \
- perf_opcodes_sys_compare perf_parse_compare \
- exec_parse \
- bytecode_parse \
- compile_opcodes_sys_c \
- compile_opcodes_sys \
- show_parse \
- test_parse
-
-
-EXTRA_DIST = test.orc
-
-CLEANFILES = temp-orc-test-*
-
-if ENABLE_BACKEND_NEON
-noinst_PROGRAMS += compile_opcodes_sys_neon \
- compile_parse_neon
-endif
-
-if ENABLE_BACKEND_C64X
-noinst_PROGRAMS += compile_opcodes_sys_c64x
-endif
-
-if ENABLE_BACKEND_MIPS
-noinst_PROGRAMS += compile_opcodes_sys_mips
-endif
-
-AM_CFLAGS = $(ORC_CFLAGS)
-LIBS = $(ORC_LIBS) $(top_builddir)/orc-test/liborc-test-@ORC_MAJORMINOR@.la
-
-
diff --git a/testsuite/benchmorc/Makefile.am b/testsuite/benchmorc/Makefile.am
deleted file mode 100644
index 8bc1152..0000000
--- a/testsuite/benchmorc/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-
-noinst_PROGRAMS = benchmorc
-
-AM_CFLAGS = $(ORC_CFLAGS)
-LIBS = $(ORC_LIBS) $(top_builddir)/orc-test/liborc-test-@ORC_MAJORMINOR@.la
-
diff --git a/testsuite/orcc/Makefile.am b/testsuite/orcc/Makefile.am
deleted file mode 100644
index 2ba0ac0..0000000
--- a/testsuite/orcc/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-
-if CROSS_COMPILING
-else
-TESTS = orc_test test2 test3
-
-noinst_PROGRAMS = orc_test test2 test3
-
-BUILT_SOURCES = testorc.c testorc.h orc_test.c
-endif
-
-test2_SOURCES = test2.c testorc.c
-
-test3_SOURCES = test3.c testorc.c
-test3_CFLAGS = -DDISABLE_ORC
-
-AM_CFLAGS = $(ORC_CFLAGS)
-LIBS = $(ORC_LIBS) $(top_builddir)/orc-test/liborc-test-@ORC_MAJORMINOR@.la
-
-CLEANFILES = testorc.c testorc.h orc_test.c
-
-orcc_v_gen = $(orcc_v_gen_$(V))
-orcc_v_gen_ = $(orcc_v_gen_$(AM_DEFAULT_VERBOSITY))
-orcc_v_gen_0 = @echo " ORCC $@";
-
-testorc.h: $(srcdir)/../test.orc
- $(orcc_v_gen)$(top_builddir)/tools/orcc$(EXEEXT) --include stdint.h --header -o testorc.h $<
-
-testorc.c: $(srcdir)/../test.orc
- $(orcc_v_gen)$(top_builddir)/tools/orcc$(EXEEXT) --include stdint.h --implementation -o testorc.c $<
-
-orc_test.c: $(srcdir)/../test.orc
- $(orcc_v_gen)$(top_builddir)/tools/orcc$(EXEEXT) --include stdint.h --test -o orc_test.c $<
-
-
diff --git a/tools/Makefile.am b/tools/Makefile.am
deleted file mode 100644
index eaec4f4..0000000
--- a/tools/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-
-SOURCES = orcc.c orc-bugreport.c
-
-bin_PROGRAMS = orcc
-
-if BUILD_TESTS
-# orc-bugreport depends on liborc_test
-bin_PROGRAMS += orc-bugreport
-endif
-
-AM_CFLAGS = $(ORC_CFLAGS)
-LDADD = $(ORC_LIBS)
-orc_bugreport_LDADD = $(ORC_LIBS) ../orc-test/liborc-test-@ORC_MAJORMINOR@.la
View Lorry Controller Status