Autotool ipa-client - patch from William Jon McCann <mccann@jhu.edu>

10 files changed, 380 insertions, 47 deletions

diff --git a/ipa-client/.hgignore b/ipa-client/.hgignore
new file mode 100644
index 00000000..7d2c8514
--- /dev/null
+++ b/ipa-client/.hgignore
@@ -0,0 +1,32 @@
+Makefile
+Makefile.in
+aclocal.m4
+config.cache
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+configure.scan
+compile
+depcomp
+intl
+libtool
+ltconfig
+ltmain.sh
+missing
+mkinstalldirs
+install-sh
+stamp-h
+stamp-h1
+stamp-h.in
+version.h
+intl
+macros
+INSTALL
+ChangeLog
+ipa-client-*.tar.gz
+*~
diff --git a/ipa-client/Makefile b/ipa-client/Makefile
deleted file mode 100644
index 477f93f8..00000000
--- a/ipa-client/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-SUBDIRS=ipa-install firefox
-PYTHONDIR=$(DESTDIR)/usr/share/ipa/ipaclient
-
-all:
-	@for subdir in $(SUBDIRS); do \
-		(cd $$subdir && $(MAKE) $@) || exit 1; \
-	done
-
-install-ipaclient:
-	-mkdir -p $(PYTHONDIR)
-	install -m 644 ipaclient/*.py $(PYTHONDIR)
-
-install: install-ipaclient
-	@for subdir in $(SUBDIRS); do \
-		(cd $$subdir && $(MAKE) $@) || exit 1; \
-	done
-
-clean:
-	@for subdir in $(SUBDIRS); do \
-		(cd $$subdir && $(MAKE) $@) || exit 1; \
-	done
-	rm -f *~
-	rm -f ipaclient/*~
-
-test:
diff --git a/ipa-client/Makefile.am b/ipa-client/Makefile.am
new file mode 100644
index 00000000..caabffe1
--- /dev/null
+++ b/ipa-client/Makefile.am
@@ -0,0 +1,63 @@
+# This file will be processed with automake-1.7 to create Makefile.in
+
+AUTOMAKE_OPTIONS = 1.7
+
+NULL =
+
+SUBDIRS =			\
+	firefox			\
+	ipaclient		\
+	ipa-install		\
+	$(NULL)
+
+EXTRA_DIST =			\
+	freeipa-client.spec	\
+	COPYING			\
+	AUTHORS			\
+	INSTALL			\
+	README			\
+	HACKING			\
+	NEWS			\
+	ChangeLog		\
+	$(NULL)
+
+DISTCLEANFILES =		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	intltool-*.in		\
+	compile			\
+	configure		\
+	INSTALL			\
+	install-sh		\
+	missing			\
+	mkinstalldirs		\
+	config.guess		\
+	ltmain.sh		\
+	config.sub		\
+	depcomp			\
+	Makefile.in		\
+	config.h.*		\
+	aclocal.m4		\
+	$(NULL)
+
+# Creating ChangeLog from hg log (taken from cairo/Makefile.am):
+
+ChangeLog: $(srcdir)/ChangeLog
+
+$(srcdir)/ChangeLog:
+	@if test -d "$(srcdir)/../.hg"; then \
+	  (cd "$(srcdir)" && \
+	  ./missing --run hg log --verbose) | fmt --split-only > $@.tmp \
+	  && mv -f $@.tmp $@ \
+	  || ($(RM) $@.tmp; \
+	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+	      (test -f $@ || echo hg log is required to generate this file >> $@)); \
+	else \
+	  test -f $@ || \
+	  (echo A hg checkout and hg -log is required to generate ChangeLog >&2 && \
+	  echo A hg checkout and hg log is required to generate this file >> $@); \
+	fi
+
+.PHONY: ChangeLog $(srcdir)/ChangeLog
diff --git a/ipa-client/autogen.sh b/ipa-client/autogen.sh
new file mode 100644
index 00000000..072bd15a
--- /dev/null
+++ b/ipa-client/autogen.sh
@@ -0,0 +1,175 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+set -e
+
+PACKAGE=freeipa-client
+
+LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
+LIBTOOLIZE_FLAGS="--copy --force"
+AUTOHEADER=${AUTOHEADER-autoheader}
+AUTOMAKE_FLAGS="--add-missing --gnu"
+AUTOCONF=${AUTOCONF-autoconf}
+
+# automake 1.8 requires autoconf 2.58
+# automake 1.7 requires autoconf 2.54
+automake_min_vers=1.7
+aclocal_min_vers=$automake_min_vers
+autoconf_min_vers=2.54
+libtoolize_min_vers=1.4
+
+# The awk-based string->number conversion we use needs a C locale to work 
+# as expected. Setting LC_ALL overrides whether the user set LC_ALL,
+# LC_NUMERIC, or LANG.
+LC_ALL=C
+
+ARGV0=$0
+
+# Allow invocation from a separate build directory; in that case, we change
+# to the source directory to run the auto*, then change back before running configure
+srcdir=`dirname $ARGV0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+
+cd $srcdir
+
+if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1 ; then
+    if ($AUTOCONF --version | head -n 1 | awk 'NR==1 { if( $(NF) >= '$autoconf_min_vers') \
+			       exit 1; exit 0; }');
+    then
+       echo "$ARGV0: ERROR: \`$AUTOCONF' is too old."
+       $AUTOCONF --version
+       echo "           (version $autoconf_min_vers or newer is required)"
+       DIE="yes"
+    fi
+else
+    echo $AUTOCONF: command not found
+    echo
+    echo "$ARGV0: ERROR: You must have \`autoconf' installed to compile $PACKAGE."
+    echo "           (version $autoconf_min_vers or newer is required)"
+    DIE="yes"
+fi
+
+#
+# Hunt for an appropriate version of automake and aclocal; we can't
+# assume that 'automake' is necessarily the most recent installed version
+#
+# We check automake first to allow it to be a newer version than we know about.
+#
+if test x"$AUTOMAKE" = x || test x"$ACLOCAL" = x ; then
+  am_ver=""
+  for ver in "" "-1.9" "-1.8" "-1.7" ; do
+    am="automake$ver"
+    if ($am --version) < /dev/null > /dev/null 2>&1 ; then
+      if ($am --version | head -n 1 | awk 'NR==1 { if( $(NF) >= '$automake_min_vers') \
+	  		 exit 1; exit 0; }'); then : ; else
+         am_ver=$ver
+         break;
+      fi
+    fi
+  done
+
+  AUTOMAKE=${AUTOMAKE-automake$am_ver}
+  ACLOCAL=${ACLOCAL-aclocal$am_ver}
+fi
+
+#
+# Now repeat the tests with the copies we decided upon and error out if they
+# aren't sufficiently new.
+#
+if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 ; then
+  if ($AUTOMAKE --version | head -n 1 | awk 'NR==1 { if( $(NF) >= '$automake_min_vers') \
+			     exit 1; exit 0; }');
+     then
+     echo "$ARGV0: ERROR: \`$AUTOMAKE' is too old."
+     $AUTOMAKE --version
+     echo "           (version $automake_min_vers or newer is required)"
+     DIE="yes"
+  fi
+  if ($ACLOCAL --version) < /dev/null > /dev/null 2>&1; then
+    if ($ACLOCAL --version | head -n 1 | awk 'NR==1 { if( $(NF) >= '$aclocal_min_vers' ) \
+						exit 1; exit 0; }' );
+    then
+      echo "$ARGV0: ERROR: \`$ACLOCAL' is too old."
+      $ACLOCAL --version
+      echo "           (version $aclocal_min_vers or newer is required)"
+      DIE="yes"
+    fi
+  else
+    echo $ACLOCAL: command not found
+    echo
+    echo "$ARGV0: ERROR: Missing \`$ACLOCAL'"
+    echo "           The version of $AUTOMAKE installed doesn't appear recent enough."
+    DIE="yes"
+  fi
+else
+    echo $AUTOMAKE: command not found
+    echo
+    echo "$ARGV0: ERROR: You must have \`automake' installed to compile $PACKAGE."
+    echo "           (version $automake_min_vers or newer is required)"
+    DIE="yes"
+fi
+
+if ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 ; then
+    if ($LIBTOOLIZE --version | awk 'NR==1 { if( $4 >= '$libtoolize_min_vers') \
+			       exit 1; exit 0; }');
+    then
+       echo "$ARGV0: ERROR: \`$LIBTOOLIZE' is too old."
+       echo "           (version $libtoolize_min_vers or newer is required)"
+       DIE="yes"
+    fi
+else
+    echo $LIBTOOLIZE: command not found
+    echo
+    echo "$ARGV0: ERROR: You must have \`libtoolize' installed to compile $PACKAGE."
+    echo "           (version $libtoolize_min_vers or newer is required)"
+    DIE="yes"
+fi
+
+if test -z "$ACLOCAL_FLAGS"; then
+    acdir=`$ACLOCAL --print-ac-dir`
+    if [ ! -f $acdir/pkg.m4 ]; then
+	echo "$ARGV0: Error: Could not find pkg-config macros."
+	echo "        (Looked in $acdir/pkg.m4)"
+	echo "        If pkg.m4 is available in /another/directory, please set"
+	echo "        ACLOCAL_FLAGS=\"-I /another/directory\""
+	echo "        Otherwise, please install pkg-config."
+	echo ""
+	echo "pkg-config is available from:"
+	echo "http://www.freedesktop.org/software/pkgconfig/"
+	DIE=yes
+    fi
+fi
+
+if test "X$DIE" != X; then
+  exit 1
+fi
+
+
+if test -z "$*"; then
+  echo "$ARGV0:	Note: \`./configure' will be run with no arguments."
+  echo "		If you wish to pass any to it, please specify them on the"
+  echo "		\`$0' command line."
+  echo
+fi
+
+do_cmd() {
+    echo "$ARGV0: running \`$@'"
+    $@
+}
+
+do_cmd $LIBTOOLIZE $LIBTOOLIZE_FLAGS
+
+do_cmd $ACLOCAL $ACLOCAL_FLAGS
+
+do_cmd $AUTOHEADER
+
+do_cmd $AUTOMAKE $AUTOMAKE_FLAGS
+
+do_cmd $AUTOCONF
+
+cd $ORIGDIR || exit 1
+
+rm -f config.cache
+
+do_cmd $srcdir/configure --cache-file=config.cache --disable-static --enable-maintainer-mode --enable-gtk-doc ${1+"$@"} && echo "Now type \`make' to compile" || exit 1
diff --git a/ipa-client/configure.ac b/ipa-client/configure.ac
new file mode 100644
index 00000000..576493f8
--- /dev/null
+++ b/ipa-client/configure.ac
@@ -0,0 +1,63 @@
+AC_PREREQ(2.59c)
+AC_INIT([freeipa-client],
+        [0.4],
+        [https://hosted.fedoraproject.org/projects/freeipa/newticket])
+
+AC_CONFIG_SRCDIR([ipaclient/__init__.py])
+AC_CONFIG_HEADERS([config.h])
+
+AM_INIT_AUTOMAKE
+
+AM_MAINTAINER_MODE
+
+AC_SUBST(VERSION)
+
+dnl ---------------------------------------------------------------------------
+dnl - Check for Python
+dnl ---------------------------------------------------------------------------
+
+AC_MSG_NOTICE([Checking for Python])
+have_python=no
+AM_PATH_PYTHON(2.3)
+
+if test "x$PYTHON" = "x" ; then
+  AC_MSG_ERROR([Python not found])
+fi
+
+dnl ---------------------------------------------------------------------------
+dnl - Set the data install directory since we don't use pkgdatadir
+dnl ---------------------------------------------------------------------------
+
+IPA_DATA_DIR="$datadir/ipa"
+AC_SUBST(IPA_DATA_DIR)
+
+dnl ---------------------------------------------------------------------------
+dnl Finish
+dnl ---------------------------------------------------------------------------
+
+# Files
+
+AC_CONFIG_FILES([
+    Makefile
+    firefox/Makefile
+    ipaclient/Makefile
+    ipa-install/Makefile
+])
+
+AC_OUTPUT
+
+echo "
+                    FreeIPA client $VERSION
+                    ========================
+
+	prefix:                   ${prefix}
+	exec_prefix:              ${exec_prefix}
+        libdir:                   ${libdir}
+        bindir:                   ${bindir}
+        sbindir:                  ${sbindir}
+        sysconfdir:               ${sysconfdir}
+        localstatedir:            ${localstatedir}
+        datadir:                  ${datadir}
+	source code location:	  ${srcdir}
+        Maintainer mode:          ${USE_MAINTAINER_MODE}
+"
diff --git a/ipa-client/firefox/Makefile b/ipa-client/firefox/Makefile
deleted file mode 100644
index f6bf7f3a..00000000
--- a/ipa-client/firefox/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-IPADIR=$(DESTDIR)/usr/share/ipa/ipaclient
-
-all:	
-
-install: 
-	-mkdir -p $(IPADIR)
-	install -m 644 ipa.js $(IPADIR)
-	install -m 644 ipa.cfg $(IPADIR)
-
-clean:
-
-test:
diff --git a/ipa-client/firefox/Makefile.am b/ipa-client/firefox/Makefile.am
new file mode 100644
index 00000000..daf69424
--- /dev/null
+++ b/ipa-client/firefox/Makefile.am
@@ -0,0 +1,18 @@
+NULL =
+
+appdir = $(IPA_DATA_DIR)/ipaclient
+app_DATA =			\
+	ipa.cfg			\
+	ipa.js			\
+	$(NULL)
+
+EXTRA_DIST =			\
+	README			\
+	$(app_DATA)		\
+	globalsetup.sh		\
+	usersetup.sh		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-client/ipa-install/Makefile b/ipa-client/ipa-install/Makefile
deleted file mode 100644
index 7b30547e..00000000
--- a/ipa-client/ipa-install/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-SBINDIR=$(DESTDIR)/usr/sbin
-
-all: ;
-
-install:
-	-mkdir $(SBINDIR)
-	install -m 755 ipa-client-install $(SBINDIR)
-
-clean:
-	rm -f *~ *.pyc
diff --git a/ipa-client/ipa-install/Makefile.am b/ipa-client/ipa-install/Makefile.am
new file mode 100644
index 00000000..ad0c4e0c
--- /dev/null
+++ b/ipa-client/ipa-install/Makefile.am
@@ -0,0 +1,13 @@
+NULL =
+
+sbin_SCRIPTS =			\
+	ipa-client-install	\
+	$(NULL)
+
+EXTRA_DIST =			\
+	$(sbin_SCRIPTS)		\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in
diff --git a/ipa-client/ipaclient/Makefile.am b/ipa-client/ipaclient/Makefile.am
new file mode 100644
index 00000000..c4008585
--- /dev/null
+++ b/ipa-client/ipaclient/Makefile.am
@@ -0,0 +1,16 @@
+NULL =
+
+appdir = $(IPA_DATA_DIR)/ipaclient
+app_PYTHON = 			\
+	__init__.py		\
+	dnsclient.py		\
+	ipachangeconf.py	\
+	ipadiscovery.py		\
+	$(NULL)
+
+EXTRA_DIST =			\
+	$(NULL)
+
+MAINTAINERCLEANFILES =		\
+	*~			\
+	Makefile.in