Remove $(VERSIONFILE) dependencies

diff --git a/build/lib.mk b/build/lib.mk
index 28c3df63d4c418f60fbc0fb6b532e49ee185c82c..453e055d484174f8dd07c8b7ae5e27855f6a963c 100644 (file)
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -8,13 +8,9 @@
 
 all-common: $(LIBRARY) $(PROGRAMS)
 
-version.c: $(OBJS) $(srcdir)/Version.c
+version.c: $(OBJS)
        $(RM) $@
-       (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` \
-       h=`$(HOSTNAME)` t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-       -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-       -e "s|%VERSION%|$${v}|" \
-       < $(srcdir)/Version.c > $@)
+       $(MKVERSION) $(LIBRARY) > $@
 
 install-common: FORCE
 

diff --git a/build/man.mk b/build/man.mk
index 900267984f5081e9a6d9db3db3ed932dc3b7007f..9bcc0c22b6d120573dc6bd95068ca100e8603a81 100644 (file)
--- a/build/man.mk
+++ b/build/man.mk
@@ -10,10 +10,9 @@ MANDIR=$(mandir)/man$(MANSECT)
 TMP_SUFFIX=tmp
 
 all-common:
-       VERSION=`$(CAT) $(VERSIONFILE)`; \
        PAGES=`cd $(srcdir); echo *.$(MANSECT)`; \
        for page in $$PAGES; do \
-               $(SED) -e "s%LDVERSION%$$VERSION%" \
+               $(SED) -e "s%LDVERSION%$(VERSION)%" \
                        -e 's%ETCDIR%$(sysconfdir)%' \
                        -e 's%LOCALSTATEDIR%$(localstatedir)%' \
                        -e 's%SYSCONFDIR%$(sysconfdir)%' \

diff --git a/configure b/configure
index 6e24d95925b4dacb6d2b621f5f4a14515cd052ad..7c88e31f8d0c30c1dd4cf892fc23a970969718f0 100755 (executable)
--- a/configure
+++ b/configure
@@ -2311,7 +2311,7 @@ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -4154,7 +4154,7 @@ fi
 ol_link_tls=no
 if test $ol_with_tls != no ; then
        
-       for ac_hdr in ssl.h ssl/ssl.h
+       for ac_hdr in ssl.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -4195,7 +4195,7 @@ fi
 done
 
        
-       if test $ac_cv_header_ssl_h = yes -o $ac_cv_header_ssl_ssl_h = yes ; then
+       if test $ac_cv_header_ssl_h = yes ; then
                echo $ac_n "checking for SSLeay_add_ssl_algorithms in -lssl""... $ac_c" 1>&6
 echo "configure:4201: checking for SSLeay_add_ssl_algorithms in -lssl" >&5
 ac_lib_var=`echo ssl'_'SSLeay_add_ssl_algorithms | sed 'y%./+-%__p_%'`