diff options
| author | Martin-Éric Racine <martin-eric.racine@iki.fi> | 2013-10-02 22:18:42 +0300 |
|---|---|---|
| committer | Martin-Éric Racine <martin-eric.racine@iki.fi> | 2013-10-02 22:24:07 +0300 |
| commit | cb36826843017583aecbc77c4dbeb8ec5198c016 (patch) | |
| tree | a57194894fad824972b8e6bf98f6a7a99375405e | |
| parent | ed0b153f320a95a11bd561726d2405823573500e (diff) | |
libtool upgrade to include m4 directory
Signed-off-by: Martin-Éric Racine <martin-eric.racine@iki.fi>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | autogen.sh | 4 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | m4/.gitignore | 7 |
4 files changed, 13 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 00c84b5..44afe70 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,6 +18,8 @@ # 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. +ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 + SUBDIRS = src MAINTAINERCLEANFILES = ChangeLog INSTALL @@ -9,4 +9,6 @@ cd $srcdir autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure --enable-maintainer-mode "$@" +if test -z "$NOCONFIGURE"; then + $srcdir/configure --enable-maintainer-mode "$@" +fi diff --git a/configure.ac b/configure.ac index 4e9e83a..0af4fb9 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,7 @@ AC_INIT([xf86-video-geode], AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR(.) # Initialize Automake diff --git a/m4/.gitignore b/m4/.gitignore new file mode 100644 index 0000000..ef3143e --- /dev/null +++ b/m4/.gitignore @@ -0,0 +1,7 @@ +libtool +libtool.m4 +ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 |