diff options
author | Peter Simons <simons@cryp.to> | 2016-10-05 14:07:45 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2016-10-05 14:07:45 +0200 |
commit | d6dd004f269815e495d256ca63033b6c90c36000 (patch) | |
tree | 85d69d4fe1ad7e6eed7a3cbeca771f9035c45565 /m4 | |
parent | a66131f209ea8167787a8ab2a8edbc47c59a0e17 (diff) | |
download | autoconf-archive-d6dd004f269815e495d256ca63033b6c90c36000.tar.gz |
Remove obsolete macros.
Diffstat (limited to 'm4')
-rw-r--r-- | m4/ax_cxx_compiler_vendor.m4 | 48 | ||||
-rw-r--r-- | m4/ax_gcc_libraries_dir.m4 | 71 | ||||
-rw-r--r-- | m4/ax_gcc_version.m4 | 64 | ||||
-rw-r--r-- | m4/ax_have_opengl.m4 | 90 |
4 files changed, 0 insertions, 273 deletions
diff --git a/m4/ax_cxx_compiler_vendor.m4 b/m4/ax_cxx_compiler_vendor.m4 deleted file mode 100644 index a3cb1ec..0000000 --- a/m4/ax_cxx_compiler_vendor.m4 +++ /dev/null @@ -1,48 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_cxx_compiler_vendor.html -# =========================================================================== -# -# OBSOLETE MACRO -# -# Please use AC_LANG_PUSH([C++]) AX_COMPILER_VENDOR AC_LANG_POP([C++]) -# -# SYNOPSIS -# -# AX_CXX_COMPILER_VENDOR(VENDOR-NAME, [NICKNAME]) -# -# DESCRIPTION -# -# Set VENDOR-NAME to the lower-case name of the compiler vendor or -# `unknown' if the compiler's vendor is unknown. `compaq' means the CXX -# compiler as available on Tru64/OSF1/Digital Unix on Alpha machines. If -# NICKNAME is provided, set it to the compiler's usual name (eg. `g++', -# `cxx', `aCC', etc.). -# -# LICENSE -# -# Copyright (c) 2008 Ludovic Courtes <ludo@chbouib.org> -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 9 - -AU_ALIAS([AC_CXX_COMPILER_VENDOR], [AX_CXX_COMPILER_VENDOR]) -AC_DEFUN([AX_CXX_COMPILER_VENDOR], - [dnl - AC_OBSOLETE($[$0],[[;please use AX_COMPILER_VENDOR]]) - AC_MSG_WARN([[AX_CXX_COMPILER_VENDOR is obsolete; please use AX_COMPILER_VENDOR]]) - - AC_REQUIRE([AC_PROG_CXX]) - - AC_LANG_PUSH([C++]) - AX_COMPILER_VENDOR() - AC_LANG_POP([C++]) - - # be compatible with old ABI - AS_IF([test X$ax_cv_cxx_compiler = "Xdec"], - [$ax_cv_cxx_compiler=compact]) - ] -)dnl diff --git a/m4/ax_gcc_libraries_dir.m4 b/m4/ax_gcc_libraries_dir.m4 deleted file mode 100644 index f864872..0000000 --- a/m4/ax_gcc_libraries_dir.m4 +++ /dev/null @@ -1,71 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_gcc_libraries_dir.html -# =========================================================================== -# -# OBSOLETE MACRO -# -# This macro is obsolete because it depends on the obsolete macro -# AX_GCC_OPTION. -# -# SYNOPSIS -# -# AX_GCC_LIBRARIES_DIR(VARIABLE) -# -# DESCRIPTION -# -# AX_GCC_LIBRARIES_DIR(VARIABLE) defines VARIABLE as the gcc libraries -# directory. The libraries directory will be obtained using the gcc -# -print-search-dirs option. This macro requires AX_GCC_OPTION macro. -# -# Thanks to Alessandro Massignan for his helpful hints. -# -# LICENSE -# -# Copyright (c) 2009 Francesco Salvestrini <salvestrini@users.sourceforge.net> -# -# 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, see <http://www.gnu.org/licenses/>. -# -# 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 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. - -#serial 6 - -AC_DEFUN([AX_GCC_LIBRARIES_DIR], [ - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_PROG_SED]) - - AS_IF([test "x$GCC" = "xyes"],[ - AX_GCC_OPTION([-print-search-dirs],[],[],[ - AC_MSG_CHECKING([gcc libraries directory]) - ax_gcc_libraries_dir="`$CC -print-search-dirs | $SED -n -e 's,^libraries:[ \t]*=,,p'`" - AC_MSG_RESULT([$ax_gcc_libraries_dir]) - $1="$ax_gcc_libraries_dir" - ],[ - unset $1 - ]) - ],[ - AC_MSG_WARN([sorry, no gcc available]) - unset $1 - ]) -]) diff --git a/m4/ax_gcc_version.m4 b/m4/ax_gcc_version.m4 deleted file mode 100644 index 9c0ff4c..0000000 --- a/m4/ax_gcc_version.m4 +++ /dev/null @@ -1,64 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_gcc_version.html -# =========================================================================== -# -# OBSOLETE MACRO -# -# Use AX_COMPILER_VERSION instead -# -# SYNOPSIS -# -# AX_GCC_VERSION -# -# DESCRIPTION -# -# This macro retrieves the gcc version and returns it in the GCC_VERSION -# variable if available, an empty string otherwise. -# -# LICENSE -# -# Copyright (c) 2009 Francesco Salvestrini <salvestrini@users.sourceforge.net> -# -# 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, see <http://www.gnu.org/licenses/>. -# -# 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 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. - -#serial 10 - -AC_DEFUN([AX_GCC_VERSION], [ - AC_OBSOLETE([$0], [;please use AX_COMPILER_VERSION instead]) - AC_LANG_PUSH([C]) - AC_REQUIRE([AX_COMPILER_VENDOR]) - AC_REQUIRE([AX_COMPILER_VERSION]) - AC_LANG_POP([C]) - GCC_VERSION="" - ax_cv_gcc_version="" - AS_IF([test "X$ax_cv_c_compiler_vendor" = "Xgnu"], - [dnl - ax_cv_gcc_version=$ax_cv_c_compiler_version - GCC_VERSION=$ax_cv_gcc_version - ]) - AC_SUBST([GCC_VERSION]) -]) diff --git a/m4/ax_have_opengl.m4 b/m4/ax_have_opengl.m4 deleted file mode 100644 index 810159e..0000000 --- a/m4/ax_have_opengl.m4 +++ /dev/null @@ -1,90 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_have_opengl.html -# =========================================================================== -# -# OBSOLETE MACRO -# -# Please use AX_CHECK_GL, AX_CHECK_GLU, AX_CHECK_GLUT, AX_CHECK_GLX -# instead -# -# SYNOPSIS -# -# AX_HAVE_OPENGL -# -# DESCRIPTION -# -# Search for OpenGL. We search first for Mesa (a GPL'ed version of Mesa) -# before a vendor's version of OpenGL, unless we were specifically asked -# not to with `--with-Mesa=no' or `--without-Mesa'. -# -# The four "standard" OpenGL libraries are searched for: "-lGL", "-lGLU", -# "-lGLX" (or "-lMesaGL", "-lMesaGLU" as the case may be) and "-lglut". -# -# All of the libraries that are found (since "-lglut" or "-lGLX" might be -# missing) are added to the shell output variable "GL_LIBS", along with -# any other libraries that are necessary to successfully link an OpenGL -# application (e.g. the X11 libraries). Care has been taken to make sure -# that all of the libraries in "GL_LIBS" are listed in the proper order. -# -# Additionally, the shell output variable "GL_CFLAGS" is set to any flags -# (e.g. "-I" flags) that are necessary to successfully compile an OpenGL -# application. -# -# The following shell variable (which are not output variables) are also -# set to either "yes" or "no" (depending on which libraries were found) to -# help you determine exactly what was found. -# -# have_GL -# have_GLU -# have_GLX -# have_glut -# -# LICENSE -# -# Copyright (c) 2008 Matthew D. Langston -# Copyright (c) 2008 Ahmet Inan <auto@ainan.org> -# Copyright (c) 2013 Bastien Roucaries <roucaries.bastien+autoconf@gmail.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, see <http://www.gnu.org/licenses/>. -# -# 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 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. - -#serial 8 - -AU_ALIAS([MDL_HAVE_OPENGL], [AX_HAVE_OPENGL]) -AC_DEFUN([AX_HAVE_OPENGL], -[ - AC_REQUIRE([AX_CHECK_GL]) - AC_REQUIRE([AX_CHECK_GLU]) - AC_REQUIRE([AX_CHECK_GLUT]) - AC_REQUIRE([AX_CHECK_GLX]) - - AC_OBSOLETE([$0], [;please use AX_CHECK_GL, AX_CHECK_GLU, AX_CHECK_GLUT, AX_CHECK_GLX instead]) - AC_MSG_WARN([[AX_HAVE_OPENGL is deprecated, please use AX_CHECK_GL, AX_CHECK_GLU, AX_CHECK_GLUT, AX_CHECK_GLX instead]]) - - # override old flags: really ugly but needed for compatibility - GL_CFLAGS="$GL_CFLAGS $GLU_CFLAGS $GLUT_CFLAGS $GLX_CFLAGS" - GL_LIBS="$GL_LIBS $GLU_LIBS $GLUT_LIBS $GLX_LIBS" -]) |