X-Git-Url: http://git.asbjorn.biz/?p=debian%2Fdhcpd-pools.git;a=blobdiff_plain;f=configure.ac;h=eab7a1b21fd710d232834a78ed25207838f7b51a;hp=5d2550a761537862106369fca503d761accbd3f3;hb=HEAD;hpb=b11163012ea67ed821fef58221b05bea454b2f6b

diff --git a/configure.ac b/configure.ac
index 5d2550a..eab7a1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,9 @@
 
 AC_PREREQ(2.64)
 AC_CONFIG_MACRO_DIR([m4])
-AC_INIT([dhcpd-pools],[2.14],[kerolasa@iki.fi],,[http://dhcpd-pools.sourceforge.net/])
+AC_INIT([dhcpd-pools],
+	m4_esyscmd([build-aux/git-version-gen .tarball-version]),
+	[kerolasa@iki.fi],,[http://dhcpd-pools.sourceforge.net/])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/dhcpd-pools.h])
 AC_CONFIG_HEADERS([config.h])
@@ -42,12 +44,27 @@ AC_CHECK_FUNCS([inet_ntoa memset strerror strstr strdup])
 
 # GNU commandline parsing in getopt.h present?
 AC_CHECK_HEADERS(getopt.h, AC_DEFINE(HAVE_GETOPT_H),
-        import_sources="getopt.c getopt1.c $import_sources")
+	import_sources="getopt.c getopt1.c $import_sources")
 
 AC_CONFIG_FILES([Makefile
-                 man/Makefile
-                 src/Makefile
-                 contrib/Makefile])
+		 man/Makefile
+		 src/Makefile
+		 contrib/Makefile])
+
+AC_MSG_CHECKING(whether program_invocation_short_name is defined)
+AC_TRY_COMPILE([#include <argp.h>],
+		[program_invocation_short_name = "test";],
+		AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1,
+			[Define if program_invocation_short_name is defined])
+		AC_MSG_RESULT(yes),
+		AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING([whether __progname is defined])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([extern char *__progname;],
+	[if (*__progname == 0) return;])],
+	AC_DEFINE(HAVE___PROGNAME, 1, [Define if __progname is defined])
+	AC_MSG_RESULT(yes),
+	AC_MSG_RESULT(no))
 
 AC_ARG_WITH(dhcpd-conf,
 	[AC_HELP_STRING([--with-dhcpd-conf], [default path of dhcpd.conf])],