From: Pekka Riikonen <priikone@silcnet.org>
Date: Thu, 28 Apr 2005 18:04:13 +0000 (+0000)
Subject: 	updates.
X-Git-Tag: autodist.1.3~34
X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=46d28a5e3213f0ed5c550ce70686d351c564156c;p=silc.git

	updates.
---

diff --git a/Makefile.defines_int.in b/Makefile.defines_int.in
index 3f829471..718cd7a6 100644
--- a/Makefile.defines_int.in
+++ b/Makefile.defines_int.in
@@ -30,7 +30,7 @@ silc_install_prefix=@prefix@
 #
 # Common libraries that are linked against the created executable
 #
-SILC_COMMON_LIBS= @LIBS@ -L$(silc_top_srcdir)/lib -lsilc
+SILC_COMMON_LIBS= -L$(silc_top_srcdir)/lib -lsilc @LIBS@
 
 #
 # Common compilation flags
diff --git a/apps/silcd/Makefile.am b/apps/silcd/Makefile.am
index d166e1fb..8f1c1122 100644
--- a/apps/silcd/Makefile.am
+++ b/apps/silcd/Makefile.am
@@ -36,7 +36,7 @@ silcd_SOURCES = \
 	serverid.c \
 	server_version.c
 
-LIBS = $(SILC_COMMON_LIBS) -lsilc
+LIBS = $(SILC_COMMON_LIBS)
 LDADD =
 
 EXTRA_DIST = *.h
diff --git a/configure.ad b/configure.ad
index 5de48896..5cab5873 100644
--- a/configure.ad
+++ b/configure.ad
@@ -315,6 +315,9 @@ else
     alpha*-dec-osf*)
       SILC_ADD_CFLAGS(-g3 -O2, SILC_ADD_CFLAGS(-g3 -O, SILC_ADD_CFLAGS(-O)))
       ;;
+    mips*-sgi-irix6.5*)
+      SILC_ADD_CFLAGS(-g3 -O2, SILC_ADD_CFLAGS(-g3 -O, SILC_ADD_CFLAGS(-O)))
+      ;;
     *)
       SILC_ADD_CFLAGS(-g)
       SILC_ADD_CFLAGS(-O2, SILC_ADD_CFLAGS(-O))
diff --git a/distdir/server b/distdir/server
index 1ca33264..97f82d34 100644
--- a/distdir/server
+++ b/distdir/server
@@ -4,7 +4,7 @@ bug-report silc-devel@lists.silcnet.org
 
 inherit common
 define SILC_DIST_SERVER
-#undef SILC_DIST_SFTP
+undef SILC_DIST_SFTP
 
 post-process-dist-hook distdir/post-process-dist
 post-dist-hook distdir/post-dist
diff --git a/includes/silcincludes.h.in b/includes/silcincludes.h.in
index de9a23d2..9f0bcf41 100644
--- a/includes/silcincludes.h.in
+++ b/includes/silcincludes.h.in
@@ -146,7 +146,7 @@ extern "C" {
 #if defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT)
 #include <getopt.h>
 #else
-#include "getopt.h"
+#include "getopti.h"
 #endif
 
 #ifdef SOCKS5
diff --git a/lib/contrib/Makefile.am b/lib/contrib/Makefile.am
index 2ce30bfe..1fab5f70 100644
--- a/lib/contrib/Makefile.am
+++ b/lib/contrib/Makefile.am
@@ -28,9 +28,9 @@ endif
 STRINGPREP = nfkc.c rfc3454.c stringprep.c
 
 if SILC_WIN32
-libcontrib_la_SOURCES = getopt.c $(STRINGPREP)
+libcontrib_la_SOURCES = getopti.c $(STRINGPREP)
 else
-libcontrib_la_SOURCES = getopt.c $(STRINGPREP) $(REGEX)
+libcontrib_la_SOURCES = getopti.c $(STRINGPREP) $(REGEX)
 endif
 
 EXTRA_DIST = *.c *.h
diff --git a/lib/contrib/getopt.c b/lib/contrib/getopti.c
similarity index 100%
rename from lib/contrib/getopt.c
rename to lib/contrib/getopti.c
diff --git a/lib/contrib/getopt.h b/lib/contrib/getopti.h
similarity index 84%
rename from lib/contrib/getopt.h
rename to lib/contrib/getopti.h
index 2ef66b21..449e4b55 100644
--- a/lib/contrib/getopt.h
+++ b/lib/contrib/getopti.h
@@ -1,5 +1,5 @@
-#ifndef GETOPT_H
-#define GETOPT_H
+#ifndef GETOPTI_H
+#define GETOPTI_H
 
 #ifndef SILC_EPOC
 #if !defined(HAVE_GETOPT) && !defined(HAVE_GETOPT_H)
@@ -12,4 +12,4 @@ int getopt(int argc, char * const *argv, const char *optstring);
 #endif /* !HAVE_GETOPT && !HAVE_GETOPT_H */
 #endif /* !SILC_EPOC */
 
-#endif /* GETOPT_H */
+#endif /* GETOPTI_H */
diff --git a/lib/silc.pc.in b/lib/silc.pc.in
index 0a1a2bce..947bcbc0 100644
--- a/lib/silc.pc.in
+++ b/lib/silc.pc.in
@@ -7,6 +7,6 @@ Name: @PACKAGE@
 Description: SILC Library
 Version: @VERSION@
 Conflicts: libsilc <= 0.9.12
-Libs: @LIBS@ -L${libdir} -lsilc
+Libs: -L${libdir} -lsilc @LIBS@
 Cflags: -I${includedir}
 
diff --git a/lib/silcclient.pc.in b/lib/silcclient.pc.in
index cd5854f7..d0437b05 100644
--- a/lib/silcclient.pc.in
+++ b/lib/silcclient.pc.in
@@ -8,6 +8,6 @@ Description: SILC Client Library
 Version: @VERSION@
 Conflicts: libsilc <= 0.9.12
 Requires: silc = @VERSION@
-Libs: @LIBS@ -L${libdir} -lsilcclient
+Libs: -L${libdir} -lsilcclient @LIBS@
 Cflags: -I${includedir}