---
Makefile.am | 11 ++++++++---
configure.ac | 59 ++++++++++++++++++++++++++++++++---------------------------
2 files changed, 40 insertions(+), 30 deletions(-)
Index: Makefile.am
===================================================================
--- Makefile.am.orig 2013-10-29 13:53:18.608827074 +0100
+++ Makefile.am 2013-10-29 13:54:03.306789770 +0100
@@ -1,8 +1,13 @@
bin_PROGRAMS = ez-ipupdate
-ez_ipupdate_SOURCES = ez-ipupdate.c conf_file.c conf_file.h md5.c md5.h cache_file.c cache_file.h error.h pid_file.c pid_file.h dprintf.h @EXTRASRC@
-ez_ipupdate_LDADD = @EXTRAOBJ@
+ez_ipupdate_SOURCES = ez-ipupdate.c conf_file.c conf_file.h md5.c md5.h \
+ cache_file.c cache_file.h error.h pid_file.c pid_file.h \
+ dprintf.h
-EXTRA_DIST = getpass.c ez-ipupdate.lsm example.conf example-pgpow.conf example-dhs.conf example-dyndns.conf example-ods.conf example-tzo.conf example-gnudip.conf example-easydns.conf example-justlinux.conf example-dyns.conf CHANGELOG mkbinary example-heipv6tb.conf
+EXTRA_DIST = getpass.c ez-ipupdate.lsm example.conf example-pgpow.conf \
+ example-dhs.conf example-dyndns.conf example-ods.conf \
+ example-tzo.conf example-gnudip.conf example-easydns.conf \
+ example-justlinux.conf example-dyns.conf CHANGELOG mkbinary \
+ example-heipv6tb.conf
AUTOMAKE_OPTIONS=foreign
Index: configure.ac
===================================================================
--- configure.ac.orig 2003-04-17 19:32:34.000000000 +0200
+++ configure.ac 2013-10-29 13:54:34.338065989 +0100
@@ -1,9 +1,10 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(ez-ipupdate.c)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(ez-ipupdate,3.0.11b8)
-
+AC_INIT([ez-ipupdat]e, [3.0.11b8])
+AC_CONFIG_SRCDIR([ez-ipupdate.c])
+AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_FILES(Makefile)
+AM_INIT_AUTOMAKE([foreign])
dnl Checks for programs.
@@ -16,13 +17,13 @@ AC_TYPE_SIGNAL
dnl Checks for libraries.
-AC_CHECK_FUNC(gethostbyname)
+AC_CHECK_FUNC([gethostbyname])
if test $ac_cv_func_gethostbyname = no; then
- AC_CHECK_LIB(nsl, gethostbyname)
+ AC_CHECK_LIB([nsl], [gethostbyname])
fi
-AC_CHECK_FUNC(connect)
+AC_CHECK_FUNC([connect])
if test $ac_cv_func_connect = no; then
- AC_CHECK_LIB(socket, connect)
+ AC_CHECK_LIB([socket], [connect])
fi
AC_CHECK_FUNCS( socket \
@@ -77,7 +78,8 @@ AC_CHECK_HEADERS( unistd.h \
,,
AC_MSG_ERROR(could not locate neccessary system header files) )
-AC_CHECK_LIB(c, sys_errlist, AC_DEFINE(HAVE_SYS_ERRLIST))
+AC_CHECK_LIB(c, sys_errlist, AC_DEFINE([HAVE_SYS_ERRLIST], 1,
+ [Define if you have sys_errlist]))
dnl you need at least to have getopt, but getopt_long will be used if it
dnl is present
@@ -86,27 +88,31 @@ if test "$ac_cv_func_getopt" != yes; the
AC_MSG_ERROR(getopt is needed for this program to work)
fi
-AC_CHECK_FUNC(getpass, AC_DEFINE(HAVE_GETPASS),
- [EXTRASRC="$EXTRASRC \$(srcdir)/getpass.c"]
- [EXTRAOBJ="$EXTRAOBJ \$(srcdir)/getpass.o"] )
+AC_CHECK_FUNC(getpass,
+ AC_DEFINE([HAVE_GETPASS], 1, [Define if you have the getpass function]),
+ AC_MSG_ERROR(Your system does not define getpass, fix it))
dnl Get system canonical name
AC_CANONICAL_HOST
-AC_DEFINE_UNQUOTED(OS, "${host}")
+AC_DEFINE_UNQUOTED([OS], "${host}", [Define the system canonical name])
dnl allow selection of the default service
dnl the default is to use ez-ip
-AC_MSG_CHECKING(for user supplied default service)
-AC_ARG_ENABLE(default-service,
- [ --enable-default-service=SERVICE
- the default service type to use
- possibilities are: ezip, pgpow, justlinux, dhs,
- dyndns, dyndns-static, ods, tzo, gnudip, easydns, easydns-partner, dyns, hn, zoneedit, heipv6tb],
+AC_MSG_CHECKING([for user supplied default service])
+AC_ARG_ENABLE([default-service],
+ AS_HELP_STRING([--enable-default-service=SERVICE],
+ [the default service type to use
+ possibilities are: ezip, pgpow, justlinux, dhs,
+ dyndns, dyndns-static, ods, tzo, gnudip, easydns,
+ easydns-partner, dyns, hn, zoneedit, heipv6tb, joker]),
[ use_SERVICE=$enableval;
AC_MSG_RESULT(yes) ],
[ AC_MSG_RESULT(no)
use_SERVICE=null
- AC_MSG_WARN(not setting default service) ] )
+ AC_MSG_WARN([not setting default service]) ] )
+
+AH_TEMPLATE([DEF_SERVICE], [Define the dyndns service to use by default])
+
case "$use_SERVICE" in
ezip ) AC_DEFINE(DEF_SERVICE, "ezip");;
ez-ip ) AC_DEFINE(DEF_SERVICE, "ezip");;
@@ -126,6 +132,7 @@ case "$use_SERVICE" in
hn ) AC_DEFINE(DEF_SERVICE, "hn");;
zoneedit ) AC_DEFINE(DEF_SERVICE, "zoneedit");;
heipv6tb ) AC_DEFINE(DEF_SERVICE, "heipv6tb");;
+ joker) AC_DEFINE(DEF_SERVICE, "joker");;
null ) AC_DEFINE(DEF_SERVICE, "NULL");;
"" ) ;;
* ) AC_MSG_ERROR(unknown default service type);;
@@ -135,21 +142,19 @@ dnl check weather we want debugging supp
dnl the default is to NOT use debugging support
AC_MSG_CHECKING(whether user wants debugging support)
AC_ARG_ENABLE(debug,
- [ --enable-debug include support for debugging],
- [ AC_DEFINE(DEBUG)
+ AS_HELP_STRING([--enable-debug], [include support for debugging]),
+ [ AC_DEFINE(DEBUG, 1, [Define if you want to debug the program])
AC_MSG_RESULT(yes) ],
[ AC_MSG_RESULT(no) ] )
dnl check weather we want to disable MD5 support
AC_MSG_CHECKING(whether user wants to dissable MD5 support)
AC_ARG_ENABLE(md5,
- [ --disable-md5 disable MD5 support],
+ AS_HELP_STRING([--disable-md5], [disable MD5 support]),
[ AC_MSG_RESULT(yes) ],
- [ AC_DEFINE(USE_MD5)
+ [ AC_DEFINE(USE_MD5, 1, [Define to use md5])
AC_MSG_RESULT(no) ] )
-AC_SUBST(EXTRASRC)
-AC_SUBST(EXTRAOBJ)
-AC_OUTPUT(Makefile)
+AC_OUTPUT()
