From ac6222f9459a1f6144f5a1da228d0b5b6c99788b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 8 Apr 2013 09:12:06 +0200 Subject: Merge outstanding autotools changes --- cmake/Makefile.am | 2 +- cmake/modules/Makefile.am | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'cmake') diff --git a/cmake/Makefile.am b/cmake/Makefile.am index c1cfa8d..69f6d8c 100644 --- a/cmake/Makefile.am +++ b/cmake/Makefile.am @@ -1,4 +1,4 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -AUTOMAKE_OPTIONS = foreign 1.7 + SUBDIRS = modules diff --git a/cmake/modules/Makefile.am b/cmake/modules/Makefile.am index d8af108..d1fbf64 100644 --- a/cmake/modules/Makefile.am +++ b/cmake/modules/Makefile.am @@ -1,4 +1,3 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -AUTOMAKE_OPTIONS = foreign 1.7 EXTRA_DIST = AC_HEADER_STDC.cmake FindGD.cmake FindXPM.cmake TestForHighBitCharacters.c CheckDIRSymbolExists.cmake FindFontconfig.cmake FindPNG.cmake gd.cmake TestForHighBitCharacters.cmake CheckPrototypeExists.cmake FindFreetype.cmake FindPTHREAD.cmake TestForStandardHeaderwait.cmake -- cgit v1.2.1