update configure script

git-svn-id: file:///home/lennart/svn/public/waproamd/trunk@55 022f378f-78c4-0310-b860-d162c87e6274

1 files changed, 38 insertions, 19 deletions

diff --git a/configure.ac b/configure.ac
index 3c6ab78..bf1a480 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,42 +19,34 @@
 # along with waproamd; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
-AC_PREREQ(2.57)
-AC_INIT([waproamd], [0.5], [mzjncebnzq (at) 0pointer (dot) de])
+AC_PREREQ(2.59)
+AC_INIT([waproamd],[0.5],[mzjncebnzq (at) 0pointer (dot) de])
 AC_CONFIG_SRCDIR([src/waproamd.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign -Wall])
 
+AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/waproamd/])
+
+if type -p stow > /dev/null && test -d /usr/local/stow ; then
+   AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***])
+   ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"
+fi
+
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
-AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/waproamd/])
-
 # If using GCC specifiy some additional parameters
 if test "x$GCC" = "xyes" ; then
    CFLAGS="$CFLAGS -pipe -Wall"
 fi
 
-if type -p stow > /dev/null && test -d /usr/local/stow ; then
-   AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***])
-   ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"
-fi
-
-# Set SysV init script directory
-SYSV_INITDIR='$(sysconfdir)/init.d'
-AC_SUBST(SYSV_INITDIR)
-
 # Checks for libraries.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS([fcntl.h limits.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h unistd.h])
 
-PKG_CHECK_MODULES(LIBDAEMON, [libdaemon >= 0.4])
-AC_SUBST(LIBDAEMON_CFLAGS)
-AC_SUBST(LIBDAEMON_LIBS)
-
 AC_C_CONST
 AC_TYPE_MODE_T
 AC_TYPE_PID_T
@@ -67,9 +59,36 @@ AC_FUNC_MEMCMP
 AC_FUNC_SELECT_ARGTYPES
 AC_CHECK_FUNCS([dup2 ftruncate memset select setenv socket strchr strcspn strdup strerror strrchr])
 
+PKG_CHECK_MODULES(LIBDAEMON, [ libdaemon >= 0.4 ])
+AC_SUBST(LIBDAEMON_CFLAGS)
+AC_SUBST(LIBDAEMON_LIBS)
+
+# Set SysV init script directory
+# Init script location
+AC_ARG_WITH(initdir, AS_HELP_STRING(--with-initdir=DIR,Install init script in DIR (system dependent default)))
+
+test "x$with_initdir" = xyes -o "x$with_initdir" = xno && with_initdir=
+
+if test "x$with_initdir" = x ; then
+    if test -d /etc/init.d ; then
+        SYSINITDIR=/etc/init.d
+    else
+    	if test -d /etc/rc.d/init.d ; then
+        	SYSINITDIR=/etc/rc.d/init.d
+    	else
+        	AC_MSG_ERROR([missing --with-initdir=DIR])
+	    fi
+    fi
+else
+   SYSINITDIR="$with_initdir"
+fi
+
+AC_MSG_NOTICE([*** Init sript will be installed in $SYSINITDIR ***])
+AC_SUBST(SYSINITDIR)
+
 # LYNX documentation generation
 AC_ARG_ENABLE(lynx,
-        AC_HELP_STRING([--disable-lynx], [Turn off lynx usage for documentation generation]),
+        AS_HELP_STRING(--disable-lynx,Turn off lynx usage for documentation generation),
 [case "${enableval}" in
   yes) lynx=yes ;;
   no)  lynx=no ;;
@@ -88,7 +107,7 @@ AM_CONDITIONAL([USE_LYNX], [test "x$lynx" = xyes])
 
 # XMLTOMAN manpage generation
 AC_ARG_ENABLE(xmltoman,
-        AC_HELP_STRING([--disable-xmltoman], [Disable rebuilding of man pages with xmltoman]),
+        AS_HELP_STRING(--disable-xmltoman,Disable rebuilding of man pages with xmltoman),
 [case "${enableval}" in
   yes) xmltoman=yes ;;
   no)  xmltoman=no ;;