EXEEXT cleanups, to hopefully allow pinger to install cleanly

on cygwin etc..

diff --git a/Makefile.am b/Makefile.am
index 84668e9575b5e6a8ce45ac713feb5568c1d1f5a5..dce24210780f86c05dfe5501eae5a170e17e91f3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 #
-# $Id: Makefile.am,v 1.13 2002/08/31 13:16:13 robertc Exp $
+# $Id: Makefile.am,v 1.14 2002/09/29 12:55:52 hno Exp $
 #
 
 AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5
@@ -8,6 +8,7 @@ DIST_SUBDIRS    = lib snmplib scripts src icons errors contrib doc helpers
 SUBDIRS                = lib @makesnmplib@ scripts src icons errors doc helpers
 
 DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
+DEFAULT_PINGER         = $(libexecdir)/pinger$(EXEEXT)
 
 dist-hook:
        @ for subdir in "include"; do \
@@ -35,5 +36,5 @@ EXTRA_DIST = \
        bootstrap.sh
 
 install-pinger:
-       chown root $(libexecdir)/pinger$(EXEEXT)
-       chmod 4711 $(libexecdir)/pinger$(EXEEXT)
+       chown root $(DEFAULT_PINGER) 
+       chmod 4711 $(DEFAULT_PINGER)

diff --git a/configure.in b/configure.in
index 231d5f46e6bba88373c4ac326e10e5d2d71bc9b8..567aa7eb01e6e81bed63d35d2d7bb6924f82d369 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.285 2002/09/20 10:56:56 hno Exp $
+dnl  $Id: configure.in,v 1.286 2002/09/29 12:55:52 hno Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@ AC_INIT(src/main.c)
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 2.6-DEVEL)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.285 $)dnl
+AC_REVISION($Revision: 1.286 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -372,7 +372,6 @@ for fs in $STORE_MODULES none; do
     case "$fs" in
     diskd)
         STORE_MODULE_SUBDIRS="$STORE_MODULE_SUBDIRS $fs"
-       OPT_DISKD_EXE='diskd$(EXEEXT)'
        ;;
     aufs)
        if test -z "$with_pthreads"; then
@@ -390,7 +389,6 @@ for fs in $STORE_MODULES none; do
 done
 AC_SUBST(STORE_MODULES)
 AC_SUBST(STORE_MODULE_SUBDIRS)
-AC_SUBST(OPT_DISKD_EXE)
 
 
 dnl --enable-heap-replacement compability option
@@ -438,19 +436,15 @@ AC_SUBST(REPL_OBJS)
 REPL_LIBS="`echo $REPL_OBJS|sed -e 's%repl/%%g'`"
 AC_SUBST(REPL_LIBS)
 
-OPT_PINGER=''
-OPT_PINGER_EXE=''
+AM_CONDITIONAL(ENABLE_PINGER, false)
 AC_ARG_ENABLE(icmp,
 [  --enable-icmp           Enable ICMP pinging],
 [ if test "$enableval" = "yes" ; then
     echo "ICMP enabled"
     AC_DEFINE(USE_ICMP)
-    OPT_PINGER='pinger'
-    OPT_PINGER_EXE='pinger$(EXEEXT)'
+    AM_CONDITIONAL(ENABLE_PINGER, true)
   fi
 ])
-AC_SUBST(OPT_PINGER)
-AC_SUBST(OPT_PINGER_EXE)
 
 AM_CONDITIONAL(USE_DELAY_POOLS, false)
 AC_ARG_ENABLE(delay-pools,
@@ -835,12 +829,8 @@ AC_ARG_ENABLE(internal-dns,
 ])
 if test "$use_dnsserver" = "yes"; then
     AC_DEFINE(USE_DNSSERVERS)
-    OPT_DNSSERVER_EXE='dnsserver$(EXEEXT)'
     AM_CONDITIONAL(USE_DNSSERVER, true)
-else
-    OPT_DNSSERVER_EXE=''
 fi
-AC_SUBST(OPT_DNSSERVER_EXE)
 
 AC_ARG_ENABLE(truncate,
 [  --enable-truncate       This uses truncate() instead of unlink() when

diff --git a/src/Makefile.am b/src/Makefile.am
index cf959c183378b1d81a1ba09adf3a3111f5cb6978..9f78535255de33282b7394b2f033f036a52f0e02 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.32 2002/09/26 21:13:52 robertc Exp $
+#  $Id: Makefile.am,v 1.33 2002/09/29 12:55:52 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -39,11 +39,15 @@ endif
 if ENABLE_UNLINKD
 UNLINKDSOURCE = unlinkd.c
 UNLINKD = unlinkd
-UNLINKD_EXE = unlinkd$(EXEEXT)
 else
 UNLINKDSOURCE = 
 UNLINKD = 
-UNLINKD_EXE =
+endif
+
+if ENABLE_PINGER
+PINGER = pinger
+else
+PINGER = 
 endif
 
 if ENABLE_SSL
@@ -79,7 +83,7 @@ bin_PROGRAMS = \
        squidclient
 
 libexec_PROGRAMS = \
-       @OPT_PINGER@ \
+       $(PINGER) \
        $(DNSSERVER) \
        $(UNLINKD) \
        cachemgr$(CGIEXT)
@@ -282,16 +286,16 @@ EXTRA_DIST = \
 DEFAULT_PREFIX         = $(prefix)
 DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
 DEFAULT_MIME_TABLE     = $(sysconfdir)/mime.conf
-DEFAULT_DNSSERVER       = $(libexecdir)/@OPT_DNSSERVER_EXE@
+DEFAULT_DNSSERVER       = $(libexecdir)/dnsserver$(EXEEXT)
 DEFAULT_LOG_PREFIX     = $(localstatedir)/logs
 DEFAULT_CACHE_LOG       = $(DEFAULT_LOG_PREFIX)/cache.log
 DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_PREFIX)/access.log
 DEFAULT_STORE_LOG       = $(DEFAULT_LOG_PREFIX)/store.log
 DEFAULT_PID_FILE        = $(DEFAULT_LOG_PREFIX)/squid.pid
 DEFAULT_SWAP_DIR        = $(localstatedir)/cache
-DEFAULT_PINGER         = $(libexecdir)/@OPT_PINGER_EXE@
-DEFAULT_UNLINKD                = $(libexecdir)/$(UNLINKD_EXE)
-DEFAULT_DISKD          = $(libexecdir)/@OPT_DISKD_EXE@
+DEFAULT_PINGER         = $(libexecdir)/pinger$(EXEEXT)
+DEFAULT_UNLINKD                = $(libexecdir)/unlinkd$(EXEEXT)
+DEFAULT_DISKD          = $(libexecdir)/diskd$(EXEEXT)
 DEFAULT_ICON_DIR       = $(datadir)/icons
 DEFAULT_ERROR_DIR      = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
 DEFAULT_MIB_PATH       = $(datadir)/mib.txt