added autotools setup

4 files changed, 87 insertions, 34 deletions

diff --git a/worker/Makefile b/worker/Makefile
deleted file mode 100644
index 2393054..0000000
--- a/worker/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-SSSD_PATH=../../freeipa/sssd/server
-SSSD_INCLUDE=-I$(SSSD_PATH) -I$(SSSD_PATH)/../replace
-UTIL_OBJ = \
-    $(SSSD_PATH)/util/debug.o \
-    $(SSSD_PATH)/util/signal.o \
-    $(SSSD_PATH)/util/server.o \
-    $(SSSD_PATH)/util/memory.o \
-    $(SSSD_PATH)/util/btreemap.o \
-    $(SSSD_PATH)/util/service_helpers.o \
-    $(SSSD_PATH)/confdb/confdb.o \
-    $(SSSD_PATH)/sbus/sssd_dbus_common.o \
-    $(SSSD_PATH)/sbus/sssd_dbus_connection.o \
-    $(SSSD_PATH)/sbus/sssd_dbus_server.o
-
-CFLAGS=$(SSSD_INCLUDE) -I/tmp/foo/include -Wall -Werror `xml2-config --cflags`  `xslt-config --cflags` `curl-config --cflags` `pkg-config --cflags dbus-1` -g
-LDFLAGS=-L/tmp/foo/lib `xml2-config --libs`  `xslt-config --libs` `curl-config --libs` `pkg-config --libs dbus-1`-lpopt -g $(UTIL_OBJ) -ltalloc -lldb -levents
-INDENTFLAGS=-kr -nut -l80
-
-SRCS = worker.c debug.c helpers.c ipaaction.c xml_helper.c output_handler.c sbus_client.c
-OBJS = worker.o debug.o helpers.o ipaaction.o xml_helper.o output_handler.o sbus_client.o
-
-all: worker
-
-$(OBJS): util.h helpers.h ipaaction.h output_handler.h xml_helper.h
-
-worker: $(OBJS) 
-	$(CC) $(LDFLAGS) -o $@ $+
-
-
-indent:
-	indent $(INDENTFLAGS) $(SRCS)
-
-clean:
-	rm *.o
diff --git a/worker/Makefile.am b/worker/Makefile.am
new file mode 100644
index 0000000..55f5607
--- /dev/null
+++ b/worker/Makefile.am
@@ -0,0 +1,20 @@
+#SSSD_PATH=../../freeipa/sssd/server
+#SSSD_INCLUDE=-I$(SSSD_PATH) -I$(SSSD_PATH)/../replace
+#SSSD_LIBS=-ltalloc -ltdb -ltevent -lldb
+#UTIL_OBJ = \
+#    $(SSSD_PATH)/util/debug.o \
+#    $(SSSD_PATH)/util/signal.o \
+#    $(SSSD_PATH)/util/server.o \
+#    $(SSSD_PATH)/util/memory.o \
+#    $(SSSD_PATH)/util/btreemap.o \
+#    $(SSSD_PATH)/util/service_helpers.o \
+#    $(SSSD_PATH)/confdb/confdb.o \
+#    $(SSSD_PATH)/sbus/sssd_dbus_common.o \
+#    $(SSSD_PATH)/sbus/sssd_dbus_connection.o \
+#    $(SSSD_PATH)/sbus/sssd_dbus_server.o
+
+
+bin_PROGRAMS = worker
+worker_SOURCES = worker.c debug.c helpers.c ipaaction.c xml_helper.c output_handler.c sbus_client.c
+worker_CFLAGS = @XML_CPPFLAGS@ @XSLT_CFLAGS@ @LIBCURL_CPPFLAGS@  @DBUS_CFLAGS@ @POPT_CFLAGS@ @SSSD_CFLAGS@
+worker_LDFLAGS = @XML_LIBS@ @XSLT_LIBS@ @LIBCURL@ @DBUS_LIBS@ @POPT_LIBS@  @SSSD_LIBS@
diff --git a/worker/build_macros.m4 b/worker/build_macros.m4
new file mode 100644
index 0000000..793968e
--- /dev/null
+++ b/worker/build_macros.m4
@@ -0,0 +1,41 @@
+AC_DEFUN([BUILD_WITH_SHARED_BUILD_DIR],
+  [ AC_ARG_WITH([shared-build-dir],
+                [AC_HELP_STRING([--with-shared-build-dir=DIR],
+                                [temporary build directory where libraries are installed [$srcdir/sharedbuild]])])
+
+    sharedbuilddir="$srcdir/sharedbuild"
+    if test x"$with_shared_build_dir" != x; then
+        sharedbuilddir=$with_shared_build_dir
+        CFLAGS="$CFLAGS -I$with_shared_build_dir/include"
+        LDFLAGS="$LDFLAGS -L$with_shared_build_dir/lib"
+    fi
+    AC_SUBST(sharedbuilddir)
+  ])
+
+AC_SUBST(SSSD_CFLAGS)
+AC_SUBST(SSSD_LIBS)
+AC_DEFUN([BUILD_WITH_SSSD_DIR],
+  [ AC_ARG_WITH([sssd-dir],
+                [AC_HELP_STRING([--with-sssd-dir=DIR],
+                                [path to the place where sssd is build])])
+
+    sssddir="/usr/src/sssd"
+    if test x"$with_sssd_dir" != x; then
+        sssddir=$with_sssd_dir
+        SSSD_CFLAGS="-I$with_sssd_dir/server -I$with_sssd_dir/replace"
+        SSSD_LIBS="\
+   $with_sssd_dir/server/util/debug.o \
+   $with_sssd_dir/server/util/signal.o \
+   $with_sssd_dir/server/util/server.o \
+   $with_sssd_dir/server/util/memory.o \
+   $with_sssd_dir/server/util/btreemap.o \
+   $with_sssd_dir/server/util/service_helpers.o \
+   $with_sssd_dir/server/confdb/confdb.o \
+   $with_sssd_dir/server/sbus/sssd_dbus_common.o \
+   $with_sssd_dir/server/sbus/sssd_dbus_connection.o \
+   $with_sssd_dir/server/sbus/sssd_dbus_server.o \
+   -ltalloc -lldb -ltevent -ltdb"
+    fi
+    AC_SUBST(sssddir)
+  ])
+
diff --git a/worker/configure.ac b/worker/configure.ac
new file mode 100644
index 0000000..ff9bf35
--- /dev/null
+++ b/worker/configure.ac
@@ -0,0 +1,26 @@
+AC_INIT([worker], [0.1])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AC_PROG_CC
+AM_PATH_XML2(2.7.2,,)
+AM_PATH_XSLT(1.1.24,,)
+LIBCURL_CHECK_CONFIG(,7.18.2,,)
+PKG_CHECK_MODULES(DBUS,dbus-1)
+
+m4_include(build_macros.m4)
+BUILD_WITH_SHARED_BUILD_DIR
+BUILD_WITH_SSSD_DIR
+
+POPT_OBJ=""
+AC_SUBST(POPT_OBJ)
+AC_SUBST(POPT_LIBS)
+AC_SUBST(POPT_CFLAGS)
+
+AC_CHECK_HEADERS(popt.h)
+AC_CHECK_LIB(popt, poptGetContext, [ POPT_LIBS="-lpopt" ])
+
+##AC_CONFIG_HEADERS([config.h]) /* FIXME: local config.h clashes with sssd's config.h */
+AC_CONFIG_FILES([
+ Makefile
+])
+AC_OUTPUT
+