From 52a0feb60edec8ff9489321298db989b77e89007 Mon Sep 17 00:00:00 2001
From: Sam Kottler <shk@redhat.com>
Date: Sun, 30 Jun 2013 21:58:35 -0400
Subject: Changes to make libtool run cleanly

---
 configure.ac            | 62 +++++++++++++++++++++++++++++++++++++++++++++++++
 configure.in            | 62 -------------------------------------------------
 tests/cunit/Makefile.am |  6 ++---
 3 files changed, 65 insertions(+), 65 deletions(-)
 create mode 100644 configure.ac
 delete mode 100644 configure.in

diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..1c0ffb4
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,62 @@
+dnl Process this file with autoconf to produce a configure script.
+
+AC_INIT(wsmancli, 2.3.0)
+AC_CONFIG_SRCDIR(wsmancli.spec.in)
+AM_INIT_AUTOMAKE
+AM_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE
+
+AC_ISC_POSIX
+AC_PROG_CC
+AC_PROG_CXX
+AM_PROG_CC_STDC
+AC_HEADER_STDC
+AM_PROG_LIBTOOL
+
+WSMAN_PKG=$PACKAGE_NAME
+AC_SUBST(WSMAN_PKG)
+PACKAGE_BUILDTS=`date +%Y%m%d%H%M`
+AC_SUBST(PACKAGE_BUILDTS)
+
+PKG_CHECK_MODULES(OPENWSMAN, [openwsman >= 2.2.7])
+have_cunit=no
+AC_CHECK_HEADERS([CUnit/Basic.h], have_cunit="yes" )
+AM_CONDITIONAL(BUILD_CUNIT_TESTS, test "$have_cunit" == "yes")
+
+examples_default=no
+AC_ARG_WITH(examples,
+		[  --with-examples=[no/yes] build examples [default=no]],,
+              with_examples=$examples_default)
+AM_CONDITIONAL(BUILD_EXAMPLES, test "x$with_examples" = "xyes")
+tests_default=no
+AC_ARG_WITH(tests,
+		[  --with-tests=[no/yes] build tests [default=no]],,
+              with_tests=$tests_default)
+AM_CONDITIONAL(BUILD_TESTS, test "x$with_tests" = "xyes")
+
+dnl *************************************
+dnl *** Warnings to show if using GCC ***
+dnl *************************************
+
+AC_ARG_ENABLE(more-warnings,
+	      [  --disable-more-warnings  Inhibit compiler warnings],
+	      set_more_warnings=no)
+
+if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
+	CFLAGS="$CFLAGS \
+		-Wall -Wstrict-prototypes -Wmissing-declarations \
+		-Wmissing-prototypes -Wnested-externs -Wpointer-arith \
+                -Wunused -Werror"
+fi
+
+AC_OUTPUT([
+	wsmancli.spec
+	Makefile
+	src/Makefile
+	examples/Makefile
+	examples/cpp/Makefile
+        tests/Makefile
+        tests/interop/Makefile
+        tests/cunit/Makefile
+])
+
diff --git a/configure.in b/configure.in
deleted file mode 100644
index b09bab2..0000000
--- a/configure.in
+++ /dev/null
@@ -1,62 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT(wsmancli, 2.3.0)
-AC_CONFIG_SRCDIR(wsmancli.spec.in)
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-AM_CONFIG_HEADER(config.h)
-AM_MAINTAINER_MODE
-
-AC_ISC_POSIX
-AC_PROG_CC
-AC_PROG_CXX
-AM_PROG_CC_STDC
-AC_HEADER_STDC
-AM_PROG_LIBTOOL
-
-WSMAN_PKG=$PACKAGE_NAME
-AC_SUBST(WSMAN_PKG)
-PACKAGE_BUILDTS=`date +%Y%m%d%H%M`
-AC_SUBST(PACKAGE_BUILDTS)
-
-PKG_CHECK_MODULES(OPENWSMAN, [openwsman >= 2.2.7])
-have_cunit=no
-AC_CHECK_HEADERS([CUnit/Basic.h], have_cunit="yes" )
-AM_CONDITIONAL(BUILD_CUNIT_TESTS, test "$have_cunit" == "yes")
-
-examples_default=no
-AC_ARG_WITH(examples,
-		[  --with-examples=[no/yes] build examples [default=no]],,
-              with_examples=$examples_default)
-AM_CONDITIONAL(BUILD_EXAMPLES, test "x$with_examples" = "xyes")
-tests_default=no
-AC_ARG_WITH(tests,
-		[  --with-tests=[no/yes] build tests [default=no]],,
-              with_tests=$tests_default)
-AM_CONDITIONAL(BUILD_TESTS, test "x$with_tests" = "xyes")
-
-dnl *************************************
-dnl *** Warnings to show if using GCC ***
-dnl *************************************
-
-AC_ARG_ENABLE(more-warnings,
-	      [  --disable-more-warnings  Inhibit compiler warnings],
-	      set_more_warnings=no)
-
-if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
-	CFLAGS="$CFLAGS \
-		-Wall -Wstrict-prototypes -Wmissing-declarations \
-		-Wmissing-prototypes -Wnested-externs -Wpointer-arith \
-                -Wunused -Werror"
-fi
-
-AC_OUTPUT([
-	wsmancli.spec
-	Makefile
-	src/Makefile
-	examples/Makefile
-	examples/cpp/Makefile
-        tests/Makefile
-        tests/interop/Makefile
-        tests/cunit/Makefile
-])
-
diff --git a/tests/cunit/Makefile.am b/tests/cunit/Makefile.am
index f282adc..5686e9f 100644
--- a/tests/cunit/Makefile.am
+++ b/tests/cunit/Makefile.am
@@ -1,7 +1,7 @@
 AM_CFLAGS = @CFLAGS@
 
-INCLUDES = \
-   $(OPENWSMAN_CFLAGS) 
+AM_CPPFLAGS = \
+   $(OPENWSMAN_CFLAGS)
 
 	
 wsman_cunit_tests_LDADD = \
@@ -18,5 +18,5 @@ wsman_cunit_tests_SOURCES = run_tests.c \
 		    pull.c \
 		    transfer_put.c 
 
-noinst_PROGRAMS = wsman_cunit_tests 
+noinst_PROGRAMS = wsman_cunit_tests
 
-- 
cgit