aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2006-06-04 11:36:06 +0000
committerEric Wong <normalperson@yhbt.net>2006-06-04 11:36:06 +0000
commit5cbfdf3517d0e9711da972989151c29c5dfadad8 (patch)
tree8c5ddbb54f2ae740f9fd101d74fbe2e571312b33
parentab069b7e594b4de202cd4b0a083379397e278339 (diff)
downloadmpd-5cbfdf3517d0e9711da972989151c29c5dfadad8.tar.gz
mpd-5cbfdf3517d0e9711da972989151c29c5dfadad8.tar.xz
mpd-5cbfdf3517d0e9711da972989151c29c5dfadad8.zip
correctly check for setenv() function
git-svn-id: https://svn.musicpd.org/mpd/trunk@4245 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--configure.ac1
-rw-r--r--src/main.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 9eb380471..6222f3abb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,6 +84,7 @@ AC_CHECK_LIB(socket,socket,MPD_LIBS="$MPD_LIBS -lsocket",)
AC_CHECK_LIB(nsl,gethostbyname,MPD_LIBS="$MPD_LIBS -lnsl",)
AC_CHECK_LIB(m,exp,MPD_LIBS="$MPD_LIBS -lm",)
+AC_CHECK_FUNCS(setenv)
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.0, [MPD_LIBS="$MPD_LIBS $GLIB_LIBS" MPD_CFLAGS="$MPD_CFLAGS $GLIB_CFLAGS"],[echo "";echo "** ERROR:Unable to find glib-2.0 of version 2.0 or above **" ; exit 1])
diff --git a/src/main.c b/src/main.c
index 944eb037a..2b76f8d9d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -70,7 +70,7 @@ typedef struct _Options {
/*
* from git-1.3.0, needed for solaris
*/
-#ifndef setenv
+#ifndef HAVE_SETENV
int setenv(const char *name, const char *value, int replace)
{
int out;
@@ -103,7 +103,7 @@ int setenv(const char *name, const char *value, int replace)
return out;
}
-#endif
+#endif /* HAVE_SETENV */
void usage(char * argv[]) {
ERROR("usage:\n");