[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-363-gaf18a52

[Daniele Forsi]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libgnokii and core programs".

The branch, master has been updated
       via  af18a52f234f494a29994f14d27dc4691bfdb0fc (commit)
      from  6d13aa5dcd2922b2cadec0311a295fda46e40bc1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=af18a52f234f494a29994f14d27dc4691bfdb0fc


commit af18a52f234f494a29994f14d27dc4691bfdb0fc
Author: Vincent Untz <address@hidden>
Date:   Fri Feb 24 11:54:39 2012 +0100

    mgnokiidev: Respect SUID_CFLAGS and SUID_LDFLAGS
    
    This is a good way for distributors to use -fPIE/-pie when building
    gnokii.

diff --git a/configure.in b/configure.in
index ab0bb50..958b5aa 100644
--- a/configure.in
+++ b/configure.in
@@ -998,6 +998,11 @@ AC_DEFINE_UNQUOTED(SBINDIR, "$mgnokiidev_bindir", [Where 
mgnokiidev gets install
 AC_EXPAND_DIR(prefix_dir, "${prefix}")
 AC_DEFINE_UNQUOTED(PREFIX, "$prefix_dir", [Root dir for gnokii, xgnokii and 
smsd])
 
+AC_ARG_VAR([SUID_CFLAGS],
+           [CFLAGS used for binaries which are usually with the suid bit])
+AC_ARG_VAR([SUID_LDFLAGS],
+           [LDFLAGS used for binaries which are usually with the suid bit])
+
 AC_CONFIG_HEADERS([include/config.h])
 
 AC_SUBST(PACKAGE)
diff --git a/utils/Makefile.am b/utils/Makefile.am
index b28b873..763d020 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -3,7 +3,8 @@ DEFS = -DLOCALEDIR=\"$(localedir)\"
 sbin_PROGRAMS = mgnokiidev
 mgnokiidev_SOURCES = mgnokiidev.c
 mgnokiidev_LDADD = $(INTLLIBS) $(TCP_LIBS)
-mgnokiidev_CFLAGS = -I$(top_srcdir)/include
+mgnokiidev_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
+mgnokiidev_CFLAGS = -I$(top_srcdir)/include $(SUID_CFLAGS) $(AM_CFLAGS)
 
 scripts_DATA = sendsms
 scriptsdir = $(bindir)

-----------------------------------------------------------------------

Summary of changes:
 configure.in      |    5 +++++
 utils/Makefile.am |    3 ++-
 2 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs