diff options
| author | Javier Jardón <jjardon@gnome.org> | 2011-01-24 23:11:40 +0000 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2011-01-25 00:00:15 +0000 |
| commit | f5570adcd6d36db0005080789da9adddb5f698d7 (patch) | |
| tree | 0675a7921d84c88a8bb44c996647f911c372adfc | |
| parent | 061cb091c211911ddf6d4add7e69311b0777a1f6 (diff) | |
build: Update autotools configuration a bit
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 19 |
3 files changed, 16 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 6436ab9..0520f5f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + #SUBDIRS = $(MODULE_SUBDIR) #DIST_SUBDIRS = module @@ -7,6 +7,8 @@ test -n "$srcdir" || srcdir=. olddir=`pwd` cd "$srcdir" +mkdir m4 + AUTORECONF=`which autoreconf` if test -z $AUTORECONF; then echo "*** No autoreconf found, please install it ***" diff --git a/configure.ac b/configure.ac index 64e1f2d..b550391 100644 --- a/configure.ac +++ b/configure.ac @@ -1,20 +1,25 @@ -AC_PREREQ(2.54) +AC_PREREQ([2.63]) AC_INIT([sysprof], [1.1.7]) -AC_CONFIG_SRCDIR(sysprof.glade) -AM_INIT_AUTOMAKE(no-define) +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_SRCDIR([sysprof.glade]) +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_AUX_DIR([build-aux]) -AM_CONFIG_HEADER(config.h) - -AC_PROG_CC -AC_PROG_INSTALL +AM_INIT_AUTOMAKE([1.10 -Wall no-define]) +AM_MAINTAINER_MODE([enable]) # 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])]) +# Check for programs +AC_PROG_CC +AM_PROG_CC_C_O +AC_PROG_INSTALL + changequote(,)dnl if test "x$GCC" = "xyes"; then case " $CFLAGS " in |