Commit 3674c4d191e7ab9e30358a763a880a22c9b7c312
2008-04-28T17:31:42
specify minimum versions, make ac be 2.58 and am be 1.6 (needed in order to support os x 10.4 out-of-the-box). PKG_CHECK_MODULES doesn't seem to wrap the args properly so you can't embed AC_MSG_RESULT, make a zip and bzip2 when we make a dist, and provide NULL to make am happy
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92
diff --git a/Makefile.am b/Makefile.am
index f085097..6f4f92c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,3 +23,5 @@ EXTRA_DIST = \
configure.ac \
ftgl.pc.in \
$(NULL)
+
+NULL =
diff --git a/configure.ac b/configure.ac
index 51224cc..aaf251f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,12 @@
-AC_INIT(ftgl, 2.1.3, henryj@paradise.net.nz)
+dnl Minimum version of autoconf required. Should coincide with the
+dnl setting in the autogen.sh script.
+AC_PREREQ(2.58)
+
+AC_INIT(FTGL, 2.1.3, [henryj@paradise.net.nz], ftgl)
+AC_CONFIG_SRCDIR(src/FTFont.cpp)
AC_CONFIG_AUX_DIR(.auto)
-AC_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([no-define tar-ustar])
+AM_INIT_AUTOMAKE([1.6 no-define dist-zip dist-bzip2])
+AM_CONFIG_HEADER(config.h)
FTGL_PROG_CXX
@@ -40,7 +45,8 @@ FTGL_CHECK_GL
FTGL_CHECK_GLUT
CPPUNIT="no"
-PKG_CHECK_MODULES(CPPUNIT, cppunit, [CPPUNIT="yes"], [AC_MSG_RESULT(no)])
+PKG_CHECK_MODULES(CPPUNIT, cppunit, [CPPUNIT="yes"])
+AC_MSG_RESULT($CPPUNIT)
AM_CONDITIONAL(HAVE_CPPUNIT, test "$CPPUNIT" != "no")
# Checks for library functions -- this isn't really used at the moment
diff --git a/demo/Makefile.am b/demo/Makefile.am
index d99d191..bd2c413 100644
--- a/demo/Makefile.am
+++ b/demo/Makefile.am
@@ -27,3 +27,4 @@ FTGLMFontDemo_CXXFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
FTGLMFontDemo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS)
FTGLMFontDemo_LDADD = ../src/libftgl.la
+NULL =
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 8b864cc..b228bf1 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -30,3 +30,5 @@ EXTRA_DIST = \
images/metrics.png \
html.tar.gz \
$(NULL)
+
+NULL =
diff --git a/msvc/Makefile.am b/msvc/Makefile.am
index b694dbe..63257e2 100644
--- a/msvc/Makefile.am
+++ b/msvc/Makefile.am
@@ -10,3 +10,5 @@ EXTRA_DIST = \
ftgl_demo.vcproj \
ftgl_demo_2.vcproj \
$(NULL)
+
+NULL =
diff --git a/src/Makefile.am b/src/Makefile.am
index b074a7e..0f9c300 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -63,6 +63,7 @@ ftgl_HEADERS = \
../include/FTSize.h \
../include/FTTextureGlyph.h \
../include/FTVector.h \
- ../include/FTVectoriser.h
-
+ ../include/FTVectoriser.h \
+ ${NULL}
+NULL =
diff --git a/test/Makefile.am b/test/Makefile.am
index fc0d57e..095570e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -48,3 +48,4 @@ DEACTIVATED = \
FTlayout-Test.cpp \
$(NULL)
+NULL =