From c1e58860366b9a54ef46396c5e09a5bebadd9b46 Mon Sep 17 00:00:00 2001
From: card_captor <card_captor@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Wed, 7 Apr 2004 16:41:43 +0000
Subject: [PATCH] configure script now searches for -lnsl and -lsocket.

git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@1649 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
 sm5/CHANGELOG    |  4 +++-
 sm5/configure.in |  7 +++++--
 sm5/smartd.c     | 13 +++++++++----
 sm5/smartd.cpp   | 13 +++++++++----
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index b6802396b..8c01d7bc3 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
 CHANGELOG for smartmontools
 
-$Id: CHANGELOG,v 1.392 2004/04/07 11:17:07 chrfranke Exp $
+$Id: CHANGELOG,v 1.393 2004/04/07 16:41:42 card_captor Exp $
 
 The most recent version of this file is:
 http://cvs.sourceforge.net/viewcvs.py/smartmontools/sm5/CHANGELOG?sortby=date&view=markup
@@ -27,6 +27,8 @@ NOTES FOR FUTURE RELEASES: see TODO file.
 
 <ADDITIONS TO THE CHANGE LOG SHOULD BE ADDED JUST BELOW HERE, PLEASE>
 
+  [KS] configure.in now searches for -lnsl and -lsocket for Solaris.
+
   [CF] Win32/native smartd: Added thread to combine several syslog output
        lines into one single event log entry.
 
diff --git a/sm5/configure.in b/sm5/configure.in
index 97986059d..5ee4dae73 100644
--- a/sm5/configure.in
+++ b/sm5/configure.in
@@ -1,5 +1,5 @@
 #
-# $Id: configure.in,v 1.71 2004/04/05 09:41:44 guidog Exp $
+# $Id: configure.in,v 1.72 2004/04/07 16:41:43 card_captor Exp $
 #
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.50)
@@ -7,7 +7,7 @@ AC_INIT(smartmontools, 5.31, smartmontools-support@lists.sourceforge.net)
 AC_CONFIG_SRCDIR(smartctl.c)
 
 smartmontools_configure_date=`date -u +"%Y/%m/%d %T %Z"`
-smartmontools_cvs_tag=`echo '$Id: configure.in,v 1.71 2004/04/05 09:41:44 guidog Exp $'`
+smartmontools_cvs_tag=`echo '$Id: configure.in,v 1.72 2004/04/07 16:41:43 card_captor Exp $'`
 smartmontools_release_date=2004/03/07
 smartmontools_release_time="20:57:36 UTC"
 
@@ -40,11 +40,14 @@ case "${host}" in
 esac
 
 dnl Checks for libraries.
+AC_CHECK_LIB(nsl, main, LIBS="-lnsl ${LIBS}")
+AC_CHECK_LIB(socket, main, LIBS="-lsocket ${LIBS}";)
 
 dnl Checks for header files.
 AC_CHECK_HEADER([getopt.h])
 AC_CHECK_HEADERS([dev/ata/atavar.h])
 AC_CHECK_HEADERS([sys/int_types.h])
+AC_CHECK_HEADERS([netdb.h])
 dnl Checks for typedefs, structures, and compiler characteristics.
 
 dnl Checks for library functions.
diff --git a/sm5/smartd.c b/sm5/smartd.c
index 4e2f1a6a1..7131530bd 100644
--- a/sm5/smartd.c
+++ b/sm5/smartd.c
@@ -50,8 +50,7 @@
 #ifdef HAVE_GETOPT_LONG
 #include <getopt.h>
 #endif
-
-#ifdef HAVE_GETHOSTBYNAME
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
 
@@ -89,13 +88,17 @@ typedef int pid_t;
 #define SIGQUIT_KEYNAME "CONTROL-\\"
 #endif // _WIN32
 
+#if defined (__SVR4) && defined (__sun)
+int getdomainname(char *, int); /* no declaration in header files! */
+#endif
+
 #define ARGUSED(x) ((void)(x))
 
 // These are CVS identification information for *.c and *.h files
 extern const char *atacmdnames_c_cvsid, *atacmds_c_cvsid, *ataprint_c_cvsid, *escalade_c_cvsid, 
                   *knowndrives_c_cvsid, *os_XXXX_c_cvsid, *scsicmds_c_cvsid, *utility_c_cvsid;
 
-static const char *filenameandversion="$Id: smartd.c,v 1.303 2004/04/07 14:34:24 chrfranke Exp $";
+static const char *filenameandversion="$Id: smartd.c,v 1.304 2004/04/07 16:41:43 card_captor Exp $";
 #ifdef NEED_SOLARIS_ATA_CODE
 extern const char *os_solaris_ata_s_cvsid;
 #endif
@@ -106,7 +109,7 @@ extern const char *syslog_win32_c_cvsid;
 extern const char *int64_vc6_c_cvsid;
 #endif
 #endif
-const char *smartd_c_cvsid="$Id: smartd.c,v 1.303 2004/04/07 14:34:24 chrfranke Exp $" 
+const char *smartd_c_cvsid="$Id: smartd.c,v 1.304 2004/04/07 16:41:43 card_captor Exp $" 
 ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID
 KNOWNDRIVES_H_CVSID SCSICMDS_H_CVSID SMARTD_H_CVSID
 #ifdef SYSLOG_H_CVSID
@@ -446,6 +449,8 @@ char* dnsdomain(const char* hostname) {
     if ((p = strchr(hp->h_name, '.')))
       p++; // skip "."
   }
+#else
+  ARGUSED(hostname);
 #endif
   return p;
 }
diff --git a/sm5/smartd.cpp b/sm5/smartd.cpp
index b3de66e77..2338b9ef3 100644
--- a/sm5/smartd.cpp
+++ b/sm5/smartd.cpp
@@ -50,8 +50,7 @@
 #ifdef HAVE_GETOPT_LONG
 #include <getopt.h>
 #endif
-
-#ifdef HAVE_GETHOSTBYNAME
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
 
@@ -89,13 +88,17 @@ typedef int pid_t;
 #define SIGQUIT_KEYNAME "CONTROL-\\"
 #endif // _WIN32
 
+#if defined (__SVR4) && defined (__sun)
+int getdomainname(char *, int); /* no declaration in header files! */
+#endif
+
 #define ARGUSED(x) ((void)(x))
 
 // These are CVS identification information for *.c and *.h files
 extern const char *atacmdnames_c_cvsid, *atacmds_c_cvsid, *ataprint_c_cvsid, *escalade_c_cvsid, 
                   *knowndrives_c_cvsid, *os_XXXX_c_cvsid, *scsicmds_c_cvsid, *utility_c_cvsid;
 
-static const char *filenameandversion="$Id: smartd.cpp,v 1.303 2004/04/07 14:34:24 chrfranke Exp $";
+static const char *filenameandversion="$Id: smartd.cpp,v 1.304 2004/04/07 16:41:43 card_captor Exp $";
 #ifdef NEED_SOLARIS_ATA_CODE
 extern const char *os_solaris_ata_s_cvsid;
 #endif
@@ -106,7 +109,7 @@ extern const char *syslog_win32_c_cvsid;
 extern const char *int64_vc6_c_cvsid;
 #endif
 #endif
-const char *smartd_c_cvsid="$Id: smartd.cpp,v 1.303 2004/04/07 14:34:24 chrfranke Exp $" 
+const char *smartd_c_cvsid="$Id: smartd.cpp,v 1.304 2004/04/07 16:41:43 card_captor Exp $" 
 ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID
 KNOWNDRIVES_H_CVSID SCSICMDS_H_CVSID SMARTD_H_CVSID
 #ifdef SYSLOG_H_CVSID
@@ -446,6 +449,8 @@ char* dnsdomain(const char* hostname) {
     if ((p = strchr(hp->h_name, '.')))
       p++; // skip "."
   }
+#else
+  ARGUSED(hostname);
 #endif
   return p;
 }
-- 
GitLab