diff options
| author | Qball Cow <qball@qballcow.nl> | 2005-12-14 10:32:48 +0000 |
|---|---|---|
| committer | Qball Cow <qball@qballcow.nl> | 2005-12-14 10:32:48 +0000 |
| commit | a34c4af1721a876fcd8c9103f9295e39a77f0d33 (patch) | |
| tree | cea44adc55fc0b1cd796593cc45151f4fcc20773 | |
| parent | 1dc252c920a3ecba088ed55c63e23df2ef415bc1 (diff) | |
| download | mpd-a34c4af1721a876fcd8c9103f9295e39a77f0d33.tar.gz mpd-a34c4af1721a876fcd8c9103f9295e39a77f0d33.tar.xz mpd-a34c4af1721a876fcd8c9103f9295e39a77f0d33.zip | |
Configure fix, so when no glib found it gives a error, and another race condition fix in the master proces patch.
git-svn-id: https://svn.musicpd.org/mpd/trunk@3730 09075e82-0dd4-0310-85a5-a0d7c8717e4f
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 264fcc707..4635f1314 100644 --- a/configure.ac +++ b/configure.ac @@ -84,7 +84,7 @@ AC_CHECK_LIB(nsl,gethostbyname,MPD_LIBS="$MPD_LIBS -lnsl",) AC_CHECK_LIB(m,exp,MPD_LIBS="$MPD_LIBS -lm",) -PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.0, [MPD_LIBS="$MPD_LIBS $GLIB_LIBS" MPD_CFLAGS="$MPD_CFLAGS $GLIB_CFLAGS"],[echo "Unable to find glib-2.0 of version 2.0 or above"]) +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 1866ecfe0..5baf3dea1 100644 --- a/src/main.c +++ b/src/main.c @@ -520,11 +520,11 @@ int main(int argc, char * argv[]) { initAudioConfig(); initAudioDriver(); + initSigHandlers(); startMainProcess(); /* This is the main process which has * been forked from the master process. */ - initSigHandlers(); initPermissions(); |