Re: [gamin] configuration options

[TomPh <tpgww onepost net>]

> >   Can you send a patch with just that subset. The one you sent 
> > does like 3 different things, even changing the dnotify back-end
> > configuration...
See attached 3 patches:

1. reverts default debug support to 'on', provides corresponding
configure help messages, reverts to using a '-g' compiler flag only
when debug support is on, and adds debugging-related information to the
'summary report' printed at the end of the configure process.

2. fixes wrong outcomes from the --disable-kernel option

3. moves the inotify block ahead of the dnotify block in the configure
script. That allows dnotify to be re-enabled if the builder enables
inotify but disables dnotify - because, as I understand it, sometimes
we need both.

The line numbering reflects the fact that the 3 have been extracted
from a single diff.

Regards
Tom

diff -BbU 2  configure.in-cvs configure.in (17310)
--- configure.in-cvs	2005-08-23 02:30:25.000000000 +1000
+++ configure.in	2005-09-02 10:37:07.000000000 +1000
@@ -166,26 +172,4 @@
 
 if test x$os = xlinux-gnu; then
-	AC_ARG_ENABLE(dnotify,
-		AC_HELP_STRING([--disable-dnotify], [Disable the DNotify backend]),
-		[dnotify="${enableval}"], [dnotify=true])
-		
-	if test x$dnotify = xyes; then
-		dnotify=true
-	elif test x$dnotify = xno; then
-		dnotify=false
-	elif test x$dnotify != xtrue; then
-		AC_MSG_ERROR(bad value ${enableval} for --disable-dnotify)
-	fi
-fi
-
-dnl check if dnotify backend is enabled
-AM_CONDITIONAL(ENABLE_DNOTIFY, test x$dnotify = xtrue)
-
-if test x$dnotify = xtrue; then
-	AC_DEFINE(ENABLE_DNOTIFY,1,[Use dnotify as backend])
-	backends="${backends}, dnotify"
-fi
-
-if test x$os = xlinux-gnu; then
 	AC_ARG_ENABLE(inotify,
 		AC_HELP_STRING([--disable-inotify], [Disable the INotify backend]),
@@ -210,4 +194,34 @@
 fi
 
+if test x$os = xlinux-gnu; then
+	AC_ARG_ENABLE(dnotify,
+		AC_HELP_STRING([--disable-dnotify], [Disable the DNotify backend]),
+		[dnotify="${enableval}"], [dnotify=true])
+		
+	if test x$dnotify = xyes; then
+		dnotify=true
+	elif test x$dnotify = xno; then
+		dnotify=false
+	elif test x$dnotify != xtrue; then
+		AC_MSG_ERROR(bad value ${enableval} for --disable-dnotify)
+	fi
+fi
+
+if test x$dnotify = xfalse; then
+	if test x$inotify = xtrue; then
+		echo "When using inotify, gamin sometimes needs dnotify as a fallback"
+		echo "so dnotify support will be enabled"
+		dnotify=true
+	fi
+fi
+
+dnl check if dnotify backend is enabled
+AM_CONDITIONAL(ENABLE_DNOTIFY, test x$dnotify = xtrue)
+
+if test x$dnotify = xtrue; then
+	AC_DEFINE(ENABLE_DNOTIFY,1,[Use dnotify as backend])
+	backends="${backends}, dnotify"
+fi
+
 if test x$os != xBogusOS; then
     	AC_CHECK_FUNC(kevent,[have_kevent=1],)

diff -BbU 2  configure.in-cvs configure.in (17310)
--- configure.in-cvs	2005-08-23 02:30:25.000000000 +1000
+++ configure.in	2005-09-02 10:37:07.000000000 +1000
@@ -156,7 +160,9 @@
 
 if test x$os = xyes; then
-	os="BogusOS"
-elif test x$os = xno; then
 	os=${target_os}
+elif test x$os = xno; then
+	os="BogusOS"
+elif test x$os != x${target_os}; then
+	AC_MSG_ERROR(bad value ${enableval} for --disable-kernel)
 fi
 

diff -BbU 2  configure.in-cvs configure.in (17310)
--- configure.in-cvs	2005-08-23 02:30:25.000000000 +1000
+++ configure.in	2005-09-02 10:37:07.000000000 +1000
@@ -116,28 +116,32 @@
 
 AC_ARG_ENABLE(debug,
-	AC_HELP_STRING([--enable-debug], [Enable debugging messages]),
-	[debug=$enableval], [
-	if test -d $srcdir/CVS; then
-    	debug=yes
-	else
-		debug=no
-	fi
-	])
+#	AC_HELP_STRING([--enable-debug], [Enable debugging support]),
+#	[debug=$enableval], [
+#	if test -d $srcdir/CVS; then
+#		debug=yes
+#	else
+#		debug=no
+#	fi
+#	])
+	AC_HELP_STRING([--disable-debug], [Disable debugging support]),
+	[debug=$enableval], [debug=yes])
 
 if test x$debug = xyes ; then
-    AC_DEFINE([GAMIN_DEBUG], [], [Enable debugging messages])
+    AC_DEFINE([GAMIN_DEBUG], [], [Enable debugging support])
 fi
 
 AM_CONDITIONAL(GAMIN_DEBUG, test x$debug = xyes)
 
-AC_ARG_ENABLE(debug-api,
-	AC_HELP_STRING([--enable-debug-api], [Enable debugging API]),
-	[debug_api="${enableval}"],[
-	if test -d $srcdir/CVS; then
-    	debug_api=yes
-	else
-		debug_api=no
-	fi
-	])
+AC_ARG_ENABLE(debug_api,
+#	AC_HELP_STRING([--enable-debug-api], [Enable debugging API]),
+#	[debug_api="${enableval}"], [
+#	if test -d $srcdir/CVS; then
+#		debug_api=yes
+#	else
+#		debug_api=no
+#	fi
+#	])
+	AC_HELP_STRING([--disable-debug-api], [Disable debugging API]),
+	[debug_api="${enableval}"], [debug_api=yes])
 
 if test x$debug_api = xyes ; then
@@ -509,12 +523,12 @@
 if test "$GCC" = "yes" -a "$debug" = "yes"; then
 	CFLAGS="$CFLAGS -g"
-#don't optimise with -g
 else
+#don't optimise with -g
 	if test -z "$ENV_CFLAGS"; then
 		ENV_CFLAGS="-O2"
 	fi
 fi
-# force the inclusion of debug data
-CFLAGS="$CFLAGS $ENV_CFLAGS -g"
+
+CFLAGS="$CFLAGS $ENV_CFLAGS"
 
 dnl ==========================================================================
@@ -542,6 +556,8 @@
         source code location:     ${srcdir}
         compiler:                 ${CC}
+        compiler flags:           ${CFLAGS}
                                                                                 
 	backends:                 ${backends}
 	build documentation:      ${build_docs}
+	debug support:            ${debug}
 "