Attachment #166622 for bug #217861

View | Details | Raw Unified | Return to bug 217861
Collapse All | Expand All

Lines 1-14 Link Here

(-)a/Makefile.am (-1 / +14 lines)
1	## Process this file with automake to produce Makefile.in	1	## Process this file with automake to produce Makefile.in
2		2
3	SUBDIRS = lib libgamin server tests doc	3	SUBDIRS = lib doc
4		4
		5	if BUILD_LIBGAMIN
5	pkgconfigdir = $(libdir)/pkgconfig	6	pkgconfigdir = $(libdir)/pkgconfig
6	pkgconfig_DATA = gamin.pc	7	pkgconfig_DATA = gamin.pc
7		8
		9	SUBDIRS += libgamin
		10
8	if WITH_PYTHON	11	if WITH_PYTHON
9	SUBDIRS += python	12	SUBDIRS += python
10	endif	13	endif
11		14
		15	endif
		16
		17	if BUILD_SERVER
		18	SUBDIRS += lib server
		19	endif
		20
		21	if BUILD_TESTS
		22	SUBDIRS += tests
		23	endif
		24
12	#if BUILD_DOCS	25	#if BUILD_DOCS
13	#install-data-local:	26	#install-data-local:
14	# -doxygen	27	# -doxygen




AC_CHECK_FUNCS(usleep setsid setenv putenv getlogin_r)
AC_STRUCT_ST_MTIM_NSEC


dnl
dnl libgamin/libfam configuration
dnl
AC_ARG_ENABLE(libgamin,
	AC_HELP_STRING([--enable-libgamin], [Build libgamin/libfam (default=yes)]),
	[enable_libgamin="$enableval"], [enable_libgamin=yes])
AM_CONDITIONAL(BUILD_LIBGAMIN, test x$enable_libgamin = xyes)


dnl
dnl Server configuration
dnl
AC_ARG_ENABLE(server,
	AC_HELP_STRING([--enable-server], [Build gam_server (default=yes)]),
	[enable_server="$enableval"], [enable_server=yes])

if test x$enable_server = xyes ; then
	PKG_CHECK_MODULES(DAEMON, glib-2.0)
	AC_SUBST(DAEMON_CFLAGS)
	AC_SUBST(DAEMON_LIBS)
fi
AM_CONDITIONAL(BUILD_SERVER, test x$enable_server = xyes)


dnl
dnl Tests
dnl
enable_tests="no"
if test x$enable_server = xyes && test x$enable_libgamin = xyes ; then
	PKG_CHECK_MODULES(TEST, glib-2.0)
	AC_SUBST(TEST_LIBS)
	AC_SUBST(TEST_CFLAGS)
	enable_tests="yes"

fi
AM_CONDITIONAL(BUILD_TESTS, test x$enable_tests = xyes)

PKG_CHECK_MODULES(TEST, glib-2.0)
AC_SUBST(TEST_LIBS)
AC_SUBST(TEST_CFLAGS)

AC_ARG_ENABLE(more-warnings,
	AC_HELP_STRING([--disable-more-warnings], [Minimum compiler warnings]),

else
    PYTHON=
fi
AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
if test "$PYTHON_INCLUDES" != ""
then
    enable_python="$enable_libgamin"
else
    enable_python="no"
fi
AM_CONDITIONAL(WITH_PYTHON, test "$enable_python" = "yes")
AC_SUBST(pythondir)
AC_SUBST(PYTHON_VERSION)
AC_SUBST(PYTHON_INCLUDES)

        source code location:     ${srcdir}
        compiler:                 ${CC}
        compiler flags:           ${AM_CFLAGS} ${CFLAGS}

	build gam_server:         ${enable_server}
	build libgamin/libfam:    ${enable_libgamin}
	build python bindings:    ${enable_python}
	build tests:              ${enable_tests}
                                                                                
	backends:                 ${backends}
	build documentation:      ${build_docs}
- 

Return to bug 217861

Lines 94-109 AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) Link Here

(-)a/configure.in (-10 / +42 lines)
94	AC_CHECK_FUNCS(usleep setsid setenv putenv getlogin_r)	94	AC_CHECK_FUNCS(usleep setsid setenv putenv getlogin_r)
95	AC_STRUCT_ST_MTIM_NSEC	95	AC_STRUCT_ST_MTIM_NSEC
96		96
		97
97	dnl	98	dnl
98	dnl Start of pkg-config checks	99	dnl libgamin/libfam configuration
99	dnl	100	dnl
100	PKG_CHECK_MODULES(DAEMON, glib-2.0)	101	AC_ARG_ENABLE(libgamin,
101	AC_SUBST(DAEMON_CFLAGS)	102	AC_HELP_STRING([--enable-libgamin], [Build libgamin/libfam (default=yes)]),
102	AC_SUBST(DAEMON_LIBS)	103	[enable_libgamin="$enableval"], [enable_libgamin=yes])
		104	AM_CONDITIONAL(BUILD_LIBGAMIN, test x$enable_libgamin = xyes)
		105
		106
		107	dnl
		108	dnl Server configuration
		109	dnl
		110	AC_ARG_ENABLE(server,
		111	AC_HELP_STRING([--enable-server], [Build gam_server (default=yes)]),
		112	[enable_server="$enableval"], [enable_server=yes])
		113
		114	if test x$enable_server = xyes ; then
		115	PKG_CHECK_MODULES(DAEMON, glib-2.0)
		116	AC_SUBST(DAEMON_CFLAGS)
		117	AC_SUBST(DAEMON_LIBS)
		118	fi
		119	AM_CONDITIONAL(BUILD_SERVER, test x$enable_server = xyes)
		120
		121
		122	dnl
		123	dnl Tests
		124	dnl
		125	enable_tests="no"
		126	if test x$enable_server = xyes && test x$enable_libgamin = xyes ; then
		127	PKG_CHECK_MODULES(TEST, glib-2.0)
		128	AC_SUBST(TEST_LIBS)
		129	AC_SUBST(TEST_CFLAGS)
		130	enable_tests="yes"
		131
		132	fi
		133	AM_CONDITIONAL(BUILD_TESTS, test x$enable_tests = xyes)
103		134
104	PKG_CHECK_MODULES(TEST, glib-2.0)
105	AC_SUBST(TEST_LIBS)
106	AC_SUBST(TEST_CFLAGS)
107		135
108	AC_ARG_ENABLE(more-warnings,	136	AC_ARG_ENABLE(more-warnings,
109	AC_HELP_STRING([--disable-more-warnings], [Minimum compiler warnings]),	137	AC_HELP_STRING([--disable-more-warnings], [Minimum compiler warnings]),
Lines 487-499 if test "$with_python" != "no" ; then Link Here
487	else	515	else
488	PYTHON=	516	PYTHON=
489	fi	517	fi
490	AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
491	if test "$PYTHON_INCLUDES" != ""	518	if test "$PYTHON_INCLUDES" != ""
492	then	519	then
493	enable_python="yes"	520	enable_python="$enable_libgamin"
494	else	521	else
495	enable_python="no"	522	enable_python="no"
496	fi	523	fi
		524	AM_CONDITIONAL(WITH_PYTHON, test "$enable_python" = "yes")
497	AC_SUBST(pythondir)	525	AC_SUBST(pythondir)
498	AC_SUBST(PYTHON_VERSION)	526	AC_SUBST(PYTHON_VERSION)
499	AC_SUBST(PYTHON_INCLUDES)	527	AC_SUBST(PYTHON_INCLUDES)
Lines 569-574 gamin-$VERSION: Link Here
569	source code location: ${srcdir}	597	source code location: ${srcdir}
570	compiler: ${CC}	598	compiler: ${CC}
571	compiler flags: ${AM_CFLAGS} ${CFLAGS}	599	compiler flags: ${AM_CFLAGS} ${CFLAGS}
		600
		601	build gam_server: ${enable_server}
		602	build libgamin/libfam: ${enable_libgamin}
		603	build python bindings: ${enable_python}
		604	build tests: ${enable_tests}
572		605
573	backends: ${backends}	606	backends: ${backends}
574	build documentation: ${build_docs}	607	build documentation: ${build_docs}
575	-