File ibutils-autotools.patch of Package ibutils

Overview Repositories Revisions Requests Users Attributes Meta

File ibutils-autotools.patch of Package ibutils

Index: Makefile.am
===================================================================
--- Makefile.am.orig	2011-01-06 08:25:51.000000000 +0100
+++ Makefile.am	2014-03-05 15:57:24.598663412 +0100
@@ -42,7 +42,7 @@ DIST_SUBDIRS            = ibis ibdm ibdi
 
 # this will control the update of the files in order
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in
-
+ACLOCAL_AMFLAGS = -I config
 ACLOCAL			= aclocal -I $(ac_aux_dir)
 
 EXTRA_DIST = ibutils.spec.in ibmgtsim
Index: config/swig.m4
===================================================================
--- config/swig.m4.orig	2008-06-15 16:37:31.000000000 +0200
+++ config/swig.m4	2014-03-05 15:57:24.598663412 +0100
@@ -85,9 +85,9 @@ AC_DEFUN([MLX_PROG_SWIG],[
         dnl AC_MSG_INFO([SWIG executable is '$SWIG'])
         SWIG_LIB=`$SWIG -swiglib`
         dnl AC_MSG_INFO([SWIG runtime library directory is '$SWIG_LIB'])
-        AM_CONDITIONAL(HAS_SWIG,[test 1])
+        AM_CONDITIONAL([HAS_SWIG],[test 1])
    else
-        AM_CONDITIONAL(HAS_SWIG,[test 0])
+        AM_CONDITIONAL([HAS_SWIG],[test 0])
    fi
    AC_SUBST([SWIG_LIB])
 ])
Index: ibdiag/Makefile.am
===================================================================
--- ibdiag/Makefile.am.orig	2010-02-24 11:09:24.000000000 +0100
+++ ibdiag/Makefile.am	2014-03-05 15:57:24.599663389 +0100
@@ -37,5 +37,5 @@ SUBDIRS 		= src doc
 
 # this will control the update of the files in order
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in
-
-ACLOCAL			= aclocal -I $(ac_aux_dir)
+ACLOCAL_AMFLAGS      = -I config
+ACLOCAL              = aclocal -I $(ac_aux_dir)
Index: ibdiag/src/Makefile.am
===================================================================
--- ibdiag/src/Makefile.am.orig	2010-10-07 16:28:56.000000000 +0200
+++ ibdiag/src/Makefile.am	2014-03-05 15:57:24.599663389 +0100
@@ -30,6 +30,8 @@
 # SOFTWARE.
 #--
 
+ACLOCAL_AMFLAGS      = -I config
+
 bin_SCRIPTS = ibdiagnet ibdiagpath ibdiagui git_version.tcl
 EXTRA_DIST = ibdebug_if.tcl ibdebug.tcl \
 	ibdiagnet.in ibdiagnet.pkg ibdiagnet.tcl \
Index: ibdm/Makefile.am
===================================================================
--- ibdm/Makefile.am.orig	2010-11-02 00:03:44.000000000 +0100
+++ ibdm/Makefile.am	2014-03-05 15:57:24.600663366 +0100
@@ -37,7 +37,7 @@ SUBDIRS 		= ibdm src Clusters ibnl doc s
 
 # this will control the update of the files in order
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in
-
+ACLOCAL_AMFLAGS      = -I config
 ACLOCAL			= aclocal -I $(ac_aux_dir)
 
 # Support cleanup of swig wrappers
Index: ibdm/config/swig.m4
===================================================================
--- ibdm/config/swig.m4.orig	2010-10-07 10:11:24.000000000 +0200
+++ ibdm/config/swig.m4	2014-03-05 15:57:24.600663366 +0100
@@ -85,9 +85,9 @@ AC_DEFUN([MLX_PROG_SWIG],[
         dnl AC_MSG_INFO([SWIG executable is '$SWIG'])
         SWIG_LIB=`$SWIG -swiglib`
         dnl AC_MSG_INFO([SWIG runtime library directory is '$SWIG_LIB'])
-        AM_CONDITIONAL(HAS_SWIG,[test 1])
+        AM_CONDITIONAL([HAS_SWIG],[test 1])
    else
-        AM_CONDITIONAL(HAS_SWIG,[test 0])
+        AM_CONDITIONAL([HAS_SWIG],[test 0])
    fi
    AC_SUBST([SWIG_LIB])
 ])
Index: ibdm/src/Makefile.am
===================================================================
--- ibdm/src/Makefile.am.orig	2010-10-07 16:29:56.000000000 +0200
+++ ibdm/src/Makefile.am	2014-03-05 15:58:37.006995904 +0100
@@ -34,7 +34,9 @@
 
 # MAINTAINERCLEANFILES	= Makefile.in common.h stamp-common
 
-# INCLUDES		= -I$(top_builddir) -I$(top_srcdir) $(TCL_CPPFLAGS)
+# AM_CPPFLAGS		= -I$(top_builddir) -I$(top_srcdir) $(TCL_CPPFLAGS)
+ACLOCAL_AMFLAGS      = -I config
+
 pkginclude_HEADERS = ibsysapi.h
 
 AM_CPPFLAGS = -I$(top_srcdir)/ibdm
Index: ibis/Makefile.am
===================================================================
--- ibis/Makefile.am.orig	2010-02-24 11:09:25.000000000 +0100
+++ ibis/Makefile.am	2014-03-05 15:57:24.601663343 +0100
@@ -37,7 +37,7 @@ SUBDIRS 		= src tests doc
 
 # this will control the update of the files in order
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in
-
+ACLOCAL_AMFLAGS      = -I config
 ACLOCAL			= aclocal -I $(ac_aux_dir)
 
 # Support cleanup of swig wrappers
Index: ibis/config/swig.m4
===================================================================
--- ibis/config/swig.m4.orig	2010-10-07 10:11:24.000000000 +0200
+++ ibis/config/swig.m4	2014-03-05 15:57:24.601663343 +0100
@@ -85,9 +85,9 @@ AC_DEFUN([MLX_PROG_SWIG],[
         dnl AC_MSG_INFO([SWIG executable is '$SWIG'])
         SWIG_LIB=`$SWIG -swiglib`
         dnl AC_MSG_INFO([SWIG runtime library directory is '$SWIG_LIB'])
-        AM_CONDITIONAL(HAS_SWIG,[test 1])
+        AM_CONDITIONAL([HAS_SWIG],[test 1])
    else
-        AM_CONDITIONAL(HAS_SWIG,[test 0])
+        AM_CONDITIONAL([HAS_SWIG],[test 0])
    fi
    AC_SUBST([SWIG_LIB])
 ])
Index: ibis/configure.in
===================================================================
--- ibis/configure.in.orig	2011-03-08 12:08:02.000000000 +0100
+++ ibis/configure.in	2014-03-05 15:57:24.602663320 +0100
@@ -57,6 +57,7 @@ AC_PROG_MAKE_SET
 dnl Checks for programs.
 AC_PROG_INSTALL
 AC_PROG_LN_S
+AM_PROG_CC_C_O
 MLX_PROG_SWIG(1.1.5, eq)
 
 dnl We will use libtool for making ...
@@ -66,7 +67,7 @@ AC_PROG_LIBTOOL
 
 dnl For making dist we need not check any lib dependency
 AC_ARG_ENABLE(libcheck,
-[  --enable-libcheck    Enable Dependency Checking],
+	      AS_HELP_STRING([--enable-libcheck], [Enable Dependency Checking]),
 [case "${enableval}" in
   yes) libcheck=true ;;
   no)  libcheck=false ;;
@@ -95,13 +96,13 @@ AC_CHECK_FUNCS([strchr strstr strtol str
 
 dnl Define an input config option to control debug compile
 AC_ARG_ENABLE(debug,
-[  --enable-debug    Turn on debugging],
+              AS_HELP_STRING([--enable-debug], [Turn on debugging]),
 [case "${enableval}" in
   yes) debug=true ;;
   no)  debug=false ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
 esac],[debug=false])
-AM_CONDITIONAL(DEBUG, test x$debug = xtrue)
+AM_CONDITIONAL([DEBUG], [test x$debug = xtrue])
 
 dnl Define an input config option to allow ibis know where
 dnl the OSM is installed. This should point to one directory above
Index: ibmgtsim/Makefile.am
===================================================================
--- ibmgtsim/Makefile.am.orig	2010-02-24 11:09:26.000000000 +0100
+++ ibmgtsim/Makefile.am	2014-03-05 15:57:24.602663320 +0100
@@ -37,7 +37,7 @@ SUBDIRS 		= src utils tests doc
 
 # this will control the update of the files in order
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in
-
+ACLOCAL_AMFLAGS      = -I config
 ACLOCAL			= aclocal -I $(ac_aux_dir)
 
 # Support cleanup of swig wrappers
Index: ibmgtsim/config/swig.m4
===================================================================
--- ibmgtsim/config/swig.m4.orig	2010-10-07 10:11:25.000000000 +0200
+++ ibmgtsim/config/swig.m4	2014-03-05 15:57:24.602663320 +0100
@@ -85,9 +85,9 @@ AC_DEFUN([MLX_PROG_SWIG],[
         dnl AC_MSG_INFO([SWIG executable is '$SWIG'])
         SWIG_LIB=`$SWIG -swiglib`
         dnl AC_MSG_INFO([SWIG runtime library directory is '$SWIG_LIB'])
-        AM_CONDITIONAL(HAS_SWIG,[test 1])
+        AM_CONDITIONAL([HAS_SWIG],[test 1])
    else
-        AM_CONDITIONAL(HAS_SWIG,[test 0])
+        AM_CONDITIONAL([HAS_SWIG],[test 0])
    fi
    AC_SUBST([SWIG_LIB])
 ])
Index: ibmgtsim/src/Makefile.am
===================================================================
--- ibmgtsim/src/Makefile.am.orig	2010-03-23 10:21:00.000000000 +0100
+++ ibmgtsim/src/Makefile.am	2014-03-05 16:00:27.893440920 +0100
@@ -42,9 +42,9 @@ endif
 AM_CXXFLAGS = $(DBG) $(OSM_CFLAGS)
 
 if IBDM_REF_IS_USED
-INCLUDES		= -I$(with_ibdm)/ibdm $(TCL_CPPFLAGS)
+INCLUDE_FILES		= -I$(with_ibdm)/ibdm $(TCL_CPPFLAGS)
 else
-INCLUDES		= -I$(with_ibdm)/include $(TCL_CPPFLAGS)
+INCLUDE_FILES		= -I$(with_ibdm)/include $(TCL_CPPFLAGS)
 endif
 
 
@@ -63,7 +63,7 @@ IBDM_INC=-I$(with_ibdm)/include/ibdm
 IBDM_IFC=$(with_ibdm)/include/ibdm/ibdm.i
 endif
 
-AM_CPPFLAGS = -I$(INCLUDES) $(IBDM_INC) $(OSM_CFLAGS)
+AM_CPPFLAGS = -I$(INCLUDE_FILES) $(IBDM_INC) $(OSM_CFLAGS)
 LDADD = $(IBDM_LIB) -lpthread
 
 # AM_LDFLAGS = -static
@@ -137,7 +137,7 @@ EXTRA_DIST = swig_alternate_mangling.cpp
 
 # Quiter for the server
 ibmsquit_SOURCES = client.cpp msgmgr.cpp simmsg.cpp tcpcomm.cpp
-ibmsquit_CPPFLAGS = -DBUILD_QUIT_CLIENT=1 -I$(INCLUDES)
+ibmsquit_CPPFLAGS = -DBUILD_QUIT_CLIENT=1 -I$(INCLUDE_FILES)
 
 # tester of the client code
 #ibmgt_client_SOURCES = client.cpp msgmgr.cpp simmsg.cpp tcpcomm.cpp

Places

File ibutils-autotools.patch of Package ibutils

Places