flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-12 02:16:17 +00:00
Code Issues Releases Wiki Activity

build: Update autotools configuration

Browse Source 
Replace deprecated macros and use the new libtool syntax
Also use silent-rules to make the build option less verbose.
This commit is contained in:
Javier Jardón 2011-02-08 22:33:12 +00:00 committed by Chris Wilson
parent 293dd478d7
commit 68b64f1b39
4 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -19,6 +19,6 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
SUBDIRS = lib man tests tools benchmarks SUBDIRS = lib man tests tools benchmarks

14
autogen.sh
View File

@ -1,12 +1,6 @@
#! /bin/sh #! /bin/sh
srcdir=`dirname $0` test -n "$srcdir" || srcdir=`dirname "$0"`
test -z "$srcdir" && srcdir=. test -n "$srcdir" || srcdir=.
autoreconf --force --install --verbose "$srcdir"
ORIGDIR=`pwd` test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
cd $srcdir
autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
$srcdir/configure --enable-maintainer-mode "$@"

28
configure.ac
View File

@ -20,26 +20,33 @@
# #
# Process this file with autoconf to produce a configure script # Process this file with autoconf to produce a configure script
AC_PREREQ(2.57) AC_PREREQ([2.63])
AC_INIT([intel-gpu-tools], AC_INIT([intel-gpu-tools],
1.0.2, [1.0.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
intel-gpu-tools) [intel-gpu-tools])
AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h]) AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([dist-bzip2]) AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2])
AM_MAINTAINER_MODE([enable])
AM_MAINTAINER_MODE # Support silent build rules, requires at least automake-1.11. Disable
# by either passing --disable-silent-rules to configure or passing V=1
# to make
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
# Checks for programs. # Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC AC_PROG_CC
AM_PROG_CC_C_O AM_PROG_CC_C_O
# Initialize libtool
LT_PREREQ([2.2])
LT_INIT([disable-static])
PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.23], have_drm=yes, have_drm=no) PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.23], have_drm=yes, have_drm=no)
if test "x$have_drm" = "xyes"; then if test "x$have_drm" = "xyes"; then
AC_DEFINE([HAVE_DRM], 1, [Define to 1 if we have DRM support]) AC_DEFINE([HAVE_DRM], 1, [Define to 1 if we have DRM support])
@ -82,7 +89,7 @@ m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or late
XORG_MACROS_VERSION(1.3) XORG_MACROS_VERSION(1.3)
XORG_DEFAULT_OPTIONS XORG_DEFAULT_OPTIONS
AC_OUTPUT([ AC_CONFIG_FILES([
Makefile Makefile
benchmarks/Makefile benchmarks/Makefile
lib/Makefile lib/Makefile
@ -90,3 +97,4 @@ AC_OUTPUT([
tests/Makefile tests/Makefile
tools/Makefile tools/Makefile
]) ])
AC_OUTPUT

5
m4/.gitignore vendored Normal file
View File

@ -0,0 +1,5 @@
libtool.m4
lt~obsolete.m4
ltoptions.m4
ltsugar.m4
ltversion.m4