diff options
author | Simo Sorce <idra@samba.org> | 2008-09-25 01:51:49 -0400 |
---|---|---|
committer | Simo Sorce <idra@samba.org> | 2008-09-25 02:30:18 -0400 |
commit | f698831f0ae0cd86225eb647ae4aeb813f08d3b5 (patch) | |
tree | 55689de966245292e6ae517480c668ce993caf70 /events | |
parent | cced59be44cbc2204314bdf77a35b41b81bf4097 (diff) | |
download | sssd-f698831f0ae0cd86225eb647ae4aeb813f08d3b5.tar.gz sssd-f698831f0ae0cd86225eb647ae4aeb813f08d3b5.tar.bz2 sssd-f698831f0ae0cd86225eb647ae4aeb813f08d3b5.zip |
Sync with upstream changes
Diffstat (limited to 'events')
-rw-r--r-- | events/Makefile.in | 28 | ||||
-rwxr-xr-x | events/autogen.sh | 2 | ||||
-rw-r--r-- | events/build_macros.m4 | 22 | ||||
-rw-r--r-- | events/configure.ac | 2 | ||||
-rw-r--r-- | events/libevents.m4 | 2 |
5 files changed, 30 insertions, 26 deletions
diff --git a/events/Makefile.in b/events/Makefile.in index 5548e46e..42571198 100644 --- a/events/Makefile.in +++ b/events/Makefile.in @@ -12,7 +12,7 @@ libdir = @libdir@ VPATH = @srcdir@:@libreplacedir@ srcdir = @srcdir@ builddir = @builddir@ -buildinstdir = @buildinstdir@ +sharedbuilddir = @sharedbuilddir@ INSTALLCMD = @INSTALL@ CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -Iinclude -I. LDFLAGS = @LDFLAGS@ @@ -35,9 +35,13 @@ TALLOC_CFLAGS = @TALLOC_CFLAGS@ TALLOC_LDFLAGS = @TALLOC_CFLAGS@ TALLOC_LIBS = @TALLOC_LIBS@ -CFLAGS = $(CPPFLAGS) $(TALLOC_CFLAGS) @CFLAGS@ -LDFLAGS = $(TALLOC_LDFLAGS) @LDFLAGS@ -LIBS = $(TALLOC_LIBS) @LIBS@ +EVENTS_CFLAGS = @EVENTS_CFLAGS@ +EVENTS_LDFLAGS = @EVENTS_CFLAGS@ +EVENTS_LIBS = @EVENTS_LIBS@ + +CFLAGS = $(CPPFLAGS) $(TALLOC_CFLAGS) $(EVENTS_CFLAGS) @CFLAGS@ +LDFLAGS = $(TALLOC_LDFLAGS) $(EVENTS_LDFLAGS) @LDFLAGS@ +LIBS = $(TALLOC_LIBS) $(EVENTS_LIBS) @LIBS@ EVENTS_OBJ = @EVENTS_OBJ@ @LIBREPLACEOBJ@ @@ -52,14 +56,14 @@ install:: all $(EVENTS_SOLIB): $(EVENTS_OBJ) $(SHLD) $(SHLD_FLAGS) $(LDFLAGS) $(LIBS) -o $@ $(EVENTS_OBJ) @SONAMEFLAG@$(EVENTS_SONAME) -build-install: all - ${INSTALLCMD} -d $(buildinstdir)/lib - ${INSTALLCMD} -m 755 libevents.a $(buildinstdir)/lib - ${INSTALLCMD} -m 755 $(EVENTS_SOLIB) $(buildinstdir)/lib - ln -sf $(EVENTS_SOLIB) $(buildinstdir)/lib/$(EVENTS_SONAME) - ln -sf $(EVENTS_SOLIB) $(buildinstdir)/lib/libevents.so - ${INSTALLCMD} -d $(buildinstdir)/include - ${INSTALLCMD} -m 644 $(srcdir)/events.h $(buildinstdir)/include +shared-build: all + ${INSTALLCMD} -d $(sharedbuilddir)/lib + ${INSTALLCMD} -m 644 libevents.a $(sharedbuilddir)/lib + ${INSTALLCMD} -m 755 $(EVENTS_SOLIB) $(sharedbuilddir)/lib + ln -sf $(EVENTS_SOLIB) $(sharedbuilddir)/lib/$(EVENTS_SONAME) + ln -sf $(EVENTS_SOLIB) $(sharedbuilddir)/lib/libevents.so + ${INSTALLCMD} -d $(sharedbuilddir)/include + ${INSTALLCMD} -m 644 $(srcdir)/events.h $(sharedbuilddir)/include check: test diff --git a/events/autogen.sh b/events/autogen.sh index a3bb9bdd..fec05f54 100755 --- a/events/autogen.sh +++ b/events/autogen.sh @@ -3,7 +3,7 @@ rm -rf autom4te.cache rm -f configure config.h.in -IPATHS="-I libreplace -I lib/replace -I ../libreplace -I ../replace" +IPATHS="-I libreplace -I lib/replace -I ../libreplace -I ../replace -I ../../../lib/replace" autoconf $IPATHS || exit 1 autoheader $IPATHS || exit 1 diff --git a/events/build_macros.m4 b/events/build_macros.m4 index bb05a582..c036668c 100644 --- a/events/build_macros.m4 +++ b/events/build_macros.m4 @@ -1,14 +1,14 @@ -AC_DEFUN(BUILD_WITH_BUILD_INST_DIR, - [ AC_ARG_WITH([build-install-dir], - [AC_HELP_STRING([--with-build-install-dir=DIR], - [temporary build directory where libraries are installed [$srcdir/buildinst]])]) +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]])]) - buildinstdir="$srcdir/buildinst" - if test x"$with_build_install_dir" != x; then - buildinstdir=$with_build_install_dir - CFLAGS="$CFLAGS -I$with_build_install_dir/include" - CPPFLAGS="$CPPFLAGS -I$with_build_install_dir/include" - LIBS="$LIBS -L$with_build_install_dir/lib" + 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(buildinstdir) + AC_SUBST(sharedbuilddir) ]) + diff --git a/events/configure.ac b/events/configure.ac index 0ee3bf86..895f2a1d 100644 --- a/events/configure.ac +++ b/events/configure.ac @@ -17,7 +17,7 @@ AC_LIBREPLACE_SHLD_FLAGS AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR m4_include(build_macros.m4) -BUILD_WITH_BUILD_INST_DIR +BUILD_WITH_SHARED_BUILD_DIR m4_include(pkg.m4) m4_include(libtalloc.m4) diff --git a/events/libevents.m4 b/events/libevents.m4 index d17da64b..ed76b03d 100644 --- a/events/libevents.m4 +++ b/events/libevents.m4 @@ -43,7 +43,7 @@ SMB_EXT_LIB(LIBAIO_LINUX, $AIO_LIBS) EVENTS_CFLAGS="-I$eventsdir" AC_SUBST(EVENTS_CFLAGS) -EVENTS_LIBS="" +EVENTS_LIBS="$AIO_LIBS" AC_SUBST(EVENTS_LIBS) |