From 70d5336ba77f51e7c12c1f0c52179770d636cc08 Mon Sep 17 00:00:00 2001
From: Charles McGarvey <chazmcgarvey@brokenzipper.com>
Date: Wed, 7 Apr 2010 02:13:14 -0600
Subject: [PATCH] autoconf script to better follow gnu guidelines

---
 Makefile.am     |  11 +-
 configure.ac    | 277 +++++++++++++++++++++++++++---------------------
 doc/Makefile.am |   4 -
 3 files changed, 166 insertions(+), 126 deletions(-)
 delete mode 100644 doc/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 707b606..cc0d532 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,13 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = data doc src
+SUBDIRS = data src
+EXTRA_DIST = autogen.sh doc
 
-EXTRA_DIST = autogen.sh
+man6_MANS = doc/yoink.6
 
 
-.PHONY: run debug docs portable installer
+.PHONY: run debug portable installer package
 
 if WIN32
 
@@ -14,10 +15,14 @@ portable: all
 	$(SH) arch/win32/makepackage.sh -p $(prefix) -d "@DATA_FILES@" \
 		-s $(STRIP) -V $(VERSION)
 
+if HAVE_MAKENSIS
+
 installer: all
 	$(SH) arch/win32/makepackage.sh -p $(prefix) -d "@DATA_FILES@" \
 		-s $(STRIP) -V $(VERSION) -i $(MAKENSIS)
 
+endif
+
 else
 
 run: all
diff --git a/configure.ac b/configure.ac
index 03df887..d4be838 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 # Process this file with autoconf to produce a configure script.
 #
 
-AC_PREREQ(2.63)
+AC_PREREQ(2.61)
 
 AC_INIT([Yoink],[0.1],[chaz@dogcows.com],[yoink])
 
@@ -17,52 +17,23 @@ AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
 
 
 #
-# Checks for programs.
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-AC_PROG_CXX
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_INSTALL
-AC_PROG_RANLIB
-AM_PROG_CC_C_O
-
-PKG_PROG_PKG_CONFIG
-
-AC_PATH_PROGS([DOXYGEN], [doxygen])
-AC_SUBST(DOXYGEN)
-
+# Determine the target platform.
 #
-# Configure platform-specific stuff.
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 case "${host}" in
-	*mingw32*)
-		WIN32=yes
-		AC_PATH_PROGS([MAKENSIS], [makensis])
-		AC_PATH_PROGS([WINDRES],
-					  [windres $host_alias-windres $host_os-windres])
-		if test "x$WINDRES" = x
-		then
-			AC_MSG_ERROR([windres could not be found])
-		fi
-	;;
-	*-apple-darwin*)
-		MACOSX=yes
-	;;
-	*netbsd*)
-		NETBSD=yes
-		AC_PATH_PROGS([PKGLINT], [pkglint])
-	;;
+	*mingw32*)       WIN32=yes ;;
+	*-apple-darwin*) MACOSX=yes ;;
+	*netbsd*)        NETBSD=yes ;;
 esac
 
-AM_CONDITIONAL([WIN32],  test "$WIN32" = "yes")
-AM_CONDITIONAL([NETBSD], test "$NETBSD" = "yes")
+AM_CONDITIONAL([WIN32], [test x$WIN32 = xyes])
+AM_CONDITIONAL([MACOSX], [test x$MACOSX = xyes])
+AM_CONDITIONAL([NETBSD], [test x$NETBSD = xyes])
 
 
 #
 # Checks for configuration arguments.
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
 
 AC_ARG_ENABLE([debug],
 			  [  --enable-debug          include debugging symbols and features],
@@ -165,77 +136,69 @@ fi
 
 AC_SUBST([DATADIR])
 AC_DEFINE_UNQUOTED([YOINK_DATADIR], ["$DATADIR"],
-				   [Define to path of game asset directory.])
+				   [Define to the path of the game asset directory.])
 
 
-#
-# Split the version number into components.
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+####
+AC_MSG_NOTICE([Checks for programs.])
+####
 
-VERSION_MAJOR=$(echo $VERSION | cut -d. -f1)
-VERSION_MINOR=$(echo $VERSION | cut -d. -f2)
-VERSION_REVISION=$(echo $VERSION | cut -d. -f3)
-
-AC_DEFINE_UNQUOTED([VERSION_MAJOR], [${VERSION_MAJOR:-0}],
-				   [Define to major version number component.])
-
-AC_DEFINE_UNQUOTED([VERSION_MINOR], [${VERSION_MINOR:-0}],
-				   [Define to minor version number component.])
+AC_PROG_CXX
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_RANLIB
+AM_PROG_CC_C_O
 
-AC_DEFINE_UNQUOTED([VERSION_REVISION], [${VERSION_REVISION:-0}],
-				   [Define to revision version number component.])
+PKG_PROG_PKG_CONFIG
 
-if test x$WIN32 = xyes
+AC_PATH_PROGS([CUT], [cut])
+if test x$CUT = x
 then
-	PVERSION="${VERSION_MAJOR:-0}.${VERSION_MINOR:-0}.${VERSION_REVISION:-0}.0"
-	AC_SUBST([PVERSION])
+	AC_MSG_ERROR([The cut program is required.])
 fi
 
-# these are used in src/yoink.rc
-
-
-#
-# Checks for system functions/headers and compiler characteristics.
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-AC_C_STRINGIZE
-AC_C_INLINE
-
-AC_TYPE_UINT8_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_SIZE_T
-AC_TYPE_SSIZE_T
-
-AC_FUNC_ERROR_AT_LINE
-AC_FUNC_STRTOD
-AC_CHECK_FUNCS([nanosleep strchr strcspn strrchr strstr])
-
-AC_HEADER_STDBOOL
-AC_HEADER_STDC
-AC_CHECK_HEADERS([stddef.h stdint.h stdlib.h string.h unistd.h])
-
-##### clock_gettime #####
-if test x$clock_gettime = xyes
+AC_PATH_PROGS([FIND], [find])
+if test x$FIND = x
 then
-	AC_SEARCH_LIBS([clock_gettime], [rt],
-				   [AC_DEFINE([HAVE_CLOCK_GETTIME], 1,
-							  [Define to 1 if you have the 'clock_gettime' function.])])
+	AC_MSG_ERROR([The find program is required.])
 fi
 
+if test x$WIN32 = xyes
+then
+	AC_PATH_PROGS([WINDRES],
+				   [windres $host_alias-windres $host_os-windres])
+	if test x$WINDRES = x
+	then
+		AC_MSG_ERROR([The windres program is required.])
+	fi
+
+	AC_PATH_PROGS([ZIP], [zip])
+	if test x$ZIP = x
+	then
+		AC_MSG_WARN([The zip program is needed to build a portable package.])
+	fi
+
+	AC_PATH_PROGS([MAKENSIS], [makensis])
+	if test x$MAKENSIS = x
+	then
+		AC_MSG_WARN([The makensis program is needed to build an installer.])
+	fi
+
+	AC_PATH_PROGS([GROFF], [groff])
+	if test x$GROFF = x
+	then
+		AC_MSG_WARN([The groff program is needed to create the manual page.])
+	fi
+elif test x$NETBSD = xyes
+then
+	AC_PATH_PROGS([PKGLINT], [pkglint])
+fi
 
-#
-# Checks for build dependencies.
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+AM_CONDITIONAL([HAVE_MAKENSIS], [test x$MAKENSIS != x])
 
-echo "checking for dependencies..."
-
-##### boost #####
-website="http://www.boost.org/"
-BOOST_SMART_PTR
-BOOST_STRING_ALGO
-BOOST_BIND
-BOOST_FUNCTION
+####
+AC_MSG_NOTICE([Checks for libraries.])
+####
 
 ##### SDL #####
 website="http://www.libsdl.org/"
@@ -244,25 +207,16 @@ PKG_CHECK_MODULES([SDL], [sdl],
 				   CFLAGS="$CFLAGS $SDL_CFLAGS"
 				   CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"],
 				  [missing=yes
-				   echo "***** Missing SDL ($website) *****"])
+				   AC_MSG_WARN([Missing SDL ($website)])])
 
 ##### opengl, glu #####
 website="http://www.mesa3d.org/"
 PKG_CHECK_MODULES([OPENGL], [gl glu],
 				  [LIBS="$LIBS $OPENGL_LIBS"
 				   CFLAGS="$CFLAGS $OPENGL_CFLAGS"
-				   CXXFLAGS="$CXXFLAGS $GLU_CFLAGS"],
-				  [missing=yes
-				   echo "***** Missing OpenGL ($website) *****"])
-
-##### liblua #####
-website="http://www.lua.org/"
-PKG_CHECK_MODULES([LUA], [lua],
-				  [LIBS="$LIBS $LUA_LIBS"
-				   CFLAGS="$CFLAGS $LUA_CFLAGS"
-				   CXXFLAGS="$CXXFLAGS $LUA_CFLAGS"],
+				   CXXFLAGS="$CXXFLAGS $OPENGL_CFLAGS"],
 				  [missing=yes
-				   echo "***** Missing liblua ($website) *****"])
+				   AC_MSG_WARN([Missing OpenGL ($website)])])
 
 ##### libpng #####
 website="http://www.libpng.org/pub/png/libpng.html"
@@ -271,7 +225,7 @@ PKG_CHECK_MODULES([PNG], [libpng],
 				   CFLAGS="$CFLAGS $PNG_CFLAGS"
 				   CXXFLAGS="$CXXFLAGS $PNG_CFLAGS"],
 				  [missing=yes
-				   echo "***** Missing libpng ($website) *****"])
+				   AC_MSG_WARN([Missing libpng ($website)])])
 
 ##### openal #####
 website="http://connect.creativelabs.com/openal/"
@@ -280,7 +234,7 @@ PKG_CHECK_MODULES([OPENAL], [openal],
 				   CFLAGS="$CFLAGS $OPENAL_CFLAGS"
 				   CXXFLAGS="$CXXFLAGS $OPENAL_CFLAGS"],
 				  [missing=yes
-				   echo "***** Missing OpenAL ($website) *****"])
+				   AC_MSG_WARN([Missing OpenAL ($website)])])
 
 ##### libvorbis #####
 website="http://www.xiph.org/downloads/"
@@ -289,7 +243,16 @@ PKG_CHECK_MODULES([VORBIS], [vorbisfile],
 				   CFLAGS="$CFLAGS $VORBIS_CFLAGS"
 				   CXXFLAGS="$CXXFLAGS $VORBIS_CFLAGS"],
 				  [missing=yes
-				   echo "***** Missing libvorbisfile ($website) *****"])
+				   AC_MSG_WARN([Missing libvorbisfile ($website)])])
+
+##### liblua #####
+website="http://www.lua.org/"
+PKG_CHECK_MODULES([LUA], [lua],
+				  [LIBS="$LIBS $LUA_LIBS"
+				   CFLAGS="$CFLAGS $LUA_CFLAGS"
+				   CXXFLAGS="$CXXFLAGS $LUA_CFLAGS"],
+				  [missing=yes
+				   AC_MSG_WARN([Missing liblua ($website)])])
 
 ##### GTK+ 2.0 #####
 if test x$gtk = xyes
@@ -300,7 +263,7 @@ then
 					   CFLAGS="$CFLAGS $GTK_CFLAGS"
 					   CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"],
 					  [missing=yes
-					   echo "***** Missing GTK+-2.0 ($website) *****"])
+					   AC_MSG_WARN([Missing GTK+-2.0 ($website)])])
 fi
 
 ##### QT4 #####
@@ -312,19 +275,74 @@ then
 					   CFLAGS="$CFLAGS $QT_CFLAGS"
 					   CXXFLAGS="$CXXFLAGS $QT_CFLAGS"],
 					  [missing=yes
-					   echo "***** Missing QT ($website) *****"])
+					   AC_MSG_WARN([Missing QT ($website)])])
 fi
 
-
 if test x$missing = xyes
 then
-	AC_MSG_ERROR([Please resolve the missing dependencies, and try again.])
+	AC_MSG_ERROR([You are missing some required libraries.])
+fi
+
+
+####
+AC_MSG_NOTICE([Checks for header files.])
+####
+
+AC_HEADER_STDBOOL
+AC_HEADER_STDC
+AC_CHECK_HEADERS([stddef.h stdint.h stdlib.h string.h unistd.h])
+
+BOOST_SMART_PTR
+BOOST_STRING_ALGO
+BOOST_BIND
+BOOST_FUNCTION
+
+
+####
+AC_MSG_NOTICE([Checks for types.])
+####
+
+AC_TYPE_UINT8_T
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+
+
+####
+AC_MSG_NOTICE([Checks for compiler characteristics.])
+####
+
+AC_C_STRINGIZE
+AC_C_INLINE
+
+
+####
+AC_MSG_NOTICE([Checks for library functions.])
+####
+
+AC_FUNC_ERROR_AT_LINE
+AC_FUNC_STRTOD
+AC_CHECK_FUNCS([nanosleep strchr strcspn strrchr strstr])
+
+if test x$clock_gettime = xyes
+then
+	AC_SEARCH_LIBS([clock_gettime], [rt],
+				   [clock_gettime=yes],
+				   [clock_gettime=no])
+	if test x$clock_gettime = xyes
+	then
+		AC_DEFINE([HAVE_CLOCK_GETTIME], 1,
+				  [Define to 1 if you have the 'clock_gettime' function.])
+	else
+		AC_MSG_WARN([Falling back to SDL_GetTicks().])
+	fi
 fi
 
 
 #
 # Find the game resources to install.
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
 
 DATA_FILES=$(echo $(cd data && find . -name "*.lua" \
 								   -o -name "*.ogg" \
@@ -333,13 +351,34 @@ DATA_FILES=$(echo $(cd data && find . -name "*.lua" \
 AC_SUBST([DATA_FILES])
 
 
+#
+# Split the version number into components.
+# These definitions are used in the win32 resource file, src/yoink.rc.
+#
+
+VERSION_MAJOR=$(echo $VERSION | cut -d. -f1)
+VERSION_MINOR=$(echo $VERSION | cut -d. -f2)
+VERSION_REVISION=$(echo $VERSION | cut -d. -f3)
+
+AC_DEFINE_UNQUOTED([VERSION_MAJOR], [${VERSION_MAJOR:-0}],
+				   [Define to major version number component.])
+
+AC_DEFINE_UNQUOTED([VERSION_MINOR], [${VERSION_MINOR:-0}],
+				   [Define to minor version number component.])
+
+AC_DEFINE_UNQUOTED([VERSION_REVISION], [${VERSION_REVISION:-0}],
+				   [Define to revision version number component.])
+
+PVERSION="${VERSION_MAJOR:-0}.${VERSION_MINOR:-0}.${VERSION_REVISION:-0}.0"
+AC_SUBST([PVERSION])
+
+
 #
 # Create the build files.
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
 
 AC_CONFIG_FILES([Makefile
 				 data/Makefile
-				 doc/Makefile
 				 doc/yoink.6
 				 src/Makefile])
 
@@ -350,7 +389,7 @@ AC_OUTPUT
 
 #
 # Print a friendly little message.
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
 
 echo ""
 echo " Configuration complete! :-)"
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 35e6a4b..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-
-man6_MANS = yoink.6
-EXTRA_DIST = licenses man2html.lua
-
-- 
2.45.2