[systemd-commits] 2 commits - configure.ac Makefile.am src/path-lookup.c

[Lennart Poettering]

 Makefile.am       |    8 ++++----
 configure.ac      |    3 ++-
 src/path-lookup.c |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 8745297f9853c4a17bac69e1b7e652fe81bc1940
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 17 23:47:59 2010 +0200

    gcc: disable warn_unused_result attribute warnings

diff --git a/configure.ac b/configure.ac
index 1d358d2..6e28bfc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,7 @@ CC_CHECK_CFLAGS_APPEND([ \
         -Wno-overlength-strings \
         -Wno-unused-parameter \
         -Wno-missing-field-initializers \
+        -Wno-unused-result \
         -Wp,-D_FORTIFY_SOURCE=2 \
         -ffast-math \
         -fno-common \
diff --git a/src/path-lookup.c b/src/path-lookup.c
index 7a5b9b8..093e04d 100644
--- a/src/path-lookup.c
+++ b/src/path-lookup.c
@@ -96,7 +96,7 @@ static char** session_dirs(void) {
                  * one. */
 
                 mkdir_parents(data_home, 0777);
-                symlink("../../../.config/systemd/session", data_home);
+                (void) symlink("../../../.config/systemd/session", data_home);
         }
 
         if ((e = getenv("XDG_DATA_DIRS")))
commit 634826b51b074b2e6d9314031bdd9abdcf862b54
Author: Pavol Rusnak <stick at gk2.sk>
Date:   Mon Jun 14 09:41:59 2010 +0200

    fix --nonet calls to xsltproc
    
    Also, fix spelling of openSUSE

diff --git a/Makefile.am b/Makefile.am
index ca2381d..798b463 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -465,20 +465,20 @@ endif
 if HAVE_XSLTPROC
 XSLTPROC_PROCESS_MAN = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+	$(XSLTPROC) -o $@ --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
 XSLTPROC_PROCESS_MAN_IN = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(XSLTPROC) -o ${@:.in=} -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< && \
+	$(XSLTPROC) -o ${@:.in=} --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< && \
 	mv ${@:.in=} $@
 
 XSLTPROC_PROCESS_HTML = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
+	$(XSLTPROC) -o $@ --nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
 
 XSLTPROC_PROCESS_HTML_IN = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(XSLTPROC) -o ${@:.in=} -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< && \
+	$(XSLTPROC) -o ${@:.in=} --nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< && \
 	mv ${@:.in=} $@
 
 man/%.5: man/%.xml
diff --git a/configure.ac b/configure.ac
index 5671df4..1d358d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -241,7 +241,7 @@ case $with_distro in
                 ;;
         suse)
                 SYSTEM_SYSVRCND_PATH=/etc/init.d
-                AC_DEFINE(TARGET_SUSE, [], [Target is OpenSUSE/SLE])
+                AC_DEFINE(TARGET_SUSE, [], [Target is openSUSE/SLE])
                 M4_DISTRO_FLAG=-DTARGET_SUSE=1
                 ;;
         debian)