[Gaim-commits] SF.net SVN: gaim: [17039] trunk

[<sa...@us...>]

Revision: 17039
Author:   sadrul
Date:     2006-08-26 00:11:55 -0700 (Sat, 26 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=17039&view=rev

Log Message:
-----------
Patch #1546776 from Georgi Georgiev.
This fixes things if someone uses --enable-gntgaim or --enable-gtkgaim.
This also fixes things for --disable-gnt/gtkgaim, so I am reverting some
bits from my earlier changes to fix those.

Modified Paths:
--------------
    trunk/COPYRIGHT
    trunk/configure.ac
Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT	2006-08-26 06:26:39 UTC (rev 17038)
+++ trunk/COPYRIGHT	2006-08-26 07:11:55 UTC (rev 17039)
@@ -108,6 +108,7 @@
 François Gagné
 Evgueni V. Gavrilov
 Ignacy Gawedzki
+Georgi Georgiev
 Ike Gingerich
 Gustavo Giráldez
 Richard Gobeille

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-08-26 06:26:39 UTC (rev 17038)
+++ trunk/configure.ac	2006-08-26 07:11:55 UTC (rev 17039)
@@ -528,8 +528,10 @@
 AC_ARG_WITH(tkconfig,  [  --with-tkconfig=DIR     directory containing tkConfig.sh])
 AC_ARG_ENABLE(gtkspell, [  --disable-gtkspell      compile without GtkSpell automatic spell checking],,enable_gtkspell=yes)
 AC_ARG_ENABLE(debug,   [  --enable-debug          compile with debugging support],,enable_debug=no)
-AC_ARG_ENABLE(gtkgaim, [AC_HELP_STRING([--disable-gtkgaim], [compile without GtkGaim client])], , enable_gtk=yes)
-AC_ARG_ENABLE(gntgaim, [AC_HELP_STRING([--disable-gntgaim], [compile without GntGaim console client])], , enable_gnt=yes)
+AC_ARG_ENABLE(gtkgaim, [AC_HELP_STRING([--disable-gtkgaim], [compile without GtkGaim client])],
+		enable_gtk=$enableval, enable_gtk=yes)
+AC_ARG_ENABLE(gntgaim, [AC_HELP_STRING([--disable-gntgaim], [compile without GntGaim console client])],
+		enable_gnt=$enableval, enable_gnt=yes)
 AC_ARG_ENABLE(fatal-asserts,   [  --enable-fatal-asserts  make assertions fatal (useful for debugging)],,enable_fatal_asserts=no)
 dnl We know Gaim won't compile with deprecated APIs disabled.
 dnl We have no desire to support two different versions of the
@@ -661,8 +663,6 @@
        ])
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
-else
-	enable_gtk=no
 fi
 
 AC_PATH_XTRA
@@ -812,8 +812,6 @@
 
 	# Some distros put the headers in ncursesw/, some don't
 	AC_CHECK_HEADER(ncursesw/ncurses.h, [AC_DEFINE(HAVE_NCURSESW_INC, 1, [Define if you have the ncursesw headers in ncursesw/])])
-else
-	enable_gnt=no
 fi
 AC_SUBST(GNT_LIBS)
 AM_CONDITIONAL(ENABLE_GNT, test "x$enable_gnt" = "xyes")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.