diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | autogen.sh | 14 | ||||
| -rw-r--r-- | configure.ac | 28 | ||||
| -rw-r--r-- | m4/.gitignore | 5 |
4 files changed, 28 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am index 6808bf0a..d098ed5d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,6 @@ # 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. -AUTOMAKE_OPTIONS = foreign +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} SUBDIRS = lib man tests tools benchmarks @@ -1,12 +1,6 @@ #! /bin/sh -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" +test -n "$srcdir" || srcdir=`dirname "$0"` +test -n "$srcdir" || srcdir=. +autoreconf --force --install --verbose "$srcdir" +test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff --git a/configure.ac b/configure.ac index 097d796a..9fd8d35c 100644 --- a/configure.ac +++ b/configure.ac @@ -20,26 +20,33 @@ # # Process this file with autoconf to produce a configure script -AC_PREREQ(2.57) +AC_PREREQ([2.63]) AC_INIT([intel-gpu-tools], - 1.0.2, + [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - intel-gpu-tools) + [intel-gpu-tools]) AC_CONFIG_SRCDIR([Makefile.am]) -AM_CONFIG_HEADER([config.h]) -AC_CONFIG_AUX_DIR(.) +AC_CONFIG_HEADERS([config.h]) +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. -AC_DISABLE_STATIC -AC_PROG_LIBTOOL AC_PROG_CC 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) if test "x$have_drm" = "xyes"; then 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_DEFAULT_OPTIONS -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile benchmarks/Makefile lib/Makefile @@ -90,3 +97,4 @@ AC_OUTPUT([ tests/Makefile tools/Makefile ]) +AC_OUTPUT diff --git a/m4/.gitignore b/m4/.gitignore new file mode 100644 index 00000000..464ba5ca --- /dev/null +++ b/m4/.gitignore @@ -0,0 +1,5 @@ +libtool.m4 +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 |