abe stable

Change-Id: I52379627346ce52264042110c133f544284a8f00
Signed-off-by: WuKong <rebirthmonkey@gmail.com>

27 files changed, 22 insertions, 22 deletions

diff --git a/moon-abe/cpabe-0.11/Makefile b/moon-abe/cpabe-0.11/Makefile
index d62f6df5..5d3b3b54 100644
--- a/moon-abe/cpabe-0.11/Makefile
+++ b/moon-abe/cpabe-0.11/Makefile
@@ -6,13 +6,13 @@ mandir = ${prefix}/share/man
 
 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=\"cpabe\" -DPACKAGE_TARNAME=\"cpabe\" -DPACKAGE_VERSION=\"0.11\" -DPACKAGE_STRING=\"cpabe\ 0.11\" -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_FCNTL_H=1 -DHAVE_STDDEF_H=1 -DHAVE_STRING_H=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DLSTAT_FOLLOWS_SLASHED_SYMLINK=1 -DHAVE_VPRINTF=1 -DHAVE_LIBCRYPTO=1 -DHAVE_LIBCRYPTO=1 -DHAVE_STRCHR=1 -DHAVE_STRDUP=1 -DHAVE_MEMSET=1 -DHAVE_GMP=1 -DHAVE_PBC=1 -DHAVE_BSWABE=1
 LDFLAGS = -O3 -Wall \
-	-L/usr/local/lib -lglib-2.0   \
+	-lglib-2.0   \
 	-Wl,-rpath /usr/local/lib -lpbc \
 	-lbswabe \
 	-Wl,-rpath /usr/local/lib -lgmp \
diff --git a/moon-abe/cpabe-0.11/config.status b/moon-abe/cpabe-0.11/config.status
index bf9fa81f..38f5b75c 100644..100755
--- a/moon-abe/cpabe-0.11/config.status
+++ b/moon-abe/cpabe-0.11/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/cpabe-0.11'
+ac_pwd='/home/wukong/workspace/opnfv-moon/moon-abe/cpabe-0.11'
 srcdir='.'
 test -n "$AWK" || AWK=awk
 # The default lists apply if the user does not specify any file.
@@ -600,8 +600,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["LIBOBJS"]=""
 S["EGREP"]="/bin/grep -E"
diff --git a/moon-abe/cpabe-0.11/configure b/moon-abe/cpabe-0.11/configure
index 747f4beb..747f4beb 100644..100755
--- a/moon-abe/cpabe-0.11/configure
+++ b/moon-abe/cpabe-0.11/configure
diff --git a/moon-abe/cpabe-0.11/cpabe-attrList b/moon-abe/cpabe-0.11/cpabe-attrList
index f7b2de62..41b1ef68 100644..100755
--- a/moon-abe/cpabe-0.11/cpabe-attrList
+++ b/moon-abe/cpabe-0.11/cpabe-attrList
diff --git a/moon-abe/cpabe-0.11/cpabe-dec b/moon-abe/cpabe-0.11/cpabe-dec
index 6c09dd69..e8fb8bb0 100644..100755
--- a/moon-abe/cpabe-0.11/cpabe-dec
+++ b/moon-abe/cpabe-0.11/cpabe-dec
diff --git a/moon-abe/cpabe-0.11/cpabe-enc b/moon-abe/cpabe-0.11/cpabe-enc
index 12d6fbe0..0aefe0c2 100644..100755
--- a/moon-abe/cpabe-0.11/cpabe-enc
+++ b/moon-abe/cpabe-0.11/cpabe-enc
diff --git a/moon-abe/cpabe-0.11/cpabe-keygen b/moon-abe/cpabe-0.11/cpabe-keygen
index 95e8dfff..672deb28 100644..100755
--- a/moon-abe/cpabe-0.11/cpabe-keygen
+++ b/moon-abe/cpabe-0.11/cpabe-keygen
diff --git a/moon-abe/cpabe-0.11/cpabe-policyList b/moon-abe/cpabe-0.11/cpabe-policyList
index d3ec6c6c..9e05c67a 100644..100755
--- a/moon-abe/cpabe-0.11/cpabe-policyList
+++ b/moon-abe/cpabe-0.11/cpabe-policyList
diff --git a/moon-abe/cpabe-0.11/cpabe-setup b/moon-abe/cpabe-0.11/cpabe-setup
index 8fd7bc70..27d34c27 100644..100755
--- a/moon-abe/cpabe-0.11/cpabe-setup
+++ b/moon-abe/cpabe-0.11/cpabe-setup
diff --git a/moon-abe/cpabe-0.11/install-sh b/moon-abe/cpabe-0.11/install-sh
index dd97db7a..dd97db7a 100644..100755
--- a/moon-abe/cpabe-0.11/install-sh
+++ b/moon-abe/cpabe-0.11/install-sh
diff --git a/moon-abe/cpabe-0.11/mkinstalldirs b/moon-abe/cpabe-0.11/mkinstalldirs
index 6fbe5e11..6fbe5e11 100644..100755
--- a/moon-abe/cpabe-0.11/mkinstalldirs
+++ b/moon-abe/cpabe-0.11/mkinstalldirs
diff --git a/moon-abe/cpabe-0.11/peks-ind b/moon-abe/cpabe-0.11/peks-ind
index 9ffac675..9b492743 100644..100755
--- a/moon-abe/cpabe-0.11/peks-ind
+++ b/moon-abe/cpabe-0.11/peks-ind
diff --git a/moon-abe/cpabe-0.11/peks-test b/moon-abe/cpabe-0.11/peks-test
index 2cc28f5f..03ca4684 100644..100755
--- a/moon-abe/cpabe-0.11/peks-test
+++ b/moon-abe/cpabe-0.11/peks-test
diff --git a/moon-abe/cpabe-0.11/peks-trap b/moon-abe/cpabe-0.11/peks-trap
index 377bcc1e..a7717cc6 100644..100755
--- a/moon-abe/cpabe-0.11/peks-trap
+++ b/moon-abe/cpabe-0.11/peks-trap
diff --git a/moon-abe/cpabe-0.11/test-lang b/moon-abe/cpabe-0.11/test-lang
index 72a452da..89e85781 100644..100755
--- a/moon-abe/cpabe-0.11/test-lang
+++ b/moon-abe/cpabe-0.11/test-lang
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
diff --git a/moon-abe/pbc-0.5.14/Makefile b/moon-abe/pbc-0.5.14/Makefile
index 9cce66f3..3c8a39fe 100644
--- a/moon-abe/pbc-0.5.14/Makefile
+++ b/moon-abe/pbc-0.5.14/Makefile
@@ -333,7 +333,7 @@ PBC_LDFLAGS =
 RANLIB = ranlib
 SED = /bin/sed
 SET_MAKE = 
-SHELL = /bin/sh
+SHELL = /bin/bash
 STRIP = strip
 VERSION = 0.5.14
 YACC = bison -y
diff --git a/moon-abe/pbc-0.5.14/config.status b/moon-abe/pbc-0.5.14/config.status
index 9574ddc3..d88df53d 100755
--- a/moon-abe/pbc-0.5.14/config.status
+++ b/moon-abe/pbc-0.5.14/config.status
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 # Generated by configure.
 # Run this file to recreate the current configuration.
 # Compiler output produced by configure, useful for debugging
@@ -8,7 +8,7 @@ debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
 
-SHELL=${CONFIG_SHELL-/bin/sh}
+SHELL=${CONFIG_SHELL-/bin/bash}
 export SHELL
 ## -------------------- ##
 ## M4sh Initialization. ##
@@ -531,10 +531,10 @@ if $ac_cs_silent; then
 fi
 
 if $ac_cs_recheck; then
-  set X '/bin/sh' './configure'  $ac_configure_extra_args --no-create --no-recursion
+  set X '/bin/bash' './configure'  $ac_configure_extra_args --no-create --no-recursion
   shift
-  $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
-  CONFIG_SHELL='/bin/sh'
+  $as_echo "running CONFIG_SHELL=/bin/bash $*" >&6
+  CONFIG_SHELL='/bin/bash'
   export CONFIG_SHELL
   exec "$@"
 fi
@@ -567,7 +567,7 @@ enable_shared='yes'
 enable_static='yes'
 pic_mode='default'
 enable_fast_install='yes'
-SHELL='/bin/sh'
+SHELL='/bin/bash'
 ECHO='printf %s\n'
 PATH_SEPARATOR=':'
 host_alias=''
@@ -950,7 +950,7 @@ S["PACKAGE_VERSION"]="0.5.14"
 S["PACKAGE_TARNAME"]="pbc"
 S["PACKAGE_NAME"]="pbc"
 S["PATH_SEPARATOR"]=":"
-S["SHELL"]="/bin/sh"
+S["SHELL"]="/bin/bash"
 _ACAWK
 cat >>"$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
diff --git a/moon-abe/pbc-0.5.14/configure b/moon-abe/pbc-0.5.14/configure
index 91de4db8..91de4db8 100644..100755
--- a/moon-abe/pbc-0.5.14/configure
+++ b/moon-abe/pbc-0.5.14/configure
diff --git a/moon-abe/pbc-0.5.14/example/Makefile b/moon-abe/pbc-0.5.14/example/Makefile
index 92281781..cff2c302 100644
--- a/moon-abe/pbc-0.5.14/example/Makefile
+++ b/moon-abe/pbc-0.5.14/example/Makefile
@@ -164,7 +164,7 @@ PBC_LDFLAGS =
 RANLIB = ranlib
 SED = /bin/sed
 SET_MAKE = 
-SHELL = /bin/sh
+SHELL = /bin/bash
 STRIP = strip
 VERSION = 0.5.14
 YACC = bison -y
diff --git a/moon-abe/pbc-0.5.14/gen/Makefile b/moon-abe/pbc-0.5.14/gen/Makefile
index 74b288f4..a780fece 100644
--- a/moon-abe/pbc-0.5.14/gen/Makefile
+++ b/moon-abe/pbc-0.5.14/gen/Makefile
@@ -175,7 +175,7 @@ PBC_LDFLAGS =
 RANLIB = ranlib
 SED = /bin/sed
 SET_MAKE = 
-SHELL = /bin/sh
+SHELL = /bin/bash
 STRIP = strip
 VERSION = 0.5.14
 YACC = bison -y
diff --git a/moon-abe/pbc-0.5.14/libtool b/moon-abe/pbc-0.5.14/libtool
index 0e4d39ea..4aa901dd 100755
--- a/moon-abe/pbc-0.5.14/libtool
+++ b/moon-abe/pbc-0.5.14/libtool
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 
 # libtool - Provide generalized library-building support services.
 # Generated automatically by config.status (pbc) 0.5.14
@@ -56,7 +56,7 @@ pic_mode=default
 fast_install=yes
 
 # Shell to use when invoking shell scripts.
-SHELL="/bin/sh"
+SHELL="/bin/bash"
 
 # An echo program that protects backslashes.
 ECHO="printf %s\\n"