diff options
author | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-05-17 15:11:21 +0100 |
---|---|---|
committer | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-08-20 11:11:16 +0100 |
commit | 3a9c58553c71e09d95ca6e436eeac6c285f920a3 (patch) | |
tree | a4db9944c8de3104335cd44c6a270894dd183592 /m4 | |
parent | d568e6160e6719eed6763c3d8f1bb3d012d3d9c9 (diff) | |
download | telepathy-account-widgets-3a9c58553c71e09d95ca6e436eeac6c285f920a3.tar.gz |
m4: remove macros we don't need any more
https://bugzilla.gnome.org/show_bug.cgi?id=699492
Diffstat (limited to 'm4')
-rw-r--r-- | m4/ax_config_dir.m4 | 109 | ||||
-rw-r--r-- | m4/python.m4 | 66 |
2 files changed, 0 insertions, 175 deletions
diff --git a/m4/ax_config_dir.m4 b/m4/ax_config_dir.m4 deleted file mode 100644 index 0ba313fa..00000000 --- a/m4/ax_config_dir.m4 +++ /dev/null @@ -1,109 +0,0 @@ -dnl Copied from Audacity 1.3.10 which itself is licensed under the GPL v2 or -dnl any later version - -dnl Function to configure a sub-library now, because we need to know the result -dnl of the configuration now in order to take decisions. -dnl We don't worry about whether the configuration worked or not - it is -dnl assumed that the next thing after this will be a package-specific check to -dnl see if the package is actually available. (Hint: use pkg-config and -dnl -uninstalled.pc files if available). -dnl code based on a simplification of _AC_OUTPUT_SUBDIRS in -dnl /usr/share/autoconf/autoconf/status.m4 which implements part of -dnl AC_CONFIG_SUBDIRS - -AC_DEFUN([AX_CONFIG_DIR], -[AC_REQUIRE([AC_DISABLE_OPTION_CHECKING])] -[m4_append([_AC_LIST_SUBDIRS], [$1], [])] -[ - # Remove --cache-file and --srcdir arguments so they do not pile up. - ax_sub_configure_args= - ax_prev= - eval "set x $ac_configure_args" - shift - for ax_arg - do - if test -n "$ax_prev"; then - ax_prev= - continue - fi - case $ax_arg in - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ax_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ - | --c=*) - ;; - --config-cache | -C) - ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ax_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - ;; - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ax_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - ;; - *) - case $ax_arg in - *\'*) ax_arg=`echo "$ax_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - ax_sub_configure_args="$ax_sub_configure_args '$ax_arg'" ;; - esac - done - - # Always prepend --prefix to ensure using the same prefix - # in subdir configurations. - ax_arg="--prefix=$prefix" - case $ax_arg in - *\'*) ax_arg=`echo "$ax_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - ax_sub_configure_args="'$ax_arg' $ax_sub_configure_args" - - # Pass --silent - if test "$silent" = yes; then - ax_sub_configure_args="--silent $ax_sub_configure_args" - fi - - ax_popdir=`pwd` - AC_MSG_NOTICE([Configuring sources in $1]) - dnl for out-of-place builds srcdir and builddir will be different, and - dnl builddir may not exist, so we must create it - AS_MKDIR_P(["$1"]) - dnl and also set the variables. As this isn't autoconf, the following may be - dnl risky: - _AC_SRCDIRS(["$1"]) - cd "$1" - - # Check for guested configure; otherwise get Cygnus style configure. - if test -f "configure.gnu"; then - ax_sub_configure=$ac_srcdir/configure.gnu - elif test -f "$ac_srcdir/configure"; then - ax_sub_configure=$ac_srcdir/configure - elif test -f "$ac_srcdir/configure.in"; then - # This should be Cygnus configure. - ax_sub_configure=$ac_aux_dir/configure - else - AC_MSG_WARN([no configuration information is in $1]) - ax_sub_configure= - fi - - # The recursion is here. - if test -n "$ax_sub_configure"; then - # Make the cache file name correct relative to the subdirectory. - case $cache_file in - [[\\/]]* | ?:[[\\/]]* ) ax_sub_cache_file=$cache_file ;; - *) # Relative name. - ax_sub_cache_file=$ac_top_build_prefix$cache_file ;; - esac - - AC_MSG_NOTICE([running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir]) - # The eval makes quoting arguments work. - eval "\$SHELL \"\$ax_sub_configure\" $ax_sub_configure_args \ - --cache-file=\"\$ax_sub_cache_file\" --srcdir=\"\$ax_srcdir\"" - fi - - cd "$ax_popdir" - AC_MSG_NOTICE([Done configuring in $1]) -]) - diff --git a/m4/python.m4 b/m4/python.m4 deleted file mode 100644 index fe901562..00000000 --- a/m4/python.m4 +++ /dev/null @@ -1,66 +0,0 @@ -## this one is commonly used with AM_PATH_PYTHONDIR ... -dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) -dnl Check if a module containing a given symbol is visible to python. -AC_DEFUN([AM_CHECK_PYMOD], -[AC_REQUIRE([AM_PATH_PYTHON]) -py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` -AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) -AC_CACHE_VAL(py_cv_mod_$py_mod_var, [ -ifelse([$2],[], [prog=" -import sys -try: - import $1 -except ImportError: - sys.exit(1) -except: - sys.exit(0) -sys.exit(0)"], [prog=" -import $1 -$1.$2"]) -if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC - then - eval "py_cv_mod_$py_mod_var=yes" - else - eval "py_cv_mod_$py_mod_var=no" - fi -]) -py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` -if test "x$py_val" != xno; then - AC_MSG_RESULT(yes) - ifelse([$3], [],, [$3 -])dnl -else - AC_MSG_RESULT(no) - ifelse([$4], [],, [$4 -])dnl -fi -]) - -dnl a macro to check for ability to create python extensions -dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) -dnl function also defines PYTHON_INCLUDES -AC_DEFUN([AM_CHECK_PYTHON_HEADERS], -[AC_REQUIRE([AM_PATH_PYTHON]) -AC_MSG_CHECKING(for headers required to compile python extensions) -dnl deduce PYTHON_INCLUDES -py_prefix=`$PYTHON -c "import sys; print sys.prefix"` -py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` -if test -x "$PYTHON-config"; then -PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null` -else -PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" -if test "$py_prefix" != "$py_exec_prefix"; then - PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" -fi -fi -AC_SUBST(PYTHON_INCLUDES) -dnl check if the headers exist: -save_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" -AC_TRY_CPP([#include <Python.h>],dnl -[AC_MSG_RESULT(found) -$1],dnl -[AC_MSG_RESULT(not found) -$2]) -CPPFLAGS="$save_CPPFLAGS" -]) |