X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=34b57896eb72b12e5f7ab5ecec8ec2820e36e213;hb=aa458a0a13d18882354f33c07b0a4e8e82e7a424;hp=b9ebef32c4ca59994880c378d0ad4b7f23b677d9;hpb=c84527f98a43969ecd15a737fb000569feb4c9c0;p=catta

diff --git a/configure.ac b/configure.ac
index b9ebef3..34b5789 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ AC_SUBST(GLIB20_CFLAGS)
 AC_SUBST(GLIB20_LIBS)
 
 AC_ARG_ENABLE(gtk,
-        AS_HELP_STRING(--enable-gtk,use GTK+ (default=yes)),
+        AS_HELP_STRING(--disable-gtk,Use GTK+ (default=yes)),
         [case "${enableval}" in
                 yes) ENABLE_GTK=yes ;;
                 no)  ENABLE_GTK=no ;;
@@ -135,7 +135,7 @@ AM_CONDITIONAL([USE_XMLTOMAN], [test "x$xmltoman" = xyes])
 # D-BUS
 #
 AC_ARG_ENABLE(dbus,
-        AS_HELP_STRING(--enable-dbus,use DBus (default=yes)),
+        AS_HELP_STRING(--disable-dbus,Enable DBUS support (default=no)),
         [case "${enableval}" in
                 yes) ENABLE_DBUS=yes ;;
                 no)  ENABLE_DBUS=no ;;
@@ -253,23 +253,23 @@ AC_SUBST(avahi_socket)
 #
 # Python stuff
 #
-dnl AC_ARG_ENABLE(python,
-dnl        AS_HELP_STRING(--disable-python, Disable scripts that depends on python),
-dnl [case "${enableval}" in
-dnl   yes) use_python=yes ;;
-dnl   no)  use_python=no ;;
-dnl   *) AC_MSG_ERROR([bad value ${enableval} for --disable-python]) ;;
-dnl esac],[use_python=yes])
-
-dnl HAVE_PYTHON=no
-dnl if test "x$use_python" = xyes ; then
+AC_ARG_ENABLE(python,
+	AS_HELP_STRING(--disable-python, Disable scripts that depends on python),
+	[case "${enableval}" in
+	      yes) use_python=yes ;;
+	      no)  use_python=no ;;
+	      *) AC_MSG_ERROR([bad value ${enableval} for --disable-python]) ;;
+	esac],[use_python=yes])
+
+HAVE_PYTHON=no
+if test "x$use_python" = xyes ; then
    AM_PATH_PYTHON(2.4, [HAVE_PYTHON=yes], [HAVE_PYTHON=no])
 
    if  test "x$HAVE_PYTHON" = xyes ; then
        AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(could not find pygtk module)])
        AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(could not find python dbus module)])
    fi
-dnl fi
+fi
 
 AM_CONDITIONAL(HAVE_PYTHON, [test "x$HAVE_PYTHON" = xyes ])