# HG changeset patch
# User masneyb
# Date 1039657724 0
# Node ID b124f715e74bcb92aff3b4f3cb33ec6c688cb873
# Parent  f4f6f44225d3046236e90bf4249771ae3dd8d87e
2002-12-11 Brian Masney <masneyb@gftp.org>

        * configure.in - fix for enable/disable gtkport, textport and gtk20

diff -r f4f6f44225d3 -r b124f715e74b ChangeLog
--- a/ChangeLog	Wed Dec 11 02:33:33 2002 +0000
+++ b/ChangeLog	Thu Dec 12 01:48:44 2002 +0000
@@ -1,3 +1,6 @@
+2002-12-11 Brian Masney <masneyb@gftp.org>
+	* configure.in - fix for enable/disable gtkport, textport and gtk20
+
 2002-12-10 Brian Masney <masneyb@gftp.org>
 	* configure.in - check for grantpt function
 
@@ -392,7 +395,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.48 2002/12/11 02:33:32 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.49 2002/12/12 01:48:44 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r f4f6f44225d3 -r b124f715e74b configure.in
--- a/configure.in	Wed Dec 11 02:33:33 2002 +0000
+++ b/configure.in	Thu Dec 12 01:48:44 2002 +0000
@@ -5,10 +5,20 @@
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(gftp,2.0.14)
 
-AC_ARG_ENABLE(gtk20, [  --disable-gtk20	  Don't look for GTK+ 2.0 libraries], enable_gtk20=0, enable_gtk20=1)
-AC_ARG_ENABLE(gtkport, [  --disable-gtkport	  Disable compiling the GTK+ port], enable_gtkport=0, enable_gtkport=1)
-AC_ARG_ENABLE(textport, [  --disable-textport	  Disable compiling the text port], enable_textport=0, enable_textport=1)
-AC_ARG_ENABLE(dmalloc, [  --enable-dmalloc	  Enable the dmalloc library], enable_dmalloc=1, enable_dmalloc=0)
+AC_ARG_ENABLE(gtk20, 
+              [  --disable-gtk20	  Don't look for GTK+ 2.0 libraries], 
+              enable_gtk20=$enableval, 
+              enable_gtk20="yes")
+
+AC_ARG_ENABLE(gtkport, 
+              [  --disable-gtkport	  Disable compiling the GTK+ port], 
+              enable_gtkport=$enableval, 
+              enable_gtkport="yes")
+
+AC_ARG_ENABLE(textport, 
+              [  --disable-textport	  Disable compiling the text port], 
+              enable_textport=$enableval, 
+              enable_textport="yes")
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
@@ -56,7 +66,7 @@
 AC_FUNC_UTIME_NULL
 AC_CHECK_FUNCS(gai_strerror getaddrinfo getcwd gettimeofday getwd mkdir mktime putenv rmdir select socket strdup strstr strtod strtol uname grantpt)
 
-if test $enable_gtk20 = 1 ; then
+if test "x$enable_gtk20" = "xyes" ; then
   PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.0.0, found_glib20=1, found_glib20=0)
 else
   found_glib20=0;
@@ -74,7 +84,7 @@
 EXTRA_LIBS=""
 USE_READLINE="yes"
 READLINE_LIBS=""
-if test "x$enable_textport" = "x1" ; then
+if test "x$enable_textport" = "xyes" ; then
   AC_MSG_CHECKING([whether to use readline])
   AC_ARG_WITH(readline,
   [  --with-readline         turn on readline [default=yes, default tries -lncurses, -lcurses, -ltermcap]],
@@ -167,8 +177,8 @@
 # the text port doesn't need to be compiled against the thread libraries
 GTHREAD_LIBS=""
 
-if test "x$enable_gtkport" = "x1" ; then
-  if test $found_glib20 = 1 -a $enable_gtk20 = 1 ; then
+if test "x$enable_gtkport" = "xyes" ; then
+  if test $found_glib20 = 1 -a "x$enable_gtk20" = "xyes" ; then
     PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.0.0, GFTP_GTK=gftp-gtk, AC_MSG_ERROR(You have GLIB 2.0 installed but I cannot find GTK+ 2.0. Run configure with --disable-gtk20 or install GTK+ 2.0))
   fi
 
@@ -247,4 +257,4 @@
 
 AM_GNU_GETTEXT
 
-AC_OUTPUT(Makefile docs/Makefile docs/sample.gftp/Makefile src/gftp src/Makefile src/gtk/Makefile src/text/Makefile lib/Makefile gftp.spec intl/Makefile po/Makefile.in )
+AC_OUTPUT(Makefile docs/Makefile docs/sample.gftp/Makefile src/gftp src/Makefile src/gtk/Makefile src/text/Makefile lib/Makefile gftp.spec)