From c14ecfe452046c00ffe83171ec7f9b64ff374795 Mon Sep 17 00:00:00 2001
From: Alan Brault <alan.brault@incruentatus.net>
Date: Mon, 2 May 2011 18:47:10 -0400
Subject: Make strcasestr() and strchrnul() into separate compat files Force
 everyone to use compat functions not just Solaris Remove libsysfs from
 buildconf Add libtool support (needed for libdusercompat.a)

---
 include/compat.h    | 33 ---------------------------------
 include/config.h.in | 16 ++++++++++------
 include/duser.h     |  5 +----
 3 files changed, 11 insertions(+), 43 deletions(-)
 delete mode 100644 include/compat.h

(limited to 'include')

diff --git a/include/compat.h b/include/compat.h
deleted file mode 100644
index f512c03..0000000
--- a/include/compat.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
-* duser - Manage MajorDomo lists
-* Copyright (C) 2011 Joseph Hunkeler <jhunkeler@gmail.com, jhunk@stsci.edu>
-*
-* This file is part of duser.
-*
-* duser is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* duser is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with duser. If not, see <http://www.gnu.org/licenses/>.
-**/
-
-#ifndef COMPAT_H
-#define COMPAT_H
-
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include "compat.h"
-
-char *strchrnul(const char* s, int c);
-char *strcasestr(const char *s, const char *find);
-
-#endif
-
diff --git a/include/config.h.in b/include/config.h.in
index 022e00a..4b1d187 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -3,6 +3,9 @@
 /* duser configuration path */
 #undef CFG_PATH
 
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
@@ -22,6 +25,9 @@
 /* Define to 1 if you have the `memset' function. */
 #undef HAVE_MEMSET
 
+/* host operating system is solaris */
+#undef HAVE_SOLARIS
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -64,6 +70,10 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 #undef NO_MINUS_C_MINUS_O
 
@@ -91,12 +101,6 @@
 /* Version number of package */
 #undef VERSION
 
-/* host operating system is linux */
-#undef __NLINUX__
-
-/* host operating system is solaris */
-#undef __NSOLARIS__
-
 /* Define to rpl_malloc if the replacement function should be used. */
 #undef malloc
 
diff --git a/include/duser.h b/include/duser.h
index 5a102bb..d562b33 100644
--- a/include/duser.h
+++ b/include/duser.h
@@ -28,7 +28,7 @@
 #include <limits.h>
 #define REGEX_MAX   255
 #define SELF	__FUNCTION__
-#ifndef __NSOLARIS__
+#ifndef HAVE_SOLARIS
 #	define FMTLIST "%20s\t%5d%23s\n"
 #else
 #	define FMTLIST "%20s\t%5d%16s\n"
@@ -77,9 +77,6 @@ int user_cmd(const int argc, char* argv[]);
 int user_choice(char c);
 int user_add(const char* filename, const char* needle);
 int user_new_list(const char* fname);
-#ifdef __NSOLARIS__
 char *strcasestr(const char *s, const char *find);
 char *strchrnul(const char* s, int c);
 #endif
-
-#endif
-- 
cgit 


From ccd37136a5003518f0bbcbf4edefdbf0e5a91e08 Mon Sep 17 00:00:00 2001
From: Alan Brault <alan.brault@incruentatus.net>
Date: Mon, 2 May 2011 18:58:40 -0400
Subject: Remove strcasestr() and strchrnul() checks from configure, using
 libdusercompat.a instead

---
 include/config.h.in | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'include')

diff --git a/include/config.h.in b/include/config.h.in
index 4b1d187..65ae69b 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -37,12 +37,6 @@
 /* Define to 1 if you have the `strcasecmp' function. */
 #undef HAVE_STRCASECMP
 
-/* Define to 1 if you have the `strcasestr' function. */
-#undef HAVE_STRCASESTR
-
-/* Define to 1 if you have the `strchrnul' function. */
-#undef HAVE_STRCHRNUL
-
 /* Define to 1 if you have the `strdup' function. */
 #undef HAVE_STRDUP
 
-- 
cgit