4 files changed, 12 insertions, 11 deletions
diff --git a/ext/session/Makefile.am b/ext/session/Makefile.am
deleted file mode 100644
index 79193f1dcb..0000000000
--- a/ext/session/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-# $Id$
-
-noinst_LTLIBRARIES=libphpext_session.la
-libphpext_session_la_SOURCES=session.c mod_files.c mod_mm.c mod_user.c
-
diff --git a/ext/session/Makefile.in b/ext/session/Makefile.in
new file mode 100644
index 0000000000..eab4a692c4
--- /dev/null
+++ b/ext/session/Makefile.in
@@ -0,0 +1,10 @@
+
+DEPTH     = ../..
+topsrcdir = @topsrcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
+
+LTLIBRARY_NAME    = libsession.la
+LTLIBRARY_SOURCES = session.c mod_files.c mod_mm.c mod_user.c
+
+include $(topsrcdir)/build/ltlib.mk
diff --git a/ext/session/config.h.stub b/ext/session/config.h.stub
deleted file mode 100644
index 24abf8b280..0000000000
--- a/ext/session/config.h.stub
+++ /dev/null
@@ -1,4 +0,0 @@
-/* define if you want to use the session extension */
-
-#undef TRANS_SID
-#undef HAVE_LIBMM
diff --git a/ext/session/config.m4 b/ext/session/config.m4
index 8db20b3324..4ce652e693 100644
--- a/ext/session/config.m4
+++ b/ext/session/config.m4
@@ -20,7 +20,7 @@ AC_ARG_WITH(mm,
 
 		AC_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/lib)
 		AC_ADD_INCLUDE($MM_DIR/include)
-		AC_DEFINE(HAVE_LIBMM, 1)
+		AC_DEFINE(HAVE_LIBMM, 1, [Whether you have libmm])
 		RESULT=yes
 		PHP_EXTENSION(ps_mm)
 	fi
@@ -33,7 +33,7 @@ AC_ARG_ENABLE(trans-sid,
 [  --enable-trans-sid      Enable transparent session id propagation],
 [
   if test "$enableval" = "yes" ; then
-    AC_DEFINE(TRANS_SID, 1)
+    AC_DEFINE(TRANS_SID, 1, [Whether you want transparent session id propagation])
 	RESULT=yes
   fi
 ])