autoupdated configure.ac

[chaz/yoink] / configure.ac

diff --git a/configure.ac b/configure.ac
index a35b3a4879e7187b698f1fe411686bed5f20f46b..03df88747f03e7b96e9daf9e32ea71e275993b57 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,16 +4,16 @@
 # Process this file with autoconf to produce a configure script.
 #
 
-AC_PREREQ([2.60])
+AC_PREREQ(2.63)
 
-AC_INIT([Yoink], [0.1], [chaz@dogcows.com], [yoink])
+AC_INIT([Yoink],[0.1],[chaz@dogcows.com],[yoink])
 
 AC_CANONICAL_TARGET
 
 AC_CONFIG_SRCDIR([src/version.c])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
 
 
 #
@@ -38,26 +38,26 @@ AC_SUBST(DOXYGEN)
 
 case "${host}" in
        *mingw32*)
-               MINGW32=yes
                WIN32=yes
-               AC_PATH_PROGS([WINDRES], [windres $host_alias-windres $host_os-windres])
+               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
-               AC_PATH_PROGS([MAKENSIS], [makensis])
-       ;;
-       *cygwin*)
-               CYGWIN=yes
-               WIN32=yes
        ;;
        *-apple-darwin*)
                MACOSX=yes
-               LIBS="$LIBS -Wl,-framework"
+       ;;
+       *netbsd*)
+               NETBSD=yes
+               AC_PATH_PROGS([PKGLINT], [pkglint])
        ;;
 esac
 
-AM_CONDITIONAL([WIN32], test "$WIN32" = "yes")
+AM_CONDITIONAL([WIN32],  test "$WIN32" = "yes")
+AM_CONDITIONAL([NETBSD], test "$NETBSD" = "yes")
 
 
 #
@@ -316,9 +316,9 @@ then
 fi
 
 
-if test x$missing == xyes
+if test x$missing = xyes
 then
-       AC_MSG_WARN([It looks like you're missing some dependencies--building may fail!])
+       AC_MSG_ERROR([Please resolve the missing dependencies, and try again.])
 fi
 
 
@@ -343,12 +343,6 @@ AC_CONFIG_FILES([Makefile
                                 doc/yoink.6
                                 src/Makefile])
 
-if test x$WIN32 = xyes
-then
-       AC_CONFIG_FILES([win32/Makefile win32/mkpackage.sh win32/yoink.nsi])
-fi
-
-
 AC_CONFIG_HEADERS([src/config.h])
 
 AC_OUTPUT