Commit 9cff475a authored by malosek's avatar malosek

added libpgm-2.0.17rc2 into the dist package

parent 82242f6a
...@@ -10,7 +10,7 @@ SUBDIRS = src $(DIR_MAN) $(DIR_PERF) devices bindings ...@@ -10,7 +10,7 @@ SUBDIRS = src $(DIR_MAN) $(DIR_PERF) devices bindings
DIST_SUBDIRS = src man perf devices bindings DIST_SUBDIRS = src man perf devices bindings
EXTRA_DIST = $(top_srcdir)/foreign/openpgm/@pgm1_basename@.tar.bz2 \ EXTRA_DIST = $(top_srcdir)/foreign/openpgm/@pgm1_basename@.tar.bz2 \
$(top_srcdir)/foreign/openpgm/@pgm2_basename@ \ $(top_srcdir)/foreign/openpgm/@pgm2_basename@.tar.bz2 \
$(top_srcdir)/foreign/openpgm/lost_data_tsi.patch \ $(top_srcdir)/foreign/openpgm/lost_data_tsi.patch \
$(top_srcdir)/foreign/openpgm/create_custom_gsi_1.patch \ $(top_srcdir)/foreign/openpgm/create_custom_gsi_1.patch \
$(top_srcdir)/foreign/xmlParser/xmlParser.cpp \ $(top_srcdir)/foreign/xmlParser/xmlParser.cpp \
...@@ -18,4 +18,4 @@ $(top_srcdir)/foreign/xmlParser/xmlParser.hpp ...@@ -18,4 +18,4 @@ $(top_srcdir)/foreign/xmlParser/xmlParser.hpp
dist-hook: dist-hook:
-rm -rf $(distdir)/foreign/openpgm/@pgm1_basename@ -rm -rf $(distdir)/foreign/openpgm/@pgm1_basename@
-rm -rf $(distdir)/foreign/openpgm/@pgm2_basename@/openpgm/pgm/ref/debug -rm -rf $(distdir)/foreign/openpgm/@pgm2_basename@
...@@ -396,7 +396,7 @@ pgm1_ext="no" ...@@ -396,7 +396,7 @@ pgm1_ext="no"
pgm2_ext="no" pgm2_ext="no"
pgm1_basename="libpgm-1.2.14" pgm1_basename="libpgm-1.2.14"
pgm2_basename="libpgm-dev" pgm2_basename="libpgm-2.0.17rc2"
AC_SUBST(pgm1_basename) AC_SUBST(pgm1_basename)
AC_SUBST(pgm2_basename) AC_SUBST(pgm2_basename)
...@@ -472,7 +472,7 @@ if test "x$with_pgm1_ext" != "xno"; then ...@@ -472,7 +472,7 @@ if test "x$with_pgm1_ext" != "xno"; then
fi fi
fi fi
# Unpack libpgm-1.0.0rc8.tar.bz2 # Unpack libpgm1
AC_MSG_CHECKING([Unpacking ${pgm_basename}.tar.bz2]) AC_MSG_CHECKING([Unpacking ${pgm_basename}.tar.bz2])
if tar -xjf foreign/openpgm/${pgm_basename}.tar.bz2 -C foreign/openpgm/; then if tar -xjf foreign/openpgm/${pgm_basename}.tar.bz2 -C foreign/openpgm/; then
...@@ -540,6 +540,15 @@ if test "x$with_pgm2_ext" != "xno"; then ...@@ -540,6 +540,15 @@ if test "x$with_pgm2_ext" != "xno"; then
;; ;;
esac esac
# Unpack libpgm2
AC_MSG_CHECKING([Unpacking ${pgm_basename}.tar.bz2])
if tar -xjf foreign/openpgm/${pgm_basename}.tar.bz2 -C foreign/openpgm/; then
AC_MSG_RESULT([yes])
else
AC_MSG_ERROR([Could not unpack foreign/openpgm/${pgm_basename}.tar.bz2 file.])
fi
if test "x$pyzmq" != "xyes"; then if test "x$pyzmq" != "xyes"; then
AC_CHECK_PROG(have_python, python, yes, no) AC_CHECK_PROG(have_python, python, yes, no)
if test "x$have_python" != "xyes"; then if test "x$have_python" != "xyes"; then
...@@ -549,13 +558,13 @@ if test "x$with_pgm2_ext" != "xno"; then ...@@ -549,13 +558,13 @@ if test "x$with_pgm2_ext" != "xno"; then
# Generate galois_tables.c # Generate galois_tables.c
AC_CONFIG_COMMANDS([galois_tables2.c], AC_CONFIG_COMMANDS([galois_tables2.c],
[perl foreign/openpgm/libpgm-dev/openpgm/pgm/galois_generator.pl > \ [perl foreign/openpgm/libpgm-2.0.17rc2/openpgm/pgm/galois_generator.pl > \
foreign/openpgm/libpgm-dev/openpgm/pgm/galois_tables.c]) foreign/openpgm/libpgm-2.0.17rc2/openpgm/pgm/galois_tables.c])
# Generate version.c # Generate version.c
AC_CONFIG_COMMANDS([version2.c], AC_CONFIG_COMMANDS([version2.c],
[python foreign/openpgm/libpgm-dev/openpgm/pgm/version_generator.py > \ [python foreign/openpgm/libpgm-2.0.17rc2/openpgm/pgm/version_generator.py > \
foreign/openpgm/libpgm-dev/openpgm/pgm/version.c]) foreign/openpgm/libpgm-2.0.17rc2/openpgm/pgm/version.c])
# Check for OpenPGM nedded libraries. # Check for OpenPGM nedded libraries.
PKG_CHECK_MODULES([GLIB], [glib-2.0 gthread-2.0]) PKG_CHECK_MODULES([GLIB], [glib-2.0 gthread-2.0])
......
File mode changed from 100644 to 100755
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment