[ohm] ohm: Branch 'master' - 2 commits

[Rob Taylor]

 autogen.sh   |    2 +-
 configure.in |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
diff-tree 660e705f1eaf7fc7cc26dc9d18665b9042ca15dc (from 133b2c8a3458c60ee08a1c8a6a6ba238ddfd56d6)
Author: Rob Taylor <rob.taylor at codethink.co.uk>
Date:   Fri Aug 17 17:29:42 2007 +0100

    don't pass --enable-gtk-doc in autogen.sh
    
    Gtk dock makefile crapness will trip up the unsuspecting, so don't pass it in autogen.sh by default.

diff --git a/autogen.sh b/autogen.sh
index 1c19ae6..1a0b417 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,7 +29,7 @@ $AUTOMAKE -a || exit 1
 $AUTOMAKE -a ohmd/Makefile || exit 1
 
 
-conf_flags="--enable-gtk-doc"
+conf_flags=""
 
 if test x$NOCONFIGURE = x; then
   echo Running $srcdir/configure $conf_flags "$@" ...
diff-tree 133b2c8a3458c60ee08a1c8a6a6ba238ddfd56d6 (from a3c11e4bf2999496aa21cf17dd1575f8ef95c871)
Author: Rob Taylor <rob.taylor at codethink.co.uk>
Date:   Fri Aug 17 17:27:19 2007 +0100

    add 'none' option for --with-distro configure flag
    
    Adds a  'none' option for the --with-distro configure flag, for distros that wat to handle their own in their packaging.

diff --git a/configure.in b/configure.in
index 7d81e01..24ad0df 100644
--- a/configure.in
+++ b/configure.in
@@ -50,7 +50,7 @@ if test "$GCC" = "yes"; then
     #CPPFLAGS="$CPPFLAGS -Wall"
 fi
 
-AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, gentoo, debian, or slackware]))
+AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, gentoo, debian, slackware, or none]))
 if test "z$with_distro" = "z"; then
 	AC_CHECK_FILE(/etc/mandrake-release,with_distro="mandrake")
 	AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat")
@@ -64,6 +64,8 @@ with_distro=`echo ${with_distro} | tr '[
 if test "z$with_distro" = "z"; then
 	echo "Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=DISTRO"
 	exit 1
+elif test "z$with_distro" = "znone"; then
+	echo "No distro specific startup scripts will be built."
 else
 	case $with_distro in
 		redhat|gentoo|debian|slackware) ;;