From: Marcel Holtmann <marcel@holtmann.org>
Date: Sat, 5 Sep 2009 05:25:31 +0000 (+0200)
Subject: Enable compilation of GSM 07.10 code
X-Git-Tag: 0.5~156
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=12a3efe911251faa8ed1f6bbc5b7d00625cf8afe;p=platform%2Fupstream%2Fofono.git

Enable compilation of GSM 07.10 code
---

diff --git a/Makefile.am b/Makefile.am
index 1d63842..b753c0d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,8 @@ gisi_sources = gisi/phonet.h gisi/modem.h gisi/netlink.h gisi/netlink.c \
 		gisi/socket.h gisi/socket.c gisi/client.h gisi/client.c \
 		gisi/pep.h gisi/pep.c gisi/pipe.h gisi/pipe.c
 
+gatmux_sources = gatmux/gsm0710_p.h gatmux/gsm0710.c
+
 gatchat_sources = gatchat/gatchat.h gatchat/gatchat.c \
 				gatchat/gatresult.h gatchat/gatresult.c \
 				gatchat/gatsyntax.h gatchat/gatsyntax.c \
@@ -64,7 +66,8 @@ endif
 
 if ISIMODEM
 builtin_modules += isimodem
-builtin_sources += $(gisi_sources) drivers/isimodem/isi.h \
+builtin_sources += $(gisi_sources) \
+				drivers/isimodem/isi.h \
 				drivers/isimodem/isimodem.c \
 				drivers/isimodem/phonebook.c \
 				drivers/isimodem/devinfo.c \
@@ -82,7 +85,8 @@ endif
 
 if ATMODEM
 builtin_modules += atmodem
-builtin_sources += $(gatchat_sources) drivers/atmodem/atmodem.h \
+builtin_sources += $(gatmux_sources) $(gatchat_sources) \
+				drivers/atmodem/atmodem.h \
 				drivers/atmodem/atmodem.c \
 				drivers/atmodem/call-settings.c \
 				drivers/atmodem/sms.c \
diff --git a/gatmux/gsm0710.c b/gatmux/gsm0710.c
index d0df30e..e12e740 100644
--- a/gatmux/gsm0710.c
+++ b/gatmux/gsm0710.c
@@ -17,11 +17,16 @@
 **
 ****************************************************************************/
 
-#include "gsm0710_p.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <alloca.h>
 #include <string.h>
 #include <stdio.h>
 
+#include "gsm0710_p.h"
+
 /* Initialize a GSM 07.10 context, in preparation for startup */
 void gsm0710_initialize(struct gsm0710_context *ctx)
 {