* Fix some CYGWIN compile problems

* Remove libnsl from configure


svn: 2914

Makefile.in

@@ -75,8 +75,7 @@ default: wraith
 test:
 
 cleanutils:
-	@rm -f src/stringfix src/sorthelp src/makehelp
-	@rm -f src/stringfix.exe src/sorthelp.exe src/makehelp.exe
+	@rm -f src/stringfix@EXEEXT@ src/sorthelp@EXEEXT@ src/makehelp@EXEEXT@
 
 clean:  cleanutils
 	+@cd src && $(MAKE) clean
@@ -84,7 +83,7 @@ clean:  cleanutils
 	+@cd src/crypto && $(MAKE) clean
 	+@cd src/mod && $(MAKE) distclean
 	@rm -f $(BINEXEC) stamp.* *~ src/*~ configure.temp .mangled
-	@rm -f src/help.h src/response.h src/responses.h utctime ts
+	@rm -f src/help.h src/response.h src/responses.h utctime@EXEEXT@ ts@EXEEXT@
 
 distclean: clean
 	@rm -f Makefile src/Makefile src/compat/Makefile src/mod/Makefile src/crypto/Makefile
@@ -129,21 +128,21 @@ sort: sorthelp
 #	@(sed misc/help.txt -e "s/^$$/ /" > help~ && mv -f help~ misc/help.txt) || rm -f help~
 	@(sed -r -e :a -e 's/^$$/ /' -e '$$!N;s/^ \n:/:/;ta' -e 'P;D' misc/help.txt > help~ && mv -f help~ misc/help.txt) || rm -f help~
 	@cp -f misc/help.txt help.txt~
-	@(src/sorthelp misc/help.txt misc/help.txt || (cp -f help.txt~ misc/help.txt; echo "Sort failed, restoring backup."))
+	@(src/sorthelp@EXEEXT@ misc/help.txt misc/help.txt || (cp -f help.txt~ misc/help.txt; echo "Sort failed, restoring backup."))
 	@rm -f help.txt~
 
 help: makehelp stringfix
-	@src/makehelp misc/help.txt src/help.h.tmp~
+	@src/makehelp@EXEEXT@ misc/help.txt src/help.h.tmp~
 	@(if [ ! -f src/help.h ]; then \
 	touch src/help.h; \
 	fi)
-	@src/stringfix src/help.h.tmp~ src/help.h~ 1
+	@src/stringfix@EXEEXT@ src/help.h.tmp~ src/help.h~ 1
 	@(if test "x`$(DIFF) -qurN src/help.h~ src/help.h`" != "x"; then \
 	cp -f src/help.h~ src/help.h; \
 	fi)
 
 res: makeres
-	@src/makeres misc/responses.txt src/ 1
+	@src/makeres@EXEEXT@ misc/responses.txt src/ 1
 	@(if [ ! -f src/response.h ]; then \
 	touch src/response.h; \
 	fi)

autotools/includes/acinclude.m4

@@ -376,10 +376,10 @@ dnl
 AC_DEFUN([EGG_CHECK_LIBS], 
 [
   AC_CHECK_LIB(socket, socket)
-  AC_CHECK_LIB(nsl, connect)
+#  AC_CHECK_LIB(nsl, connect)
 #  AC_CHECK_LIB(dl, dlopen)
-  AC_CHECK_LIB(nsl, gethostbyname)
-  AC_CHECK_LIB(dns, gethostbyname)
+#  AC_CHECK_LIB(nsl, gethostbyname)
+#  AC_CHECK_LIB(dns, gethostbyname)
 
 #  AC_CHECK_LIB(z, gzopen, ZLIB="-lz")
 #  AC_CHECK_LIB(ssl, SSL_accept, SSL="-lssl -lcrypto", SSL="", -lcrypto) 

config.h.in

@@ -25,6 +25,10 @@
 /* Define to 1 if you have the `clock' function. */
 #undef HAVE_CLOCK
 
+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
+   */
+#undef HAVE_DECL_TZNAME
+
 /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
    */
 #undef HAVE_DIRENT_H
@@ -59,9 +63,6 @@
 /* Define to 1 if you have the `dl' library (-ldl). */
 #undef HAVE_LIBDL
 
-/* Define to 1 if you have the `dns' library (-ldns). */
-#undef HAVE_LIBDNS
-
 /* Define to 1 if you have the `nsl' library (-lnsl). */
 #undef HAVE_LIBNSL
 
@@ -273,16 +274,16 @@
 /* Define limit of random() function. */
 #undef RANDOM_MAX
 
-/* The size of a `int', as computed by sizeof. */
+/* The size of `int', as computed by sizeof. */
 #undef SIZEOF_INT
 
-/* The size of a `long', as computed by sizeof. */
+/* The size of `long', as computed by sizeof. */
 #undef SIZEOF_LONG
 
-/* The size of a `long long', as computed by sizeof. */
+/* The size of `long long', as computed by sizeof. */
 #undef SIZEOF_LONG_LONG
 
-/* The size of a `short', as computed by sizeof. */
+/* The size of `short', as computed by sizeof. */
 #undef SIZEOF_SHORT
 
 /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
@@ -340,7 +341,7 @@
 /* Define to rpl_realloc if the replacement function should be used. */
 #undef realloc
 
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
 
 /* Define to `int' if <sys/types.h> doesn't define. */

src/Makefile.in

@@ -73,22 +73,22 @@ blah:
 makeres: makeres.c
 	@echo -e "Compiling: \033[1mmakeres\033[0m"
 	@$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) makeres.c -o makeres
-	@$(STRIP) makeres
+	@$(STRIP) makeres@EXEEXT@
 
 makehelp: makehelp.c
 	@echo -e "Compiling: \033[1mmakehelp\033[0m"
 	@$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) makehelp.c -o makehelp
-	@$(STRIP) makehelp
+	@$(STRIP) makehelp@EXEEXT@
 
 sorthelp: sorthelp.c
 	@echo -e "Compiling: \033[1msorthelp\033[0m"
 	@$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) sorthelp.c -o sorthelp
-	@$(STRIP) sorthelp
+	@$(STRIP) sorthelp@EXEEXT@
 
 stringfix: stringfix.c common.h ../config.h eggdrop.h
 	@echo -e "Compiling: \033[1mstringfix\033[0m"
 	@$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) stringfix.c -o stringfix
-	@$(STRIP) stringfix
+	@$(STRIP) stringfix@EXEEXT@
 
 ../$(EGGEXEC): build_msg $(OBJS) mycrypto compatability
 	@echo ""
@@ -124,7 +124,7 @@ include ./.deps/includes
 
 .c.o: stringfix
 	@echo -e "Compiling: \033[1m`basename $< .c`\033[0m"
-	@./stringfix $< _$< || cp -f $< _$<
+	@./stringfix@EXEEXT@ $< _$< || cp -f $< _$<
 	source='$<' object='$@' depfile='.deps/$*.Po' tmpdepfile='.deps/$*.TPo' depmode=$(CCDEPMODE) $(depcomp) \
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c _$<  -o `basename $< .c`.o