Mercurial > pidgin
comparison configure.ac @ 14342:12156328fb4f
[gaim-migrate @ 17039]
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.
committer: Tailor Script <tailor@pidgin.im>
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sat, 26 Aug 2006 07:11:55 +0000 |
| parents | 17eba43f98a9 |
| children | d72cbd259357 |
comparison
equal
deleted
inserted
replaced
| 14341:1c104df05a38 | 14342:12156328fb4f |
|---|---|
| 526 AC_ARG_WITH(tclconfig, [ --with-tclconfig=DIR directory containing tclConfig.sh]) | 526 AC_ARG_WITH(tclconfig, [ --with-tclconfig=DIR directory containing tclConfig.sh]) |
| 527 AC_ARG_ENABLE(tk, [ --disable-tk compile without Tcl support for Tk],,enable_tk=yes) | 527 AC_ARG_ENABLE(tk, [ --disable-tk compile without Tcl support for Tk],,enable_tk=yes) |
| 528 AC_ARG_WITH(tkconfig, [ --with-tkconfig=DIR directory containing tkConfig.sh]) | 528 AC_ARG_WITH(tkconfig, [ --with-tkconfig=DIR directory containing tkConfig.sh]) |
| 529 AC_ARG_ENABLE(gtkspell, [ --disable-gtkspell compile without GtkSpell automatic spell checking],,enable_gtkspell=yes) | 529 AC_ARG_ENABLE(gtkspell, [ --disable-gtkspell compile without GtkSpell automatic spell checking],,enable_gtkspell=yes) |
| 530 AC_ARG_ENABLE(debug, [ --enable-debug compile with debugging support],,enable_debug=no) | 530 AC_ARG_ENABLE(debug, [ --enable-debug compile with debugging support],,enable_debug=no) |
| 531 AC_ARG_ENABLE(gtkgaim, [AC_HELP_STRING([--disable-gtkgaim], [compile without GtkGaim client])], , enable_gtk=yes) | 531 AC_ARG_ENABLE(gtkgaim, [AC_HELP_STRING([--disable-gtkgaim], [compile without GtkGaim client])], |
| 532 AC_ARG_ENABLE(gntgaim, [AC_HELP_STRING([--disable-gntgaim], [compile without GntGaim console client])], , enable_gnt=yes) | 532 enable_gtk=$enableval, enable_gtk=yes) |
| 533 AC_ARG_ENABLE(gntgaim, [AC_HELP_STRING([--disable-gntgaim], [compile without GntGaim console client])], | |
| 534 enable_gnt=$enableval, enable_gnt=yes) | |
| 533 AC_ARG_ENABLE(fatal-asserts, [ --enable-fatal-asserts make assertions fatal (useful for debugging)],,enable_fatal_asserts=no) | 535 AC_ARG_ENABLE(fatal-asserts, [ --enable-fatal-asserts make assertions fatal (useful for debugging)],,enable_fatal_asserts=no) |
| 534 dnl We know Gaim won't compile with deprecated APIs disabled. | 536 dnl We know Gaim won't compile with deprecated APIs disabled. |
| 535 dnl We have no desire to support two different versions of the | 537 dnl We have no desire to support two different versions of the |
| 536 dnl same code when it's not necessary, so we're sticking with | 538 dnl same code when it's not necessary, so we're sticking with |
| 537 dnl the deprecated APIs in many cases. | 539 dnl the deprecated APIs in many cases. |
| 659 *** If you wish to build just gntgaim or libgaim, | 661 *** If you wish to build just gntgaim or libgaim, |
| 660 *** configure with --disable-gtkgaim]) | 662 *** configure with --disable-gtkgaim]) |
| 661 ]) | 663 ]) |
| 662 AC_SUBST(GTK_CFLAGS) | 664 AC_SUBST(GTK_CFLAGS) |
| 663 AC_SUBST(GTK_LIBS) | 665 AC_SUBST(GTK_LIBS) |
| 664 else | |
| 665 enable_gtk=no | |
| 666 fi | 666 fi |
| 667 | 667 |
| 668 AC_PATH_XTRA | 668 AC_PATH_XTRA |
| 669 # We can't assume that $x_libraries will be set, because autoconf does not | 669 # We can't assume that $x_libraries will be set, because autoconf does not |
| 670 # set it in the case when the X libraries are in a standard place. | 670 # set it in the case when the X libraries are in a standard place. |
| 810 AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_gnt=no]) | 810 AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_gnt=no]) |
| 811 AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"], [enable_gnt=no]) | 811 AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"], [enable_gnt=no]) |
| 812 | 812 |
| 813 # Some distros put the headers in ncursesw/, some don't | 813 # Some distros put the headers in ncursesw/, some don't |
| 814 AC_CHECK_HEADER(ncursesw/ncurses.h, [AC_DEFINE(HAVE_NCURSESW_INC, 1, [Define if you have the ncursesw headers in ncursesw/])]) | 814 AC_CHECK_HEADER(ncursesw/ncurses.h, [AC_DEFINE(HAVE_NCURSESW_INC, 1, [Define if you have the ncursesw headers in ncursesw/])]) |
| 815 else | |
| 816 enable_gnt=no | |
| 817 fi | 815 fi |
| 818 AC_SUBST(GNT_LIBS) | 816 AC_SUBST(GNT_LIBS) |
| 819 AM_CONDITIONAL(ENABLE_GNT, test "x$enable_gnt" = "xyes") | 817 AM_CONDITIONAL(ENABLE_GNT, test "x$enable_gnt" = "xyes") |
| 820 | 818 |
| 821 dnl ####################################################################### | 819 dnl ####################################################################### |