Merge topic 'moon-abe-stable'

* changes:
  abe stable
  abe stable

6 files changed, 5 insertions, 5 deletions

diff --git a/moon-abe/libbswabe-0.9/Makefile b/moon-abe/libbswabe-0.9/Makefile
index b81959c3..e476e030 100644
--- a/moon-abe/libbswabe-0.9/Makefile
+++ b/moon-abe/libbswabe-0.9/Makefile
@@ -6,12 +6,12 @@ includedir = ${prefix}/include
 
 CC = gcc
 CFLAGS  = -O3 -Wall \
-	-I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include   \
+	-I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include   \
 	 \
 	-I/usr/include/pbc -I/usr/local/include/pbc \
 	-DPACKAGE_NAME=\"libbswabe\" -DPACKAGE_TARNAME=\"libbswabe\" -DPACKAGE_VERSION=\"0.9\" -DPACKAGE_STRING=\"libbswabe\ 0.9\" -DPACKAGE_BUGREPORT=\"bethenco@cs.berkeley.edu\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSTDC_HEADERS=1 -DHAVE_STDINT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_ALLOCA_H=1 -DHAVE_ALLOCA=1 -DHAVE_VPRINTF=1 -DHAVE_LIBCRYPTO=1 -DHAVE_STRDUP=1 -DHAVE_GMP=1 -DHAVE_PBC=1
 LDFLAGS = -O3 -Wall \
-	-L/usr/local/lib -lglib-2.0   \
+	-lglib-2.0   \
 	-lgmp \
 	-lpbc \
 	-lcrypto 
diff --git a/moon-abe/libbswabe-0.9/config.status b/moon-abe/libbswabe-0.9/config.status
index 87b4e246..5211c65a 100644..100755
--- a/moon-abe/libbswabe-0.9/config.status
+++ b/moon-abe/libbswabe-0.9/config.status
@@ -438,7 +438,7 @@ Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/home/michel/Documents/Pro/POC/libbswabe-0.9'
+ac_pwd='/home/wukong/workspace/opnfv-moon/moon-abe/libbswabe-0.9'
 srcdir='.'
 test -n "$AWK" || AWK=awk
 # The default lists apply if the user does not specify any file.
@@ -598,8 +598,8 @@ S["GMP_CFLAGS"]=""
 S["GLIB_MKENUMS"]="glib-mkenums"
 S["GOBJECT_QUERY"]="gobject-query"
 S["GLIB_GENMARSHAL"]="glib-genmarshal"
-S["GLIB_LIBS"]="-L/usr/local/lib -lglib-2.0  "
-S["GLIB_CFLAGS"]="-I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include  "
+S["GLIB_LIBS"]="-lglib-2.0  "
+S["GLIB_CFLAGS"]="-I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include  "
 S["PKG_CONFIG"]="/usr/bin/pkg-config"
 S["ALLOCA"]=""
 S["LIBOBJS"]=""
diff --git a/moon-abe/libbswabe-0.9/configure b/moon-abe/libbswabe-0.9/configure
index 6f898f0d..6f898f0d 100644..100755
--- a/moon-abe/libbswabe-0.9/configure
+++ b/moon-abe/libbswabe-0.9/configure
diff --git a/moon-abe/libbswabe-0.9/install-sh b/moon-abe/libbswabe-0.9/install-sh
index dd97db7a..dd97db7a 100644..100755
--- a/moon-abe/libbswabe-0.9/install-sh
+++ b/moon-abe/libbswabe-0.9/install-sh
diff --git a/moon-abe/libbswabe-0.9/libbswabe.a b/moon-abe/libbswabe-0.9/libbswabe.a
index ee511111..7a10168d 100644
--- a/moon-abe/libbswabe-0.9/libbswabe.a
+++ b/moon-abe/libbswabe-0.9/libbswabe.a
diff --git a/moon-abe/libbswabe-0.9/mkinstalldirs b/moon-abe/libbswabe-0.9/mkinstalldirs
index 6fbe5e11..6fbe5e11 100644..100755
--- a/moon-abe/libbswabe-0.9/mkinstalldirs
+++ b/moon-abe/libbswabe-0.9/mkinstalldirs