From 100570c7f91d3bfe8f90536f96c8154c78641b1d Mon Sep 17 00:00:00 2001 From: Alan Brault Date: Mon, 2 May 2011 16:35:59 -0400 Subject: Add configure checks for strchrnul() and strcasestr() and config.h entries Add __NLINUX__ and __NSOLARIS__ platform checks to configure and config.h entries --- src/Makefile.in | 4 ++-- src/user.c | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/Makefile.in b/src/Makefile.in index 6dc339b..3474743 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(sbindir)" @@ -52,7 +52,7 @@ am_duser_OBJECTS = duser.$(OBJEXT) user.$(OBJEXT) util.$(OBJEXT) \ log.$(OBJEXT) cfg.$(OBJEXT) duser_OBJECTS = $(am_duser_OBJECTS) duser_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f diff --git a/src/user.c b/src/user.c index 72a7c13..f9b24a8 100644 --- a/src/user.c +++ b/src/user.c @@ -32,10 +32,6 @@ #include #include #include -#ifdef _NLINUX_ -# define HAVE_STRCHRNUL -# define HAVE_STRCASESTR -#endif #include "duser.h" extern char list_path[PATH_MAX]; @@ -320,7 +316,7 @@ int get_file_count(const char* path) while((ep = readdir(dp))) { -#ifdef _NLINUX_ +#ifdef __NSOLARIS__ char path[PATH_MAX]; struct stat st; snprintf(path, PATH_MAX, "%s%s", list_path, ep->d_name); @@ -376,7 +372,7 @@ char** get_file_list(const char* path, int count) } while((ep = readdir(dp))) { -#ifdef _NLINUX_ +#ifdef __NSOLARIS__ char path[PATH_MAX]; struct stat st; snprintf(path, PATH_MAX, "%s%s", list_path, ep->d_name); -- cgit