From: <the...@us...> - 2006-05-08 17:09:44
|
Revision: 16152 Author: thekingant Date: 2006-05-07 19:26:40 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16152&view=rev Log Message: ----------- When --enable-debug is used, set --enable-fatal-asserts as well Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-05-08 02:09:44 UTC (rev 16151) +++ trunk/configure.ac 2006-05-08 02:26:40 UTC (rev 16152) @@ -75,11 +75,11 @@ ]) dnl Check for inet_aton -AC_CHECK_FUNC(inet_aton, , [AC_CHECK_LIB(resolv, inet_aton, , +AC_CHECK_FUNC(inet_aton, , [AC_CHECK_LIB(resolv, inet_aton, , [AC_ERROR(inet_aton not found)])]) AC_CHECK_LIB(resolv, __res_query) AC_CHECK_LIB(nsl, gethostent) -AC_CHECK_FUNC(socket, , +AC_CHECK_FUNC(socket, , [AC_CHECK_LIB(socket, socket, , [AC_ERROR([socket not found])])]) dnl If all goes well, by this point the previous two checks will have dnl pulled in -lsocket and -lnsl if we need them. @@ -130,12 +130,12 @@ { char buf[6]; time_t t = time(NULL); - + if (strftime(buf, sizeof(buf), "%z", localtime(&t)) != 5) return 1; - + fprintf(stderr, "strftime(\"%%z\") yields: \"%s\"\n", buf); - + return !((buf[0] == '-' || buf[0] == '+') && (buf[1] >= '0' && buf[1] <= '9') && (buf[2] >= '0' && buf[2] <= '9') && @@ -508,6 +508,7 @@ if test "x$enable_debug" = "xyes" ; then AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.]) + enable_fatal_asserts="yes" fi if test "x$enable_fatal_asserts" = "xyes" ; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-05-09 01:05:41
|
Revision: 16157 Author: thekingant Date: 2006-05-07 21:32:21 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16157&view=rev Log Message: ----------- Make our configure.ac autodetect Avahi's Howl compatibility library, and fallback to using Howl if Avahi isn't installed. Also fixed specifying a lib directory for Howl. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-05-08 04:02:50 UTC (rev 16156) +++ trunk/configure.ac 2006-05-08 04:32:21 UTC (rev 16157) @@ -194,9 +194,8 @@ HOWL_CFLAGS="" HOWL_LIBS="" -dnl Attempt to autodetect Howl -dnl TODO Check avahi-compat-howl!!! -PKG_CHECK_MODULES(HOWL, howl, [ +dnl Attempt to autodetect avahi-compat-howl +PKG_CHECK_MODULES(HOWL, avahi-compat-howl, [ howlincludes="yes" howllibs="yes" ], [ @@ -205,6 +204,18 @@ howllibs="no" ]) +dnl Attempt to autodetect Howl +if test "x$howlincludes" = "xno"; then + PKG_CHECK_MODULES(HOWL, howl, [ + howlincludes="yes" + howllibs="yes" + ], [ + AC_MSG_RESULT(no) + howlincludes="no" + howllibs="no" + ]) +fi + dnl Override HOWL_CFLAGS if the user specified an include dir if test "$ac_howl_includes" != "no"; then HOWL_CFLAGS="-I$ac_howl_includes" @@ -216,7 +227,7 @@ dnl Override HOWL_LIBS if the user specified a libs dir if test "$ac_howl_libs" != "no"; then - HOWL_LIBS="-L$ac_howl_libs" + HOWL_LIBS="-L$ac_howl_libs -lhowl" fi AC_CHECK_LIB(howl, sw_discovery_init, [howllibs=yes], [howllibs=no], $HOWL_LIBS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-05-09 01:22:58
|
Revision: 16142 Author: thekingant Date: 2006-05-07 11:19:02 -0700 (Sun, 07 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16142&view=rev Log Message: ----------- Whitespace and formatting changes mostly. I switched to using AC_HELP_STRING in a few places so stuff listed in "./configure --help" lines up a little better Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-05-07 18:04:24 UTC (rev 16141) +++ trunk/configure.ac 2006-05-07 18:19:02 UTC (rev 16142) @@ -189,12 +189,13 @@ dnl ####################################################################### dnl # Check for Howl headers (for Bonjour) dnl ####################################################################### -AC_ARG_WITH(howl-includes, [AC_HELP_STRING([--with-howl-includes=DIR], [Compile the Bonjour plugin against the Howl includes in DIR])], [ac_howl_includes="$withval"], [ac_howl_includes="no"]) -AC_ARG_WITH(howl-libs, [AC_HELP_STRING([--with-howl-libs=DIR], [Compile the Bonjour plugin against the Howl libs in DIR])], [ac_howl_libs="$withval"], [ac_howl_libs="no"]) +AC_ARG_WITH(howl-includes, [AC_HELP_STRING([--with-howl-includes=DIR], [compile the Bonjour plugin against the Howl includes in DIR])], [ac_howl_includes="$withval"], [ac_howl_includes="no"]) +AC_ARG_WITH(howl-libs, [AC_HELP_STRING([--with-howl-libs=DIR], [compile the Bonjour plugin against the Howl libs in DIR])], [ac_howl_libs="$withval"], [ac_howl_libs="no"]) HOWL_CFLAGS="" HOWL_LIBS="" dnl Attempt to autodetect Howl +dnl TODO Check avahi-compat-howl!!! PKG_CHECK_MODULES(HOWL, howl, [ howlincludes="yes" howllibs="yes" @@ -227,8 +228,8 @@ dnl ####################################################################### dnl # Check for SILC client includes and libraries dnl ####################################################################### -AC_ARG_WITH(silc-includes, [AC_HELP_STRING([--with-silc-includes=DIR], [Compile the SILC plugin against includes in DIR])], [ac_silc_includes="$withval"], [ac_silc_includes="no"]) -AC_ARG_WITH(silc-libs, [AC_HELP_STRING([--with-silc-libs=DIR], [Compile the SILC plugin against the SILC libs in DIR])], [ac_silc_libs="$withval"], [ac_silc_libs="no"]) +AC_ARG_WITH(silc-includes, [AC_HELP_STRING([--with-silc-includes=DIR], [compile the SILC plugin against includes in DIR])], [ac_silc_includes="$withval"], [ac_silc_includes="no"]) +AC_ARG_WITH(silc-libs, [AC_HELP_STRING([--with-silc-libs=DIR], [compile the SILC plugin against the SILC libs in DIR])], [ac_silc_libs="$withval"], [ac_silc_libs="no"]) SILC_CFLAGS="" SILC_LIBS="" if test -n "$with_silc_includes" || test -n "$with_silc_libs"; then @@ -294,8 +295,8 @@ dnl ####################################################################### dnl # Check for gadugadu client includes and libraries dnl ####################################################################### -AC_ARG_WITH(gadu-includes, [AC_HELP_STRING([--with-gadu-includes=DIR], [Compile the gadugadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"]) -AC_ARG_WITH(gadu-libs, [AC_HELP_STRING([--with-gadu-libs=DIR], [Compile the gadugadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"]) +AC_ARG_WITH(gadu-includes, [AC_HELP_STRING([--with-gadu-includes=DIR], [compile the gadugadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"]) +AC_ARG_WITH(gadu-libs, [AC_HELP_STRING([--with-gadu-libs=DIR], [compile the gadugadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"]) GADU_CFLAGS="" GADU_LIBS="" if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then @@ -363,7 +364,7 @@ AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes") AC_ARG_ENABLE(prpls, [ --disable-prpls don't build dynamic protocol plugins],,enable_prpls=yes) DYNAMIC_PRPLS=all -AC_ARG_WITH(static-prpls, [ --with-static-prpls link in certain protocols statically],[STATIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`],STATIC_PRPLS="") +AC_ARG_WITH(static-prpls, [AC_HELP_STRING([--with-static-prpls], [Link to certain protocols statically])], [STATIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`], [STATIC_PRPLS=""]) if test "x$STATIC_PRPLS" != "x" -a "x$DYNAMIC_PRPLS" = "xall"; then DYNAMIC_PRPLS="" fi @@ -398,7 +399,7 @@ load_proto="$load_proto gaim_init_${i}_plugin();" case $i in bonjour) static_bonjour=yes ;; - gg) static_gg=yes ;; + gg) static_gg=yes ;; irc) static_irc=yes ;; jabber) static_jabber=yes ;; msn) static_msn=yes ;; @@ -633,7 +634,7 @@ fi if test "x$enable_dbus" = "xyes" ; then - PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.35 dbus-glib-1 >= 0.35], + PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.35 dbus-glib-1 >= 0.35], [ AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) @@ -645,7 +646,7 @@ ]) fi -dnl Why do we need python? +dnl Why do we need python? dnl Python scripts are used to auto-generate about 3000 lines of C dnl and XML code that wraps (part of) the existing Gaim API so that @@ -661,7 +662,7 @@ AC_ARG_WITH([python], AC_HELP_STRING([--with-python], - [Which python interpreter to use for dbus code generation]), + [which python interpreter to use for dbus code generation]), PYTHON=$withval) if test "x$enable_dbus" = "xyes" ; then @@ -696,7 +697,7 @@ dnl # although a newer dbus is installed. But I have tried to order the dnl # directory searching to keep this situation at a minimum. dnl ########################################################################### -AC_ARG_WITH(dbus-services, [ --with-dbus-services=<dir> Where the D-Bus services directory is located.]) +AC_ARG_WITH(dbus-services, [ --with-dbus-services=<dir> where the D-Bus services directory is located.]) DBUS_SERVICES_DIR="" @@ -747,7 +748,7 @@ dnl ####################################################################### dnl # Check for startup notification dnl ####################################################################### -AC_ARG_ENABLE(startup-notification, [ --disable-startup-notification compile without startup notification support],,enable_startup_notification=yes) +AC_ARG_ENABLE(startup-notification, [AC_HELP_STRING([--disable-startup-notification], [compile without startup notification support])], , enable_startup_notification=yes) if test "x$enable_startup_notification" = "xyes"; then PKG_CHECK_MODULES(STARTUP_NOTIFICATION, libstartup-notification-1.0 >= 0.5, @@ -879,19 +880,19 @@ else MONO_LIBS=`pkg-config --libs mono 2> /dev/null` AC_MSG_RESULT(ok) - + oldLIBS="$LIBS" LIBS="$LIBS $MONO_LIBS" AC_MSG_CHECKING(for libmono) AC_CHECK_FUNCS(mono_jit_init, [], enable_mono=no) LIBS="$oldLIBS" - + oldCPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $MONO_CFLAGS" AC_CHECK_HEADERS(mono/jit/jit.h, [], enable_mono=no) AC_CHECK_HEADERS(mono/metadata/object.h, [], enable_mono=no) CPPFLAGS="$oldCPPFLAGS" - + AC_DEFINE(ENABLE_MONO, 1, [Define if mono enabled.]) fi else @@ -981,7 +982,7 @@ fi AC_ARG_WITH(perl-lib, - [ --with-perl-lib=[site|vendor|DIR] Specify where to install the + [ --with-perl-lib=[site|vendor|DIR] specify where to install the Perl libraries for gaim. Default is site.], [ if test "x$withval" = xsite; then @@ -1047,12 +1048,12 @@ dnl These two are inverses of each other <-- stolen from evolution! AC_ARG_ENABLE(gnutls, - [ --enable-gnutls=[yes,no] Attempt to use GNUTLS for SSL support (preferred) [default=yes]], + [ --enable-gnutls=[yes,no] attempt to use GNUTLS for SSL support (preferred) [default=yes]], [enable_gnutls="$enableval"], [enable_gnutls="yes"]) AC_ARG_ENABLE(nss, - [ --enable-nss=[yes,no,static] Attempt to use Mozilla libnss for SSL support [default=yes]], + [ --enable-nss=[yes,no,static] attempt to use Mozilla libnss for SSL support [default=yes]], [enable_nss="$enableval"], [enable_nss="yes"]) @@ -1066,7 +1067,7 @@ prefix=`eval echo $prefix` AC_ARG_WITH(gnutls-includes, - [ --with-gnutls-includes=PREFIX Location of GNUTLS includes.], + [ --with-gnutls-includes=PREFIX location of GNUTLS includes.], [ with_gnutls_includes="$withval" ], [ with_gnutls_includes="$prefix/include" ]) @@ -1096,7 +1097,7 @@ fi AC_ARG_WITH(gnutls-libs, - [ --with-gnutls-libs=PREFIX Location of GNUTLS libraries.], + [ --with-gnutls-libs=PREFIX location of GNUTLS libraries.], [ with_gnutls_libs="$withval" ]) if test "x$with_gnutls_libs" != "xno" -a \ @@ -1148,19 +1149,19 @@ if test "x$enable_nss" != "xno"; then AC_ARG_WITH(nspr-includes, - [ --with-nspr-includes=PREFIX Specify location of Mozilla nspr4 includes.], + [ --with-nspr-includes=PREFIX specify location of Mozilla nspr4 includes.], [with_nspr_includes="$withval"]) AC_ARG_WITH(nspr-libs, - [ --with-nspr-libs=PREFIX Specify location of Mozilla nspr4 libs.], + [ --with-nspr-libs=PREFIX specify location of Mozilla nspr4 libs.], [with_nspr_libs="$withval"]) AC_ARG_WITH(nss-includes, - [ --with-nss-includes=PREFIX Specify location of Mozilla nss3 includes.], + [ --with-nss-includes=PREFIX specify location of Mozilla nss3 includes.], [with_nss_includes="$withval"]) AC_ARG_WITH(nss-libs, - [ --with-nss-libs=PREFIX Specify location of Mozilla nss3 libs.], + [ --with-nss-libs=PREFIX specify location of Mozilla nss3 libs.], [with_nss_libs="$withval"]) @@ -1625,7 +1626,7 @@ elif test -d /usr/local/include/zephyr ; then ZEPHYR_CFLAGS="-I/usr/local/include" fi - AC_DEFINE(LIBZEPHYR_EXT, 1 , [Define if external libzephyr should be used.]) + AC_DEFINE(LIBZEPHYR_EXT, 1 , [Define if external libzephyr should be used.]) AM_CONDITIONAL(EXTERNAL_LIBZEPHYR, test "x$zephyr" != "xno") orig_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $ZEPHYR_LDFLAGS" @@ -1653,8 +1654,8 @@ dnl ####################################################################### dnl # Doxygen Stuff dnl ####################################################################### -AC_ARG_ENABLE(doxygen, [ --enable-doxygen enable documentation with doxygen],,enable_doxygen=yes) -AC_ARG_ENABLE(dot, [ --enable-dot enable graphs in doxygen via 'dot'],,enable_dot=yes) +AC_ARG_ENABLE(doxygen, [AC_HELP_STRING([--enable-doxygen], [enable documentation with doxygen])],,enable_doxygen=yes) +AC_ARG_ENABLE(dot, [AC_HELP_STRING([--enable-dot], [enable graphs in doxygen via 'dot'])],,enable_dot=yes) if test "x$enable_doxygen" = xyes; then AC_CHECK_PROG(DOXYGEN, doxygen, true, false) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2006-05-12 22:08:45
|
Revision: 16183 Author: deryni9 Date: 2006-05-12 15:08:34 -0700 (Fri, 12 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16183&view=rev Log Message: ----------- Apparently if you just use --with-python the autotools decide you must mean you want to use yes(1) as your python interpreter, this results in an infinitely growing output file the first time the dbus stuff tries to generate a header. That's bad. This should make it a bit clearer. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-05-12 21:50:19 UTC (rev 16182) +++ trunk/configure.ac 2006-05-12 22:08:34 UTC (rev 16183) @@ -673,7 +673,7 @@ dnl in C (brrrr ...). AC_ARG_WITH([python], - AC_HELP_STRING([--with-python], + AC_HELP_STRING([--with-python=PATH], [which python interpreter to use for dbus code generation]), PYTHON=$withval) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-05-13 15:42:27
|
Revision: 16186 Author: thekingant Date: 2006-05-13 08:42:23 -0700 (Sat, 13 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16186&view=rev Log Message: ----------- Fix a typo in the disable-gstreamer description and capitalize gadugadu Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-05-12 23:04:48 UTC (rev 16185) +++ trunk/configure.ac 2006-05-13 15:42:23 UTC (rev 16186) @@ -166,7 +166,7 @@ PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10, ,enable_gst=no) AC_SUBST(GSTREAMER_CFLAGS) AC_SUBST(GSTREAMER_LIBS) -AC_ARG_ENABLE(gstreamer,[ --disable-gstreamer compile with GStreamer audio support],enable_gst=no) +AC_ARG_ENABLE(gstreamer,[ --disable-gstreamer compile without GStreamer audio support],enable_gst=no) if test "x$enable_gst" = "xyes"; then AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer for making sounds]) fi @@ -304,10 +304,10 @@ dnl ####################################################################### -dnl # Check for gadugadu client includes and libraries +dnl # Check for Gadu-Gadu client includes and libraries dnl ####################################################################### -AC_ARG_WITH(gadu-includes, [AC_HELP_STRING([--with-gadu-includes=DIR], [compile the gadugadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"]) -AC_ARG_WITH(gadu-libs, [AC_HELP_STRING([--with-gadu-libs=DIR], [compile the gadugadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"]) +AC_ARG_WITH(gadu-includes, [AC_HELP_STRING([--with-gadu-includes=DIR], [compile the GaduGadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"]) +AC_ARG_WITH(gadu-libs, [AC_HELP_STRING([--with-gadu-libs=DIR], [compile the GaduGadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"]) GADU_CFLAGS="" GADU_LIBS="" if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fac...@us...> - 2006-06-10 17:39:23
|
Revision: 16238 Author: faceprint Date: 2006-06-10 10:39:15 -0700 (Sat, 10 Jun 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16238&view=rev Log Message: ----------- let you disable libxml2 support Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-06-08 15:35:37 UTC (rev 16237) +++ trunk/configure.ac 2006-06-10 17:39:15 UTC (rev 16238) @@ -178,6 +178,7 @@ PKG_CHECK_MODULES(LIBXML, libxml-2.0, ,enable_libxml=no) AC_SUBST(LIBXML_CFLAGS) AC_SUBST(LIBXML_LIBS) +AC_ARG_ENABLE(libxml,[ --disable-libxml compile without libxml2 support],enable_libxml=no) if test "x$enable_libxml" = "xyes"; then AC_DEFINE(HAVE_LIBXML, 1, [Use libxml2 for xml parsing]) fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fac...@us...> - 2006-06-10 18:10:02
|
Revision: 16241 Author: faceprint Date: 2006-06-10 11:09:57 -0700 (Sat, 10 Jun 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16241&view=rev Log Message: ----------- autotools continues to confuse me Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-06-10 18:01:11 UTC (rev 16240) +++ trunk/configure.ac 2006-06-10 18:09:57 UTC (rev 16241) @@ -174,12 +174,12 @@ dnl ################# dnl # LibXML2 dnl ################# -enable_libxml=yes -PKG_CHECK_MODULES(LIBXML, libxml-2.0, ,enable_libxml=no) +enable_libxml2=yes +PKG_CHECK_MODULES(LIBXML, libxml-2.0, ,enable_libxml2=no) AC_SUBST(LIBXML_CFLAGS) AC_SUBST(LIBXML_LIBS) -AC_ARG_ENABLE(libxml,[ --disable-libxml compile without libxml2 support],enable_libxml=no) -if test "x$enable_libxml" = "xyes"; then +AC_ARG_ENABLE(libxml,[ --disable-libxml compile without libxml2 support],enable_libxml2=no) +if test "x$enable_libxml2" = "xyes"; then AC_DEFINE(HAVE_LIBXML, 1, [Use libxml2 for xml parsing]) fi @@ -1797,6 +1797,7 @@ eval echo DBUS servies directory........ : $DBUS_SERVICES_DIR fi echo Build with Cyrus SASL support. : $enable_cyrus_sasl +echo Build with libxml2 support.... : $enable_libxml2 echo Has you....................... : yes echo echo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rl...@us...> - 2006-06-11 00:06:19
|
Revision: 16250 Author: rlaager Date: 2006-06-10 17:06:02 -0700 (Sat, 10 Jun 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16250&view=rev Log Message: ----------- Some cosmetic cleanups that have been sitting in my tree for a while. I wouldn't be committing this now, except SVN is being a real pain. Apparently having changes in your tree when someone else commits changes is a conflict, even when they're in totally different parts of the file? Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-06-10 19:51:32 UTC (rev 16249) +++ trunk/configure.ac 2006-06-11 00:06:02 UTC (rev 16250) @@ -318,8 +318,8 @@ dnl ####################################################################### dnl # Check for Gadu-Gadu client includes and libraries dnl ####################################################################### -AC_ARG_WITH(gadu-includes, [AC_HELP_STRING([--with-gadu-includes=DIR], [compile the GaduGadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"]) -AC_ARG_WITH(gadu-libs, [AC_HELP_STRING([--with-gadu-libs=DIR], [compile the GaduGadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"]) +AC_ARG_WITH(gadu-includes, [AC_HELP_STRING([--with-gadu-includes=DIR], [compile the Gadu-Gadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"]) +AC_ARG_WITH(gadu-libs, [AC_HELP_STRING([--with-gadu-libs=DIR], [compile the Gadu-Gadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"]) GADU_CFLAGS="" GADU_LIBS="" if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then @@ -1072,7 +1072,7 @@ dnl These two are inverses of each other <-- stolen from evolution! AC_ARG_ENABLE(gnutls, - [ --enable-gnutls=[yes,no] attempt to use GNUTLS for SSL support (preferred) [default=yes]], + [ --enable-gnutls=[yes,no] attempt to use GnuTLS for SSL support (preferred) [default=yes]], [enable_gnutls="$enableval"], [enable_gnutls="yes"]) @@ -1084,14 +1084,14 @@ msg_ssl="None (MSN will not work without SSL!)" dnl # -dnl # Check for GNUTLS if it's specified. +dnl # Check for GnuTLS if it's specified. dnl # if test "x$enable_gnutls" != "xno"; then enable_gnutls="no" prefix=`eval echo $prefix` AC_ARG_WITH(gnutls-includes, - [ --with-gnutls-includes=PREFIX location of GNUTLS includes.], + [ --with-gnutls-includes=PREFIX location of GnuTLS includes.], [ with_gnutls_includes="$withval" ], [ with_gnutls_includes="$prefix/include" ]) @@ -1100,7 +1100,7 @@ if test "x$with_gnutls_includes" != "xno"; then CPPFLAGS_save="$CPPFLAGS" - AC_MSG_CHECKING(for GNUTLS includes) + AC_MSG_CHECKING(for GnuTLS includes) AC_MSG_RESULT("") CPPFLAGS="$CPPFLAGS -I$with_gnutls_includes" @@ -1116,12 +1116,12 @@ GNUTLS_CFLAGS="" fi else - AC_MSG_CHECKING(for GNUTLS includes) + AC_MSG_CHECKING(for GnuTLS includes) AC_MSG_RESULT(no) fi AC_ARG_WITH(gnutls-libs, - [ --with-gnutls-libs=PREFIX location of GNUTLS libraries.], + [ --with-gnutls-libs=PREFIX location of GnuTLS libraries.], [ with_gnutls_libs="$withval" ]) if test "x$with_gnutls_libs" != "xno" -a \ @@ -1134,7 +1134,7 @@ *) with_gnutls_libs="-L$with_gnutls_libs" ;; esac - AC_CACHE_CHECK([for GNUTLS libraries], gnutls_libs, + AC_CACHE_CHECK([for GnuTLS libraries], gnutls_libs, [ LDFLAGS="$LDFLAGS $with_gnutls_libs -lgnutls -lgcrypt" AC_TRY_LINK_FUNC(gnutls_init, gnutls_libs="yes", gnutls_libs="no") @@ -1142,9 +1142,9 @@ ]) if test "x$gnutls_libs" != "xno"; then - AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have GNUTLS]) + AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have GnuTLS]) AC_DEFINE(HAVE_SSL) - msg_gnutls="GNUTLS" + msg_gnutls="GnuTLS" GNUTLS_LIBS="$with_gnutls_libs -lgnutls -lgcrypt" enable_gnutls="yes" @@ -1153,7 +1153,7 @@ GNUTLS_LIBS="" fi else - AC_MSG_CHECKING(for GNUTLS libraries) + AC_MSG_CHECKING(for GnuTLS libraries) AC_MSG_RESULT(no) fi else @@ -1168,7 +1168,7 @@ dnl # -dnl # Check for NSS if it's specified, or if GNUTLS checks failed. +dnl # Check for NSS if it's specified, or if GnuTLS checks failed. dnl # if test "x$enable_nss" != "xno"; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ebl...@us...> - 2006-06-20 04:07:03
|
Revision: 16294 Author: eblanton Date: 2006-06-19 21:05:56 -0700 (Mon, 19 Jun 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16294&view=rev Log Message: ----------- This should fix --enable-python to do something reasonable Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-06-19 17:52:52 UTC (rev 16293) +++ trunk/configure.ac 2006-06-20 04:05:56 UTC (rev 16294) @@ -690,7 +690,7 @@ PYTHON=$withval) if test "x$enable_dbus" = "xyes" ; then - if test -z "$PYTHON" ; then + if test -z "$PYTHON" -o "x$PYTHON" = "xyes"; then AC_PATH_PROG([PYTHON], [python], [no]) fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2006-06-20 16:04:11
|
Revision: 16297 Author: deryni9 Date: 2006-06-20 09:04:00 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16297&view=rev Log Message: ----------- Report 'no' when not building with these libraries, instead of reporting nothing and having the next message on the same line. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-06-20 08:18:55 UTC (rev 16296) +++ trunk/configure.ac 2006-06-20 16:04:00 UTC (rev 16297) @@ -163,7 +163,11 @@ dnl # GStreamer dnl ####################################################################### enable_gst=yes -PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10, ,enable_gst=no) +PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10], , + [ + AC_MSG_RESULT(no) + enable_gst=no + ]) AC_SUBST(GSTREAMER_CFLAGS) AC_SUBST(GSTREAMER_LIBS) AC_ARG_ENABLE(gstreamer,[ --disable-gstreamer compile without GStreamer audio support],enable_gst=no) @@ -175,7 +179,11 @@ dnl # LibXML2 dnl ################# enable_libxml2=yes -PKG_CHECK_MODULES(LIBXML, libxml-2.0, ,enable_libxml2=no) +PKG_CHECK_MODULES(LIBXML, [libxml-2.0], , + [ + AC_MSG_RESULT(no) + enable_libxml2=no + ]) AC_SUBST(LIBXML_CFLAGS) AC_SUBST(LIBXML_LIBS) AC_ARG_ENABLE(libxml,[ --disable-libxml compile without libxml2 support],enable_libxml2=no) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-08-12 21:13:27
|
Revision: 16727 Author: thekingant Date: 2006-08-12 14:13:25 -0700 (Sat, 12 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16727&view=rev Log Message: ----------- I decided that it's probably not a good idea to enable_fatal_asserts when --enable-debug is passed to autogen.sh/configure. However, EVERY Gaim dev, summer of code student and crazy patch writer should pass "--enable-fatal-asserts" to Gaim's autogen.sh/configure (It causes Gaim to segfault when g_return_val_if_fail() fails) Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-08-12 21:07:34 UTC (rev 16726) +++ trunk/configure.ac 2006-08-12 21:13:25 UTC (rev 16727) @@ -546,7 +546,6 @@ if test "x$enable_debug" = "xyes" ; then AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.]) - enable_fatal_asserts="yes" fi if test "x$enable_fatal_asserts" = "xyes" ; then @@ -1822,9 +1821,10 @@ echo echo Use XScreenSaver Extension.... : $enable_xss echo Use X Session Management...... : $enable_sm -echo Use startup notification.......: $enable_startup_notification +echo Use startup notification...... : $enable_startup_notification echo echo Print debugging messages...... : $enable_debug +echo Assertions are fatal.......... : $enable_fatal_asserts echo eval eval echo Gaim will be installed in $bindir. if test "x$gaimpath" != "x" ; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <may...@us...> - 2006-08-19 03:46:34
|
Revision: 16871 Author: mayuan2006 Date: 2006-08-18 20:46:26 -0700 (Fri, 18 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16871&view=rev Log Message: ----------- change the configure.ac to avoid autogen error committed by Ma Yuan<may...@gm...> Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-08-19 03:38:23 UTC (rev 16870) +++ trunk/configure.ac 2006-08-19 03:46:26 UTC (rev 16871) @@ -639,6 +639,7 @@ [ AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) + echo "GLib 2.0 check OK!" ], [ AC_MSG_ERROR([ @@ -654,6 +655,7 @@ [ AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) + echo "GTK+ 2.0 check OK!" ], [ AC_MSG_ERROR([ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-08-19 07:16:32
|
Revision: 16877 Author: thekingant Date: 2006-08-19 00:16:27 -0700 (Sat, 19 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16877&view=rev Log Message: ----------- There was an extra line in here? Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-08-19 07:02:12 UTC (rev 16876) +++ trunk/configure.ac 2006-08-19 07:16:27 UTC (rev 16877) @@ -1885,7 +1885,6 @@ echo Build with libxml2 support.... : $enable_libxml2 echo Has you....................... : yes echo -echo echo Use kerberos 4 with zephyr.... : $kerberos echo Use external libzephyr........ : $zephyr echo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-08-19 08:15:22
|
Revision: 16881 Author: thekingant Date: 2006-08-19 01:15:19 -0700 (Sat, 19 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16881&view=rev Log Message: ----------- * Change our "GTK UI Library?" line that is printed at the end of ./configure to say yes or no instead of GTK+ 2.x or None * If --disable-gntgaim then show "no" next to the "Console UI?" line that is printed at the end of ./configure * Use AC_HELP_STRING for some of the ./configure --help strings so that they're lined up correctly automatically Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-08-19 08:02:43 UTC (rev 16880) +++ trunk/configure.ac 2006-08-19 08:15:19 UTC (rev 16881) @@ -189,7 +189,7 @@ ]) AC_SUBST(LIBXML_CFLAGS) AC_SUBST(LIBXML_LIBS) -AC_ARG_ENABLE(libxml,[ --disable-libxml compile without libxml2 support],enable_libxml2=no) +AC_ARG_ENABLE(libxml, [AC_HELP_STRING([--disable-libxml], [compile without libxml2 support])],enable_libxml2=no) if test "x$enable_libxml2" = "xyes"; then AC_DEFINE(HAVE_LIBXML, 1, [Use libxml2 for xml parsing]) fi @@ -396,7 +396,7 @@ AC_ARG_ENABLE(distrib,,,enable_distrib=no) AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes") -AC_ARG_ENABLE(prpls, [ --disable-prpls don't build dynamic protocol plugins],,enable_prpls=yes) +AC_ARG_ENABLE(prpls, [AC_HELP_STRING([--disable-prpls], [don't build dynamic protocol plugins])], , enable_prpls=yes) DYNAMIC_PRPLS=all AC_ARG_WITH(static-prpls, [AC_HELP_STRING([--with-static-prpls], [Link to certain protocols statically])], [STATIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`], [STATIC_PRPLS=""]) if test "x$STATIC_PRPLS" != "x" -a "x$DYNAMIC_PRPLS" = "xall"; then @@ -518,17 +518,17 @@ AM_CONDITIONAL(DYNAMIC_YAHOO, test "x$dynamic_yahoo" = "xyes") AM_CONDITIONAL(DYNAMIC_ZEPHYR, test "x$dynamic_zephyr" = "xyes") -AC_ARG_ENABLE(mono, [ --enable-mono compile with Mono runtime support],,enable_mono=no) -AC_ARG_ENABLE(plugins, [ --disable-plugins compile without plugin support],,enable_plugins=yes) -AC_ARG_ENABLE(perl, [ --disable-perl compile without perl scripting],,enable_perl=yes) -AC_ARG_ENABLE(tcl, [ --disable-tcl compile without Tcl scripting],,enable_tcl=yes) +AC_ARG_ENABLE(mono, [AC_HELP_STRING([--enable-mono], [compile with Mono runtime support])], , enable_mono=no) +AC_ARG_ENABLE(plugins, [AC_HELP_STRING([--disable-plugins], [compile without plugin support])], , enable_plugins=yes) +AC_ARG_ENABLE(perl, [AC_HELP_STRING([--disable-perl], [compile without perl scripting])], , enable_perl=yes) +AC_ARG_ENABLE(tcl, [AC_HELP_STRING([--disable-tcl], [compile without Tcl scripting])], , enable_tcl=yes) AC_ARG_WITH(tclconfig, [ --with-tclconfig=DIR directory containing tclConfig.sh]) AC_ARG_ENABLE(tk, [ --disable-tk compile without Tcl support for Tk],,enable_tk=yes) 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, [ --disable-gtkgaim compile without GtkGaim client],,enable_gtk=yes) -AC_ARG_ENABLE(gntgaim, [ --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=yes) +AC_ARG_ENABLE(gntgaim, [AC_HELP_STRING([--disable-gntgaim], [compile without GntGaim console client])], , 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 @@ -809,8 +809,10 @@ dnl # GNT Gaim dnl ####################################################################### if test "x$enable_gnt" = "xyes"; then -AC_CHECK_LIB(ncursesw, initscr, , [enable_gnt=no]) -AC_CHECK_LIB(panelw, update_panels, , [enable_gnt=no]) + AC_CHECK_LIB(ncursesw, initscr, , [enable_gnt=no]) + AC_CHECK_LIB(panelw, update_panels, , [enable_gnt=no]) +else + enable_gnt=no fi AM_CONDITIONAL(ENABLE_GNT, test "x$enable_gnt" = "xyes") @@ -1866,11 +1868,7 @@ echo Protocols to link statically.. : $STATIC_PRPLS echo Protocols to build dynamically : $DYNAMIC_PRPLS echo -if test "x$enable_gtk" = "xyes" ; then -echo GTK UI Library................ : GTK+ 2.x -else -echo GTK UI Library................ : None -fi +echo Build with GTK+ 2.x UI........ : $enable_gtk echo Build with GNT Console UI..... : $enable_gnt echo SSL Library/Libraries......... : $msg_ssl echo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sa...@us...> - 2006-08-19 20:02:29
|
Revision: 16889 Author: sadrul Date: 2006-08-19 13:02:26 -0700 (Sat, 19 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16889&view=rev Log Message: ----------- These needs to be here. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-08-19 17:11:39 UTC (rev 16888) +++ trunk/configure.ac 2006-08-19 20:02:26 UTC (rev 16889) @@ -1854,6 +1854,8 @@ libgaim/protocols/yahoo/Makefile libgaim/protocols/zephyr/Makefile console/Makefile + console/libgnt/Makefile + console/libgnt/gnt.pc console/plugins/Makefile po/Makefile.in gaim.pc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2006-08-31 22:04:24
|
Revision: 17103 http://svn.sourceforge.net/gaim/?rev=17103&view=rev Author: deryni9 Date: 2006-08-31 15:04:16 -0700 (Thu, 31 Aug 2006) Log Message: ----------- Remove the gtk+ checks from around the tests for perl, and throw an extra eval on the dbus services line so that $prefix gets expanded correctly. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-08-31 21:52:06 UTC (rev 17102) +++ trunk/configure.ac 2006-08-31 22:04:16 UTC (rev 17103) @@ -1030,7 +1030,6 @@ AC_SUBST(MONO_LIBS) AM_CONDITIONAL(USE_MONO, test x"$enable_mono" = x"yes") -if test "x$enable_gtk" = "xyes"; then # This is for now, since perl still requires GTK+ dnl ####################################################################### dnl # Check for Perl support dnl ####################################################################### @@ -1038,10 +1037,6 @@ enable_perl=no fi -else # GTK - enable_perl=no -fi # GTK - if test "$enable_perl" = yes ; then AC_PATH_PROG(perlpath, perl) AC_MSG_CHECKING(for Perl compile flags) @@ -1897,7 +1892,7 @@ echo Build with GtkSpell support... : $enable_gtkspell echo Build with DBUS support....... : $enable_dbus if test "x$enable_dbus" = "xyes" ; then -eval echo DBUS servies directory........ : $DBUS_SERVICES_DIR +eval eval echo DBUS servies directory........ : $DBUS_SERVICES_DIR fi echo Build with Cyrus SASL support. : $enable_cyrus_sasl echo Build with libxml2 support.... : $enable_libxml2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <amc...@us...> - 2006-09-03 19:07:01
|
Revision: 17144 http://svn.sourceforge.net/gaim/?rev=17144&view=rev Author: amc_grim Date: 2006-09-03 12:06:50 -0700 (Sun, 03 Sep 2006) Log Message: ----------- sadrul said the last version didn't work for him, so now we're trying absolute include paths which still work fine for me Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-09-03 18:45:16 UTC (rev 17143) +++ trunk/configure.ac 2006-09-03 19:06:50 UTC (rev 17144) @@ -821,7 +821,7 @@ dnl # Some distros put the headers in ncursesw/, some don't found_ncurses_h=no - for f in ncurses.h ncursesw/ncurses.h + for f in /usr/include/ncurses.h /usr/include/ncursesw/ncurses.h do AC_CHECK_HEADER($f,[ AC_MSG_CHECKING([if $f supports wide characters]) @@ -835,7 +835,7 @@ ], [ dir=`dirname $f` if test x"$dir" != x"." ; then - GNT_CFLAGS="-I $dir/" + GNT_CFLAGS="-I$dir/" else GNT_CFLAGS="" fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-09-04 04:38:06
|
Revision: 17154 http://svn.sourceforge.net/gaim/?rev=17154&view=rev Author: thekingant Date: 2006-09-03 21:38:03 -0700 (Sun, 03 Sep 2006) Log Message: ----------- Use AC_HELP_STRING in almost all places Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-09-04 04:11:51 UTC (rev 17153) +++ trunk/configure.ac 2006-09-04 04:38:03 UTC (rev 17154) @@ -173,7 +173,7 @@ ]) AC_SUBST(GSTREAMER_CFLAGS) AC_SUBST(GSTREAMER_LIBS) -AC_ARG_ENABLE(gstreamer,[ --disable-gstreamer compile without GStreamer audio support],enable_gst=no) +AC_ARG_ENABLE(gstreamer, [AC_HELP_STRING([--disable-gstreamer], [compile without GStreamer audio support])], enable_gst=no) if test "x$enable_gst" = "xyes"; then AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer for making sounds]) fi @@ -522,27 +522,27 @@ AC_ARG_ENABLE(plugins, [AC_HELP_STRING([--disable-plugins], [compile without plugin support])], , enable_plugins=yes) AC_ARG_ENABLE(perl, [AC_HELP_STRING([--disable-perl], [compile without perl scripting])], , enable_perl=yes) AC_ARG_ENABLE(tcl, [AC_HELP_STRING([--disable-tcl], [compile without Tcl scripting])], , enable_tcl=yes) -AC_ARG_WITH(tclconfig, [ --with-tclconfig=DIR directory containing tclConfig.sh]) -AC_ARG_ENABLE(tk, [ --disable-tk compile without Tcl support for Tk],,enable_tk=yes) -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_WITH(tclconfig, [AC_HELP_STRING([--with-tclconfig=DIR], [directory containing tclConfig.sh])]) +AC_ARG_ENABLE(tk, [AC_HELP_STRING([--disable-tk], [compile without Tcl support for Tk])], , enable_tk=yes) +AC_ARG_WITH(tkconfig, [AC_HELP_STRING([--with-tkconfig=DIR], [directory containing tkConfig.sh])]) +AC_ARG_ENABLE(gtkspell, [AC_HELP_STRING([--disable-gtkspell], [compile without GtkSpell automatic spell checking])], , enable_gtkspell=yes) +AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [compile with debugging support])], , enable_debug=no) 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) +AC_ARG_ENABLE(fatal-asserts, [AC_HELP_STRING([--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 dnl same code when it's not necessary, so we're sticking with dnl the deprecated APIs in many cases. dnl This option is being left in case things change. -dnl AC_ARG_ENABLE(deprecated, [ --disable-deprecated compile without deprecated API usage],,enable_deprecated=yes) -AC_ARG_ENABLE(fortify, [ --disable-fortify compile without FORTIFY_SOURCE support],,enable_fortify=yes) -AC_ARG_ENABLE(screensaver, [ --disable-screensaver compile without X screensaver extension],,enable_xss=yes) -AC_ARG_ENABLE(sm, [ --disable-sm compile without X session management support],,enable_sm=yes) -AC_ARG_WITH(krb4, [ --with-krb4=PREFIX compile Zephyr plugin with Kerberos 4 support],kerberos="$withval",kerberos="no") -AC_ARG_WITH(zephyr, [ --with-zephyr=PREFIX compile Zephyr plugin against external libzephyr],zephyr="$withval",zephyr="no") +dnl AC_ARG_ENABLE(deprecated, [AC_HELP_STRING([--disable-deprecated], [compile without deprecated API usage])], , enable_deprecated=yes) +AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify], [compile without FORTIFY_SOURCE support])], , enable_fortify=yes) +AC_ARG_ENABLE(screensaver, [AC_HELP_STRING([--disable-screensaver], [compile without X screensaver extension])], , enable_xss=yes) +AC_ARG_ENABLE(sm, [AC_HELP_STRING([--disable-sm], [compile without X session management support])], , enable_sm=yes) +AC_ARG_WITH(krb4, [AC_HELP_STRING([--with-krb4=PREFIX], [compile Zephyr plugin with Kerberos 4 support])], kerberos="$withval", kerberos="no") +AC_ARG_WITH(zephyr, [AC_HELP_STRING([--with-zephyr=PREFIX], [compile Zephyr plugin against external libzephyr])], zephyr="$withval", zephyr="no") AM_CONDITIONAL(EXTERNAL_LIBZEPHYR, test "x$zephyr" != "xno") AC_CHECK_HEADER(sys/utsname.h) @@ -688,7 +688,7 @@ dnl # Check for DBUS libraries dnl ####################################################################### -AC_ARG_ENABLE(dbus, [ --enable-dbus enable DBUS support],,enable_dbus=yes) +AC_ARG_ENABLE(dbus, [AC_HELP_STRING([--enable-dbus], [enable DBUS support])], , enable_dbus=yes) if test "x$enable_dbus" = "xyes" ; then AC_CHECK_PROG(enable_dbus, dbus-binding-tool, yes, no) @@ -758,7 +758,7 @@ dnl # although a newer dbus is installed. But I have tried to order the dnl # directory searching to keep this situation at a minimum. dnl ########################################################################### -AC_ARG_WITH(dbus-services, [ --with-dbus-services=<dir> where the D-Bus services directory is located.]) +AC_ARG_WITH(dbus-services, [AC_HELP_STRING([--with-dbus-services=<dir>], [where the D-Bus services directory is located.])]) DBUS_SERVICES_DIR="" @@ -897,7 +897,7 @@ dnl # Check for stuff needed by the evolution integration plugin. dnl ####################################################################### build_gevo=no -AC_ARG_ENABLE(gevolution, [ --disable-gevolution compile without the Gaim-Evolution plugin],,enable_gevolution=yes) +AC_ARG_ENABLE(gevolution, [AC_HELP_STRING([--disable-gevolution], [compile without the Gaim-Evolution plugin])], , enable_gevolution=yes) if test "x$enable_gevolution" = "xyes"; then evo_deps="libebook-1.2 libedata-book-1.2" @@ -1142,8 +1142,8 @@ fi AC_ARG_WITH(perl-lib, - [ --with-perl-lib=[site|vendor|DIR] specify where to install the - Perl libraries for gaim. Default is site.], + [AC_HELP_STRING([--with-perl-lib=[site|vendor|DIR]], [specify where to install the + Perl libraries for gaim. Default is site.])], [ if test "x$withval" = xsite; then PERL_MM_PARAMS="" @@ -1257,7 +1257,7 @@ fi AC_ARG_WITH(gnutls-libs, - [ --with-gnutls-libs=PREFIX location of GnuTLS libraries.], + [AC_HELP_STRING([--with-gnutls-libs=PREFIX], [location of GnuTLS libraries.])], [ with_gnutls_libs="$withval" ]) if test "x$with_gnutls_libs" != "xno" -a \ @@ -1309,19 +1309,19 @@ if test "x$enable_nss" != "xno"; then AC_ARG_WITH(nspr-includes, - [ --with-nspr-includes=PREFIX specify location of Mozilla nspr4 includes.], + [AC_HELP_STRING([--with-nspr-includes=PREFIX], [specify location of Mozilla nspr4 includes.])], [with_nspr_includes="$withval"]) AC_ARG_WITH(nspr-libs, - [ --with-nspr-libs=PREFIX specify location of Mozilla nspr4 libs.], + [AC_HELP_STRING([--with-nspr-libs=PREFIX], [specify location of Mozilla nspr4 libs.])], [with_nspr_libs="$withval"]) AC_ARG_WITH(nss-includes, - [ --with-nss-includes=PREFIX specify location of Mozilla nss3 includes.], + [AC_HELP_STRING([--with-nss-includes=PREFIX], [specify location of Mozilla nss3 includes.])], [with_nss_includes="$withval"]) AC_ARG_WITH(nss-libs, - [ --with-nss-libs=PREFIX specify location of Mozilla nss3 libs.], + [AC_HELP_STRING([--with-nss-libs=PREFIX], [specify location of Mozilla nss3 libs.])], [with_nss_libs="$withval"]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-09-04 07:16:15
|
Revision: 17156 http://svn.sourceforge.net/gaim/?rev=17156&view=rev Author: thekingant Date: 2006-09-04 00:16:09 -0700 (Mon, 04 Sep 2006) Log Message: ----------- More cleanup. Contact Availability Prediction plugin is compiled by default now (as long as libdbi is installed). And it's not compiled if not doing gtk Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-09-04 05:48:45 UTC (rev 17155) +++ trunk/configure.ac 2006-09-04 07:16:09 UTC (rev 17156) @@ -161,13 +161,202 @@ ) dnl ####################################################################### -dnl # Check for LibXML2 (required) +dnl # Check for GLib 2.0 (required) dnl ####################################################################### -PKG_CHECK_MODULES(LIBXML, [libxml-2.0], , - [ +PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.0.0 gobject-2.0 gmodule-2.0 gthread-2.0], , [ + AC_MSG_RESULT(no) + AC_MSG_ERROR([ + +You must have the GLib 2.0 development headers installed to build Gaim. +])]) +AC_SUBST(GLIB_CFLAGS) +AC_SUBST(GLIB_LIBS) + +dnl ####################################################################### +dnl # Check for GTK+ 2.0 and other things used by the GTK UI +dnl ####################################################################### +AC_ARG_ENABLE(gtkgaim, + [AC_HELP_STRING([--disable-gtkgaim], + [compile without GtkGaim client])], + enable_gtk="$enableval", enable_gtk="yes") +AC_ARG_ENABLE(screensaver, + [AC_HELP_STRING([--disable-screensaver], + [compile without X screensaver extension (used to detect idleness)])], + enable_screensaver="no", enable_screensaver="yes") +AC_ARG_ENABLE(sm, + [AC_HELP_STRING([--disable-sm], + [compile without X session management support])], + enable_sm="no", enable_sm="yes") +AC_ARG_ENABLE(startup-notification, + [AC_HELP_STRING([--disable-startup-notification], + [compile without startup notification support])], + enable_startup_notification="no", enable_startup_notification="yes") +AC_ARG_ENABLE(gtkspell, + [AC_HELP_STRING([--disable-gtkspell], + [compile without GtkSpell automatic spell checking])], + enable_gtkspell="no", enable_gtkspell="yes") +AC_ARG_ENABLE(gevolution, + [AC_HELP_STRING([--disable-gevolution], + [compile without the Gaim Evolution plugin])], + enable_gevolution="no", enable_gevolution="yes") +AC_ARG_ENABLE(cap, + [AC_HELP_STRING([--disable-cap], + [compile without Contact Availability Prediction plugin])], + enable_cap="no", enable_cap="yes") + +if test "x$enable_gtk" = "xyes" ; then + PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0.0], , [ AC_MSG_RESULT(no) AC_MSG_ERROR([ +You must have the GTK+ 2.0 development headers installed to compile Gaim's +GTK+ interface. If you only want to build the console interface then +specify --disable-gtkgaim when running configure. +])]) + + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + + dnl ####################################################################### + dnl # Check for XScreenSaver + dnl ####################################################################### + if test "x$enable_screensaver" = "xyes" ; then + old_LIBS="$LIBS" + LIBS="$LIBS $GTK_LIBS $x_libpath_add" + XSS_LIBS="" + XSS_HEADERS="" + AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS="$X_LIBS $X_PRE_LIBS -lX11 -lXext $X_EXTRA_LIBS"],[],[-lX11 -lXext -lm]) + AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="$X_LIBS $X_PRE_LIBS -lX11 -lXext $X_LIBS $X_EXTRA_LIBS -lXss"],[],[-lX11 -lXext -lm]) + if test "x$XSS_LIBS" != "x"; then + oldCPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $x_incpath_add" + AC_TRY_COMPILE([ + #include <X11/Xlib.h> + #include <X11/extensions/scrnsaver.h> + ], [], [], [enable_screensaver=no]) + CPPFLAGS="$oldCPPFLAGS" + else + enable_screensaver=no + fi + LIBS="$old_LIBS" + + if test "x$enable_screensaver" = "xyes" ; then + AC_DEFINE(USE_SCREENSAVER, 1, [Define if we're using XScreenSaver.]) + AC_SUBST(XSS_LIBS) + fi + fi + + dnl ####################################################################### + dnl # Check for X session management libs + dnl ####################################################################### + if test "x$enable_sm" = "xyes"; then + enable_sm=no + AC_CHECK_LIB(SM, SmcSaveYourselfDone, found_sm_lib=true, , [$x_libpath_add -lICE]) + if test "x$found_sm_lib" = "xtrue"; then + oldCPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $x_incpath_add" + AC_CHECK_HEADERS(X11/SM/SMlib.h, SM_LIBS="$x_libpath_add -lSM -lICE" enable_sm=yes) + CPPFLAGS="$oldCPPFLAGS" + fi + + if test "x$enable_sm" = "xyes"; then + AC_DEFINE(USE_SM, 1, [Define if we're using X Session Management.]) + AC_SUBST(SM_LIBS) + fi + fi + + dnl ####################################################################### + dnl # Check for startup notification + dnl ####################################################################### + if test "x$enable_startup_notification" = "xyes"; then + PKG_CHECK_MODULES(STARTUP_NOTIFICATION, [libstartup-notification-1.0 >= 0.5], , [ + AC_MSG_RESULT(no) + enable_startup_notification=no + ]) + + if test "x$enable_startup_notification" = "xyes"; then + AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, [Define if we're using libstartup-notification.]) + AC_SUBST(STARTUP_NOTIFICATION_CFLAGS) + AC_SUBST(STARTUP_NOTIFICATION_LIBS) + fi + fi + + dnl ####################################################################### + dnl # Check for GtkSpell + dnl ####################################################################### + if test "x$enable_gtkspell" = "xyes" ; then + PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.2, , [ + AC_MSG_RESULT(no) + enable_gtkspell=no + ]) + if test "x$enable_gtkspell" = "xyes" ; then + AC_DEFINE(USE_GTKSPELL, 1, [Define if we're using GtkSpell]) + AC_SUBST(GTKSPELL_CFLAGS) + AC_SUBST(GTKSPELL_LIBS) + fi + fi + + dnl ####################################################################### + dnl # Check for stuff needed by the Evolution integration plugin. + dnl ####################################################################### + if test "x$enable_gevolution" = "xyes"; then + evo_deps="libebook-1.2 libedata-book-1.2" + PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, , [ + AC_MSG_RESULT(yes) + enable_gevolution="no" + ]) + if test "x$enable_gevolution" = "xno"; then + evo_deps="libebook-1.0 libedata-book-1.0" + PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, [ + enable_gevolution="yes" + ], [ + AC_MSG_RESULT(yes) + ]) + fi + if test "x$enable_gevolution" = "xyes"; then + AC_DEFINE(HAVE_EVOLUTION_ADDRESSBOOK, 1, [Define if we're using evolution addressbook.]) + AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS) + AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS) + fi + fi + + dnl ####################################################################### + dnl # Check for libdbi (for the Contact Availability Prediction plugin) + dnl ####################################################################### + if test "x$enable_cap" = "xyes"; then + AC_CHECK_HEADERS(dbi/dbi.h, , enable_cap="no") + if test "x$enable_cap" = "xyes"; then + AC_CHECK_LIB(dbi, dbi_result_field_is_null, CAP_LIBS="-ldbi", enable_cap="no") + AC_SUBST(CAP_LIBS) + fi + fi + +else # GTK + enable_screensaver=no + enable_sm=no + enable_startup_notification=no + enable_gtkspell=no + enable_gevolution=no +fi # GTK + +AM_CONDITIONAL(ENABLE_GTK, test "x$enable_gtk" = "xyes") +AM_CONDITIONAL(BUILD_GEVOLUTION, test "x$enable_gevolution" = "xyes") +AM_CONDITIONAL(ENABLE_CAP, test "x$enable_cap" = "xyes") + +dnl ####################################################################### +dnl # Check for ncurses? +dnl ####################################################################### +AC_ARG_ENABLE(gntgaim, + [AC_HELP_STRING([--disable-gntgaim], [compile without GntGaim console client])], + enable_gnt=$enableval, enable_gnt=yes) + +dnl ####################################################################### +dnl # Check for LibXML2 (required) +dnl ####################################################################### +PKG_CHECK_MODULES(LIBXML, [libxml-2.0], , [ + AC_MSG_RESULT(no) + AC_MSG_ERROR([ + You must have the libxml2 development headers installed to build Gaim. ])]) AC_SUBST(LIBXML_CFLAGS) @@ -180,24 +369,24 @@ [AC_HELP_STRING([--disable-gstreamer], [compile without GStreamer audio support])], enable_gst="no", enable_gst="yes") PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10], , [ - AC_MSG_RESULT(no) - enable_gst="no" - ]) + AC_MSG_RESULT(no) + enable_gst="no" +]) if test "x$enable_gst" != "xno"; then + AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer for playing sounds]) AC_SUBST(GSTREAMER_CFLAGS) AC_SUBST(GSTREAMER_LIBS) - AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer for playing sounds]) fi dnl ####################################################################### dnl # Check for Meanwhile headers (for Sametime) dnl ####################################################################### PKG_CHECK_MODULES(MEANWHILE, [meanwhile >= 1.0.0 meanwhile < 2.0.0], [ - have_meanwhile="yes" - ], [ - AC_MSG_RESULT(no) - have_meanwhile="no" - ]) + have_meanwhile="yes" +], [ + AC_MSG_RESULT(no) + have_meanwhile="no" +]) AC_SUBST(MEANWHILE_CFLAGS) AC_SUBST(MEANWHILE_LIBS) @@ -211,6 +400,17 @@ dnl Attempt to autodetect avahi-compat-howl PKG_CHECK_MODULES(HOWL, avahi-compat-howl, [ + howlincludes="yes" + howllibs="yes" +], [ + AC_MSG_RESULT(no) + howlincludes="no" + howllibs="no" +]) + +dnl Attempt to autodetect Howl +if test "x$howlincludes" = "xno"; then + PKG_CHECK_MODULES(HOWL, howl, [ howlincludes="yes" howllibs="yes" ], [ @@ -218,17 +418,6 @@ howlincludes="no" howllibs="no" ]) - -dnl Attempt to autodetect Howl -if test "x$howlincludes" = "xno"; then - PKG_CHECK_MODULES(HOWL, howl, [ - howlincludes="yes" - howllibs="yes" - ], [ - AC_MSG_RESULT(no) - howlincludes="no" - howllibs="no" - ]) fi dnl Override HOWL_CFLAGS if the user specified an include dir @@ -514,10 +703,6 @@ AC_ARG_ENABLE(tk, [AC_HELP_STRING([--disable-tk], [compile without Tcl support for Tk])], , enable_tk=yes) AC_ARG_WITH(tkconfig, [AC_HELP_STRING([--with-tkconfig=DIR], [directory containing tkConfig.sh])]) AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [compile with debugging support])], , enable_debug=no) -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, [AC_HELP_STRING([--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 @@ -526,8 +711,6 @@ dnl This option is being left in case things change. dnl AC_ARG_ENABLE(deprecated, [AC_HELP_STRING([--disable-deprecated], [compile without deprecated API usage])], , enable_deprecated=yes) AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify], [compile without FORTIFY_SOURCE support])], , enable_fortify=yes) -AC_ARG_ENABLE(screensaver, [AC_HELP_STRING([--disable-screensaver], [compile without X screensaver extension])], , enable_xss=yes) -AC_ARG_ENABLE(sm, [AC_HELP_STRING([--disable-sm], [compile without X session management support])], , enable_sm=yes) AC_ARG_WITH(krb4, [AC_HELP_STRING([--with-krb4=PREFIX], [compile Zephyr plugin with Kerberos 4 support])], kerberos="$withval", kerberos="no") AC_ARG_WITH(zephyr, [AC_HELP_STRING([--with-zephyr=PREFIX], [compile Zephyr plugin against external libzephyr])], zephyr="$withval", zephyr="no") AM_CONDITIONAL(EXTERNAL_LIBZEPHYR, test "x$zephyr" != "xno") @@ -624,32 +807,8 @@ fi AC_SUBST(CFLAGS) -PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.0.0 gobject-2.0 gmodule-2.0 gthread-2.0], , - [ - AC_MSG_RESULT(no) - AC_MSG_ERROR([ - -You must have the GLib 2.0 development headers installed to build Gaim. -])]) -AC_SUBST(GLIB_CFLAGS) -AC_SUBST(GLIB_LIBS) - AC_PATH_PROG(gaimpath, gaim) -if test "x$enable_gtk" = "xyes" ; then - PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0.0],, - [ - AC_MSG_RESULT(no) - AC_MSG_ERROR([ - -You must have the GTK+ 2.0 development headers installed to compile Gaim's -GTK+ interface. If you only want to build the console interface then -specify --disable-gtkgaim when calling configure. -])]) -AC_SUBST(GTK_CFLAGS) -AC_SUBST(GTK_LIBS) -fi - AC_PATH_XTRA # We can't assume that $x_libraries will be set, because autoconf does not # set it in the case when the X libraries are in a standard place. @@ -681,13 +840,11 @@ fi if test "x$enable_dbus" = "xyes" ; then - PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.35 dbus-glib-1 >= 0.35], - [ + PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.35 dbus-glib-1 >= 0.35], [ AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) enable_dbus=yes - ], - [ + ], [ AC_MSG_RESULT(no) enable_dbus=no ]) @@ -855,167 +1012,6 @@ AC_CHECK_FUNC(wcwidth, [AC_DEFINE([HAVE_WCWIDTH], [1], [Define to 1 if you have wcwidth function.])]) dnl ####################################################################### -dnl # Look for startup-notification, evolution integration, X-libraries, -dnl # XScreenSaver, X session management, GtkSpell only if GTK+ was found -dnl ####################################################################### - -if test "x$enable_gtk" = "xyes"; then - - dnl ####################################################################### - dnl # Check for startup notification - dnl ####################################################################### - AC_ARG_ENABLE(startup-notification, [AC_HELP_STRING([--disable-startup-notification], [compile without startup notification support])], , enable_startup_notification=yes) - - if test "x$enable_startup_notification" = "xyes"; then - PKG_CHECK_MODULES(STARTUP_NOTIFICATION, libstartup-notification-1.0 >= 0.5, - [ - AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, [Define if we're using libstartup-notification.]) - enable_startup_notification=yes - ], [ - AC_MSG_RESULT(no) - enable_startup_notification=no - ]) - - AC_SUBST(STARTUP_NOTIFICATION_CFLAGS) - AC_SUBST(STARTUP_NOTIFICATION_LIBS) - fi - - dnl ####################################################################### - dnl # Check for stuff needed by the evolution integration plugin. - dnl ####################################################################### - build_gevo=no - AC_ARG_ENABLE(gevolution, [AC_HELP_STRING([--disable-gevolution], [compile without the Gaim-Evolution plugin])], , enable_gevolution=yes) - - if test "x$enable_gevolution" = "xyes"; then - evo_deps="libebook-1.2 libedata-book-1.2" - PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, [ - AC_DEFINE(HAVE_EVOLUTION_ADDRESSBOOK, 1, [Define if we're using evolution addressbook.]) - build_gevo=yes - ], [ - AC_MSG_RESULT(yes) - build_gevo=no - ]) - if test "x$build_gevo" = "xno"; then - evo_deps="libebook-1.0 libedata-book-1.0" - PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, [ - AC_DEFINE(HAVE_EVOLUTION_ADDRESSBOOK, 1, [Define if we're using evolution addressbook.]) - build_gevo=yes - ], [ - AC_MSG_RESULT(yes) - build_gevo=no - ]) - fi - - AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS) - AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS) - fi - - dnl ####################################################################### - dnl # Check for XScreenSaver - dnl ####################################################################### - if test "x$enable_xss" = "xyes" ; then - old_LIBS="$LIBS" - LIBS="$LIBS $GTK_LIBS $x_libpath_add" - XSS_LIBS="no" - XSS_HEADERS="no" - AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS="$X_LIBS $X_PRE_LIBS -lX11 -lXext $X_EXTRA_LIBS"],[],[-lX11 -lXext -lm]) - AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="$X_LIBS $X_PRE_LIBS -lX11 -lXext $X_LIBS $X_EXTRA_LIBS -lXss"],[],[-lX11 -lXext -lm]) - if test \! "$XSS_LIBS" = "no"; then - oldCPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $x_incpath_add" - AC_TRY_COMPILE([ - #include <X11/Xlib.h> - #include <X11/extensions/scrnsaver.h> - ],[],[ - AC_DEFINE(USE_SCREENSAVER, 1, [Define if we're using XScreenSaver.])],[enable_xss=no] - ) - CPPFLAGS="$oldCPPFLAGS" - else - XSS_LIBS="" - enable_xss=no - fi - LIBS="$old_LIBS" - else - XSS_LIBS="" - enable_xss=no - fi - AC_SUBST(XSS_LIBS) - - dnl ####################################################################### - dnl # Check for X session management libs - dnl ####################################################################### - if test "x$enable_sm" = "xyes"; then - enable_sm=no - AC_CHECK_LIB(SM, SmcSaveYourselfDone, found_sm_lib=true, , [$x_libpath_add -lICE]) - if test "$found_sm_lib" = "true"; then - oldCPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $x_incpath_add" - AC_CHECK_HEADERS(X11/SM/SMlib.h, SM_LIBS="$x_libpath_add -lSM -lICE" enable_sm=yes) - CPPFLAGS="$oldCPPFLAGS" - fi - else - SM_LIBS="" - enable_sm=no - fi - AC_SUBST(SM_LIBS) - if test "$enable_sm" = "yes"; then - AC_DEFINE(USE_SM, 1, [Define if we're using X Session Management.]) - fi - - AC_DEFUN([GC_TM_GMTOFF], - [AC_REQUIRE([AC_STRUCT_TM])dnl - AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff, - [AC_TRY_COMPILE([#include <sys/types.h> - #include <$ac_cv_struct_tm>], [struct tm tm; tm.tm_gmtoff;], - ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)]) - if test "$ac_cv_struct_tm_gmtoff" = yes; then - AC_DEFINE(HAVE_TM_GMTOFF, 1, [tm_gmtoff is available.]) - fi - ]) - - dnl ####################################################################### - dnl # Check for GtkSpell - dnl ####################################################################### - AC_ARG_ENABLE(gtkspell, [AC_HELP_STRING([--disable-gtkspell], [compile without GtkSpell automatic spell checking])], , enable_gtkspell=yes) - if test "$enable_gtkspell" = yes ; then - PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.2, [], [ - AC_MSG_RESULT(no) - enable_gtkspell=no - ]) - if test "$enable_gtkspell" = "yes" ; then - AC_SUBST(GTKSPELL_CFLAGS) - AC_SUBST(GTKSPELL_LIBS) - AC_DEFINE(USE_GTKSPELL,,[do we have gtkspell?]) - fi - fi -else # GTK - enable_gevolution=no - enable_sm=no - enable_xss=no - enable_startup_notification=no - enable_gtkspell=no -fi # GTK - -AM_CONDITIONAL(ENABLE_GTK, test "x$enable_gtk" = "xyes") - -AM_CONDITIONAL(BUILD_GEVOLUTION, test "x$build_gevo" = "xyes") - -GC_TM_GMTOFF - -dnl ####################################################################### -dnl # Check for libdbi (Contact Availability Prediction plugin) -dnl ####################################################################### -AC_ARG_ENABLE(cap, [AC_HELP_STRING([--enable-cap], [compile with Contact Availability Prediction Plugin])], , enable_cap=no) -if test "x$enable_cap" = "xyes"; then - AC_CHECK_HEADERS(dbi/dbi.h, [], enable_cap=no) -fi -if test "x$enable_cap" = "xyes"; then - AC_CHECK_LIB(dbi, dbi_result_field_is_null, [CAP_LIBS="-ldbi"], [enable_cap=no]) -fi -AC_SUBST(CAP_LIBS) -AM_CONDITIONAL(ENABLE_CAP, test "x$enable_cap" = "xyes") - -dnl ####################################################################### dnl # Check for Mono support dnl ####################################################################### AC_ARG_ENABLE(mono, [AC_HELP_STRING([--enable-mono], [compile with Mono runtime support])], , enable_mono=no) @@ -1107,10 +1103,10 @@ AM_CONDITIONAL(USE_PERL, false) AC_MSG_WARN(Compiling perl requires ExtUtils::MakeMaker) else + AC_DEFINE(HAVE_PERL, [1], [Compile with support for perl]) AC_SUBST(PERL_CFLAGS) AC_SUBST(PERL_LIBS) AM_CONDITIONAL(USE_PERL, true) - AC_DEFINE(HAVE_PERL, [1], [Compile with support for perl]) dnl This is almost definitely wrong, but in case there's dnl something I'm missing, I'll leave it in. @@ -1622,8 +1618,8 @@ if test "$enable_tcl" = yes; then AM_CONDITIONAL(USE_TCL, true) TCL_LIBS=$TCL_LIB_SPEC - AC_SUBST(TCL_LIBS) AC_DEFINE(HAVE_TCL, [1], [Compile with support for the Tcl toolkit]) + AC_SUBST(TCL_LIBS) TCL_CFLAGS="$TCL_INCLUDE_SPEC -I$TCL_PREFIX/include" if test "x$GCC" = "xyes"; then TCL_CFLAGS="$TCL_CFLAGS -fno-strict-aliasing" @@ -1942,7 +1938,7 @@ echo Use kerberos 4 with zephyr.... : $kerberos echo Use external libzephyr........ : $zephyr echo -echo Use XScreenSaver Extension.... : $enable_xss +echo Use XScreenSaver Extension.... : $enable_screensaver echo Use X Session Management...... : $enable_sm echo Use startup notification...... : $enable_startup_notification echo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-09-04 08:09:38
|
Revision: 17158 http://svn.sourceforge.net/gaim/?rev=17158&view=rev Author: thekingant Date: 2006-09-04 01:09:36 -0700 (Mon, 04 Sep 2006) Log Message: ----------- A little more cleanup Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-09-04 07:22:51 UTC (rev 17157) +++ trunk/configure.ac 2006-09-04 08:09:36 UTC (rev 17158) @@ -178,7 +178,7 @@ AC_ARG_ENABLE(gtkgaim, [AC_HELP_STRING([--disable-gtkgaim], [compile without GtkGaim client])], - enable_gtk="$enableval", enable_gtk="yes") + enable_gtkui="$enableval", enable_gtkui="yes") AC_ARG_ENABLE(screensaver, [AC_HELP_STRING([--disable-screensaver], [compile without X screensaver extension (used to detect idleness)])], @@ -204,7 +204,7 @@ [compile without Contact Availability Prediction plugin])], enable_cap="no", enable_cap="yes") -if test "x$enable_gtk" = "xyes" ; then +if test "x$enable_gtkui" = "xyes" ; then PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0.0], , [ AC_MSG_RESULT(no) AC_MSG_ERROR([ @@ -325,10 +325,8 @@ dnl ####################################################################### if test "x$enable_cap" = "xyes"; then AC_CHECK_HEADERS(dbi/dbi.h, , enable_cap="no") - if test "x$enable_cap" = "xyes"; then - AC_CHECK_LIB(dbi, dbi_result_field_is_null, CAP_LIBS="-ldbi", enable_cap="no") - AC_SUBST(CAP_LIBS) - fi + AC_CHECK_LIB(dbi, dbi_result_field_is_null, CAP_LIBS="-ldbi", enable_cap="no") + AC_SUBST(CAP_LIBS) fi else # GTK @@ -339,17 +337,79 @@ enable_gevolution=no fi # GTK -AM_CONDITIONAL(ENABLE_GTK, test "x$enable_gtk" = "xyes") +AM_CONDITIONAL(ENABLE_GTK, test "x$enable_gtkui" = "xyes") AM_CONDITIONAL(BUILD_GEVOLUTION, test "x$enable_gevolution" = "xyes") AM_CONDITIONAL(ENABLE_CAP, test "x$enable_cap" = "xyes") dnl ####################################################################### -dnl # Check for ncurses? +dnl # Check for ncurses and other things used by the console UI dnl ####################################################################### -AC_ARG_ENABLE(gntgaim, - [AC_HELP_STRING([--disable-gntgaim], [compile without GntGaim console client])], - enable_gnt=$enableval, enable_gnt=yes) +AC_ARG_ENABLE(consolegaim, + [AC_HELP_STRING([--disable-consolegaim], [compile without console client])], + enable_console=$enableval, enable_console=yes) +GNT_LIBS="" +GNT_CFLAGS="" +if test "x$enable_console" = "xyes"; then + AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_console=no]) + AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"], [enable_console=no]) + + LIBS_save="$LIBS" + LIBS="$LIBS $GNT_LIBS" + + dnl # Some distros put the headers in ncursesw/, some don't + found_ncurses_h=no + for f in /usr/include/ncursesw/ncurses.h /usr/include/ncurses.h + do + AC_CHECK_HEADER($f,[ + AC_MSG_CHECKING([if $f supports wide characters]) + AC_TRY_COMPILE([ + #define _XOPEN_SOURCE_EXTENDED + #include <$f> + ], [ + #ifndef get_wch + # error get_wch not found! + #endif + ], [ + dir=`dirname $f` + if test x"$dir" != x"." ; then + GNT_CFLAGS="-I$dir/" + else + GNT_CFLAGS="" + fi + + found_ncurses_h=yes + AC_MSG_RESULT([yes]) + break + ], [ + AC_MSG_RESULT([no]) + ]) + ]) + done + + LIBS="$LIBS_save" + + if test x"$found_ncurses_h" = x"no" ; then + GNT_LIBS="" + GNT_CFLAGS="" + enable_console=no + AC_MSG_RESULT([no]) + else + AC_MSG_RESULT([yes]) + fi + + PKG_CHECK_MODULES(X11, x11, + [AC_DEFINE(HAVE_X11, 1, [Define to 1 if you have X11])], [AC_MSG_RESULT(no)]) + AC_SUBST(X11_LIBS) + AC_SUBST(X11_CFLAGS) +fi + +AC_SUBST(GNT_LIBS) +AC_SUBST(GNT_CFLAGS) +AM_CONDITIONAL(ENABLE_GNT, test "x$enable_console" = "xyes") + +AC_CHECK_FUNC(wcwidth, [AC_DEFINE([HAVE_WCWIDTH], [1], [Define to 1 if you have wcwidth function.])]) + dnl ####################################################################### dnl # Check for LibXML2 (required) dnl ####################################################################### @@ -574,7 +634,6 @@ AC_ARG_ENABLE(distrib,,,enable_distrib=no) AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes") -AC_ARG_ENABLE(prpls, [AC_HELP_STRING([--disable-prpls], [don't build dynamic protocol plugins])], , enable_prpls=yes) DYNAMIC_PRPLS=all AC_ARG_WITH(static-prpls, [AC_HELP_STRING([--with-static-prpls], [Link to certain protocols statically])], [STATIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`], [STATIC_PRPLS=""]) if test "x$STATIC_PRPLS" != "x" -a "x$DYNAMIC_PRPLS" = "xall"; then @@ -697,20 +756,6 @@ AM_CONDITIONAL(DYNAMIC_ZEPHYR, test "x$dynamic_zephyr" = "xyes") AC_ARG_ENABLE(plugins, [AC_HELP_STRING([--disable-plugins], [compile without plugin support])], , enable_plugins=yes) -AC_ARG_ENABLE(perl, [AC_HELP_STRING([--disable-perl], [compile without perl scripting])], , enable_perl=yes) -AC_ARG_ENABLE(tcl, [AC_HELP_STRING([--disable-tcl], [compile without Tcl scripting])], , enable_tcl=yes) -AC_ARG_WITH(tclconfig, [AC_HELP_STRING([--with-tclconfig=DIR], [directory containing tclConfig.sh])]) -AC_ARG_ENABLE(tk, [AC_HELP_STRING([--disable-tk], [compile without Tcl support for Tk])], , enable_tk=yes) -AC_ARG_WITH(tkconfig, [AC_HELP_STRING([--with-tkconfig=DIR], [directory containing tkConfig.sh])]) -AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [compile with debugging support])], , enable_debug=no) -AC_ARG_ENABLE(fatal-asserts, [AC_HELP_STRING([--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 -dnl same code when it's not necessary, so we're sticking with -dnl the deprecated APIs in many cases. -dnl This option is being left in case things change. -dnl AC_ARG_ENABLE(deprecated, [AC_HELP_STRING([--disable-deprecated], [compile without deprecated API usage])], , enable_deprecated=yes) -AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify], [compile without FORTIFY_SOURCE support])], , enable_fortify=yes) AC_ARG_WITH(krb4, [AC_HELP_STRING([--with-krb4=PREFIX], [compile Zephyr plugin with Kerberos 4 support])], kerberos="$withval", kerberos="no") AC_ARG_WITH(zephyr, [AC_HELP_STRING([--with-zephyr=PREFIX], [compile Zephyr plugin against external libzephyr])], zephyr="$withval", zephyr="no") AM_CONDITIONAL(EXTERNAL_LIBZEPHYR, test "x$zephyr" != "xno") @@ -718,17 +763,19 @@ AC_CHECK_HEADER(sys/utsname.h) AC_CHECK_FUNC(uname) +AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], + [compile with debugging support])], , enable_debug=no) if test "x$enable_debug" = "xyes" ; then AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.]) fi +AC_ARG_ENABLE(fatal-asserts, [AC_HELP_STRING([--enable-fatal-asserts], + [make assertions fatal (useful for debugging)])], , enable_fatal_asserts=no) if test "x$enable_fatal_asserts" = "xyes" ; then AC_DEFINE(GAIM_FATAL_ASSERTS, 1, [Define to make assertions fatal (useful for debugging).]) fi -if test "x$enable_deprecated" = "xno"; then - DEBUG_CFLAGS="$DEBUG_CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" -fi +AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify], [compile without FORTIFY_SOURCE support])], , enable_fortify=yes) if test "x$GCC" = "xyes"; then dnl We enable -Wall later. @@ -824,11 +871,6 @@ x_incpath_add="-I$x_includes" fi -PKG_CHECK_MODULES(X11, x11, - [AC_DEFINE(HAVE_X11, 1, [Define to 1 if you have X11])], [AC_MSG_RESULT(no)]) -AC_SUBST(X11_LIBS) -AC_SUBST(X11_CFLAGS) - dnl ####################################################################### dnl # Check for DBUS libraries dnl ####################################################################### @@ -952,66 +994,6 @@ AM_CONDITIONAL(ENABLE_DBUS, test "x$enable_dbus" = "xyes") dnl ####################################################################### -dnl # GNT Gaim -dnl ####################################################################### -GNT_LIBS="" -GNT_CFLAGS="" -if test "x$enable_gnt" = "xyes"; then - AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_gnt=no]) - AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"], [enable_gnt=no]) - - LIBS_save="$LIBS" - LIBS="$LIBS $GNT_LIBS" - - dnl # Some distros put the headers in ncursesw/, some don't - found_ncurses_h=no - for f in /usr/include/ncurses.h /usr/include/ncursesw/ncurses.h - do - AC_CHECK_HEADER($f,[ - AC_MSG_CHECKING([if $f supports wide characters]) - AC_TRY_COMPILE([ - #define _XOPEN_SOURCE_EXTENDED - #include <$f> - ], [ - #ifndef get_wch - # error get_wch not found! - #endif - ], [ - dir=`dirname $f` - if test x"$dir" != x"." ; then - GNT_CFLAGS="-I$dir/" - else - GNT_CFLAGS="" - fi - - found_ncurses_h=yes - AC_MSG_RESULT([yes]) - break - ], [ - AC_MSG_RESULT([no]) - ]) - ]) - done - - LIBS="$LIBS_save" - - if test x"$found_ncurses_h" = x"no" ; then - GNT_LIBS="" - GNT_CFLAGS="" - enable_gnt=no - AC_MSG_RESULT([no]) - else - AC_MSG_RESULT([yes]) - fi -fi - -AC_SUBST(GNT_LIBS) -AC_SUBST(GNT_CFLAGS) -AM_CONDITIONAL(ENABLE_GNT, test "x$enable_gnt" = "xyes") - -AC_CHECK_FUNC(wcwidth, [AC_DEFINE([HAVE_WCWIDTH], [1], [Define to 1 if you have wcwidth function.])]) - -dnl ####################################################################### dnl # Check for Mono support dnl ####################################################################### AC_ARG_ENABLE(mono, [AC_HELP_STRING([--enable-mono], [compile with Mono runtime support])], , enable_mono=no) @@ -1054,6 +1036,8 @@ dnl ####################################################################### dnl # Check for Perl support dnl ####################################################################### +AC_ARG_ENABLE(perl, [AC_HELP_STRING([--disable-perl], [compile without perl scripting])], , enable_perl=yes) + if test "$enable_plugins" = no ; then enable_perl=no fi @@ -1568,6 +1552,11 @@ dnl ####################################################################### dnl # Check for Tcl dnl ####################################################################### +AC_ARG_ENABLE(tcl, [AC_HELP_STRING([--disable-tcl], + [compile without Tcl scripting])], enable_tcl="no", enable_tcl="yes") +AC_ARG_WITH(tclconfig, [AC_HELP_STRING([--with-tclconfig=DIR], + [directory containing tclConfig.sh])]) + if test "$enable_plugins" = no; then enable_tcl=no fi @@ -1632,6 +1621,11 @@ dnl ####################################################################### dnl # Check for Tk dnl ####################################################################### +AC_ARG_ENABLE(tk, [AC_HELP_STRING([--disable-tk], + [compile without Tcl support for Tk])], enable_tk="no", enable_tk="yes") +AC_ARG_WITH(tkconfig, [AC_HELP_STRING([--with-tkconfig=DIR], + [directory containing tkConfig.sh])]) + if test "$enable_tcl" = yes -a "$enable_tk" = yes; then AC_MSG_CHECKING([for tkConfig.sh]) TKCONFIG=no @@ -1689,20 +1683,11 @@ if test "x$enable_plugins" = "xyes" ; then AC_DEFINE(GAIM_PLUGINS, 1, [Define if plugins are enabled.]) - AM_CONDITIONAL(PLUGINS, test "x$enable_plugins" = "xyes") + AM_CONDITIONAL(PLUGINS, true) else AM_CONDITIONAL(PLUGINS, false) - enable_plugins=no - enable_prpls=no fi -if test "x$enable_prpls" = "xyes" ; then - AM_CONDITIONAL(PRPLS, test "x$enable_plugins" = "xyes") -else - AM_CONDITIONAL(PRPLS, false) - enable_prpls=no -fi - dnl ####################################################################### dnl # Check for Cyrus-SASL (for Jabber) dnl ####################################################################### @@ -1802,42 +1787,41 @@ dnl ####################################################################### dnl # Check for Doxygen and dot (part of GraphViz) dnl ####################################################################### -AC_ARG_ENABLE(doxygen, [AC_HELP_STRING([--enable-doxygen], [enable documentation with doxygen])],,enable_doxygen=yes) -AC_ARG_ENABLE(dot, [AC_HELP_STRING([--enable-dot], [enable graphs in doxygen via 'dot'])],,enable_dot=yes) +AC_ARG_ENABLE(doxygen, + [AC_HELP_STRING([--disable-doxygen], + [enable documentation with doxygen])], + enable_doxygen="no", enable_doxygen="yes") +AC_ARG_ENABLE(dot, + [AC_HELP_STRING([--enable-dot], + [enable graphs in doxygen via 'dot'])], + enable_dot="no", enable_dot="yes") if test "x$enable_doxygen" = xyes; then AC_CHECK_PROG(DOXYGEN, doxygen, true, false) if test $DOXYGEN = false; then - AC_MSG_WARN([*** doxygen not found, docs will not be available]) - enable_doxygen=no + AC_MSG_WARN([*** Doxygen not found, docs will not be available]) + enable_doxygen="no" else AC_DEFINE_UNQUOTED(HAVE_DOXYGEN, 1, [whether or not we have doxygen]) - if test "x$enable_dot" = xyes; then + if test "x$enable_dot" = "xyes"; then AC_CHECK_PROG(DOT, dot, true, false) if test $DOT = false; then enable_dot="no"; - AC_MSG_WARN([*** dot not found, graphs will not be available]) + AC_MSG_WARN([*** GraphViz dot not found, docs will not have graphs]) else AC_DEFINE_UNQUOTED(HAVE_DOT, 1, [whether or not we have dot]) fi - else - AC_MSG_WARN([*** dot not found, graphs will not be available]) fi fi else enable_dot="no" fi -if test "x$enable_doxygen" = xyes; then - AM_CONDITIONAL(HAVE_DOXYGEN, true) -else - AM_CONDITIONAL(HAVE_DOXYGEN, false) -fi - AC_SUBST(enable_doxygen) AC_SUBST(enable_dot) +AM_CONDITIONAL(HAVE_DOXYGEN, test "x$enable_doxygen" = "xyes") AC_CONFIG_COMMANDS_PRE([ if test -e VERSION; then @@ -1913,35 +1897,34 @@ echo $PACKAGE $VERSION echo -echo Build Protocol Plugins........ : $enable_prpls -echo Protocols to link statically.. : $STATIC_PRPLS +echo Build GTK+ 2.x UI............. : $enable_gtkui +echo Build console UI.............. : $enable_console +echo echo Protocols to build dynamically : $DYNAMIC_PRPLS +echo Protocols to link statically.. : $STATIC_PRPLS echo -echo Build with GTK+ 2.x UI........ : $enable_gtk -echo Build with GNT Console UI..... : $enable_gnt -echo SSL Library/Libraries......... : $msg_ssl -echo echo Build with GStreamer support.. : $enable_gst -echo Build with Plugin support..... : $enable_plugins -echo Build with Mono support....... : $enable_mono -echo Build with Perl support....... : $enable_perl -echo Build with Tcl support........ : $enable_tcl -echo Build with Tk support......... : $enable_tk -echo Build with GtkSpell support... : $enable_gtkspell echo Build with DBUS support....... : $enable_dbus if test "x$enable_dbus" = "xyes" ; then -eval eval echo DBUS servies directory........ : $DBUS_SERVICES_DIR + eval eval echo DBUS servies directory........ : $DBUS_SERVICES_DIR fi +echo SSL Library/Libraries......... : $msg_ssl echo Build with Cyrus SASL support. : $enable_cyrus_sasl -echo Has you....................... : yes -echo echo Use kerberos 4 with zephyr.... : $kerberos echo Use external libzephyr........ : $zephyr +echo Has you....................... : yes echo echo Use XScreenSaver Extension.... : $enable_screensaver echo Use X Session Management...... : $enable_sm echo Use startup notification...... : $enable_startup_notification +echo Build with GtkSpell support... : $enable_gtkspell echo +echo Build with plugin support..... : $enable_plugins +echo Build with Mono support....... : $enable_mono +echo Build with Perl support....... : $enable_perl +echo Build with Tcl support........ : $enable_tcl +echo Build with Tk support......... : $enable_tk +echo echo Print debugging messages...... : $enable_debug echo Assertions are fatal.......... : $enable_fatal_asserts echo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-09-04 08:19:23
|
Revision: 17159 http://svn.sourceforge.net/gaim/?rev=17159&view=rev Author: thekingant Date: 2006-09-04 01:19:17 -0700 (Mon, 04 Sep 2006) Log Message: ----------- A few more changes. Use --disable-gtkui or --disable-consoleui instead of whatever they were before Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-09-04 08:09:36 UTC (rev 17158) +++ trunk/configure.ac 2006-09-04 08:19:17 UTC (rev 17159) @@ -172,13 +172,16 @@ AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) +AC_ARG_ENABLE(gtkui, [AC_HELP_STRING([--disable-gtkui], + [compile without GTK+ user interface])], + enable_gtkui="$enableval", enable_gtkui="yes") +AC_ARG_ENABLE(consoleui, [AC_HELP_STRING([--disable-consoleui], + [compile without console user interface])], + enable_consoleui=$enableval, enable_consoleui=yes) + dnl ####################################################################### dnl # Check for GTK+ 2.0 and other things used by the GTK UI dnl ####################################################################### -AC_ARG_ENABLE(gtkgaim, - [AC_HELP_STRING([--disable-gtkgaim], - [compile without GtkGaim client])], - enable_gtkui="$enableval", enable_gtkui="yes") AC_ARG_ENABLE(screensaver, [AC_HELP_STRING([--disable-screensaver], [compile without X screensaver extension (used to detect idleness)])], @@ -211,7 +214,7 @@ You must have the GTK+ 2.0 development headers installed to compile Gaim's GTK+ interface. If you only want to build the console interface then -specify --disable-gtkgaim when running configure. +specify --disable-gtkui when running configure. ])]) AC_SUBST(GTK_CFLAGS) @@ -344,15 +347,11 @@ dnl ####################################################################### dnl # Check for ncurses and other things used by the console UI dnl ####################################################################### -AC_ARG_ENABLE(consolegaim, - [AC_HELP_STRING([--disable-consolegaim], [compile without console client])], - enable_console=$enableval, enable_console=yes) - GNT_LIBS="" GNT_CFLAGS="" -if test "x$enable_console" = "xyes"; then - AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_console=no]) - AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"], [enable_console=no]) +if test "x$enable_consoleui" = "xyes"; then + AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_consoleui=no]) + AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"], [enable_consoleui=no]) LIBS_save="$LIBS" LIBS="$LIBS $GNT_LIBS" @@ -392,7 +391,7 @@ if test x"$found_ncurses_h" = x"no" ; then GNT_LIBS="" GNT_CFLAGS="" - enable_console=no + enable_consoleui=no AC_MSG_RESULT([no]) else AC_MSG_RESULT([yes]) @@ -406,7 +405,7 @@ AC_SUBST(GNT_LIBS) AC_SUBST(GNT_CFLAGS) -AM_CONDITIONAL(ENABLE_GNT, test "x$enable_console" = "xyes") +AM_CONDITIONAL(ENABLE_GNT, test "x$enable_consoleui" = "xyes") AC_CHECK_FUNC(wcwidth, [AC_DEFINE([HAVE_WCWIDTH], [1], [Define to 1 if you have wcwidth function.])]) @@ -763,18 +762,6 @@ AC_CHECK_HEADER(sys/utsname.h) AC_CHECK_FUNC(uname) -AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], - [compile with debugging support])], , enable_debug=no) -if test "x$enable_debug" = "xyes" ; then - AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.]) -fi - -AC_ARG_ENABLE(fatal-asserts, [AC_HELP_STRING([--enable-fatal-asserts], - [make assertions fatal (useful for debugging)])], , enable_fatal_asserts=no) -if test "x$enable_fatal_asserts" = "xyes" ; then - AC_DEFINE(GAIM_FATAL_ASSERTS, 1, [Define to make assertions fatal (useful for debugging).]) -fi - AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify], [compile without FORTIFY_SOURCE support])], , enable_fortify=yes) if test "x$GCC" = "xyes"; then @@ -1823,6 +1810,18 @@ AC_SUBST(enable_dot) AM_CONDITIONAL(HAVE_DOXYGEN, test "x$enable_doxygen" = "xyes") +AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], + [compile with debugging support])], , enable_debug=no) +if test "x$enable_debug" = "xyes" ; then + AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.]) +fi + +AC_ARG_ENABLE(fatal-asserts, [AC_HELP_STRING([--enable-fatal-asserts], + [make assertions fatal (useful for debugging)])], , enable_fatal_asserts=no) +if test "x$enable_fatal_asserts" = "xyes" ; then + AC_DEFINE(GAIM_FATAL_ASSERTS, 1, [Define to make assertions fatal (useful for debugging).]) +fi + AC_CONFIG_COMMANDS_PRE([ if test -e VERSION; then cp -p VERSION VERSION.ac-save @@ -1898,7 +1897,7 @@ echo echo Build GTK+ 2.x UI............. : $enable_gtkui -echo Build console UI.............. : $enable_console +echo Build console UI.............. : $enable_consoleui echo echo Protocols to build dynamically : $DYNAMIC_PRPLS echo Protocols to link statically.. : $STATIC_PRPLS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ev...@us...> - 2006-09-08 01:34:54
|
Revision: 17187 http://svn.sourceforge.net/gaim/?rev=17187&view=rev Author: evands Date: 2006-09-07 18:34:46 -0700 (Thu, 07 Sep 2006) Log Message: ----------- At least one place (oscar.c:2294) uses the HAVE_TM_GMTOFF definition, but it was always undefined because the configure.ac did nothing about it. We now check for the tm_gmtoff member of struct tm and set the define appropriately. The block added to configure.ac was taken from KDE Kopete's configure.ac. This was particularly a problem for me because while OS X has timezone such that HAVE_TIMEZONE is defined, it's also a function, char * timezone(int zone, int dst), which wrecks havoc. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-09-07 23:26:55 UTC (rev 17186) +++ trunk/configure.ac 2006-09-08 01:34:46 UTC (rev 17187) @@ -1771,6 +1771,17 @@ AC_CHECK_HEADERS(termios.h) AC_VAR_TIMEZONE_EXTERNALS +AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff, + AC_TRY_COMPILE([ + #include <time.h> + ], [ + struct tm tm; + tm.tm_gmtoff = 1; + ], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)) +if test $ac_cv_struct_tm_gmtoff = yes; then + AC_DEFINE(HAVE_TM_GMTOFF, 1, [Define if you have a tm_gmtoff member in struct tm]) +fi + dnl ####################################################################### dnl # Check for Doxygen and dot (part of GraphViz) dnl ####################################################################### This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nos...@us...> - 2006-09-15 02:05:30
|
Revision: 17282 http://svn.sourceforge.net/gaim/?rev=17282&view=rev Author: nosnilmot Date: 2006-09-14 19:05:23 -0700 (Thu, 14 Sep 2006) Log Message: ----------- Sometimes the order in which things happen is quite important. In this case the chicken quite definitely came before the egg. Also make the libxml2 check explicit to what minimum version we need. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-09-15 01:21:53 UTC (rev 17281) +++ trunk/configure.ac 2006-09-15 02:05:23 UTC (rev 17282) @@ -207,6 +207,22 @@ [compile without Contact Availability Prediction plugin])], enable_cap="no", enable_cap="yes") + +AC_PATH_XTRA +# We can't assume that $x_libraries will be set, because autoconf does not +# set it in the case when the X libraries are in a standard place. +# Ditto for $x_includes +if test X"$x_libraries" = X"" || test X"$x_libraries" = XNONE; then + x_libpath_add= +else + x_libpath_add="-L$x_libraries" +fi +if test X"$x_includes" = X"" || test X"$x_includes" = XNONE; then + x_incpath_add= +else + x_incpath_add="-I$x_includes" +fi + if test "x$enable_gtkui" = "xyes" ; then PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0.0], , [ AC_MSG_RESULT(no) @@ -413,11 +429,11 @@ dnl ####################################################################### dnl # Check for LibXML2 (required) dnl ####################################################################### -PKG_CHECK_MODULES(LIBXML, [libxml-2.0], , [ +PKG_CHECK_MODULES(LIBXML, [libxml-2.0 >= 2.6.0], , [ AC_MSG_RESULT(no) AC_MSG_ERROR([ -You must have the libxml2 development headers installed to build Gaim. +You must have libxml2 >= 2.6.0 development headers installed to build Gaim. ])]) AC_SUBST(LIBXML_CFLAGS) AC_SUBST(LIBXML_LIBS) @@ -851,21 +867,6 @@ AC_PATH_PROG(gaimpath, gaim) -AC_PATH_XTRA -# We can't assume that $x_libraries will be set, because autoconf does not -# set it in the case when the X libraries are in a standard place. -# Ditto for $x_includes -if test X"$x_libraries" = X"" || test X"$x_libraries" = XNONE; then - x_libpath_add= -else - x_libpath_add="-L$x_libraries" -fi -if test X"$x_includes" = X"" || test X"$x_includes" = XNONE; then - x_incpath_add= -else - x_incpath_add="-I$x_includes" -fi - dnl ####################################################################### dnl # Check for DBUS libraries dnl ####################################################################### This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nos...@us...> - 2006-10-01 15:16:26
|
Revision: 17417 http://svn.sourceforge.net/gaim/?rev=17417&view=rev Author: nosnilmot Date: 2006-10-01 08:16:21 -0700 (Sun, 01 Oct 2006) Log Message: ----------- Tidy the configure output if suitable sqlite3 is not found, and ensure cap is not built when not building gtk gaim Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-10-01 15:14:05 UTC (rev 17416) +++ trunk/configure.ac 2006-10-01 15:16:21 UTC (rev 17417) @@ -344,15 +344,19 @@ dnl # Check for libsqlite3 (for the Contact Availability Prediction plugin) dnl ####################################################################### if test "x$enable_cap" = "xyes"; then - PKG_CHECK_MODULES(SQLITE3, sqlite3 >= 3.3, , enable_cap="no") + PKG_CHECK_MODULES(SQLITE3, sqlite3 >= 3.3,,[ + AC_MSG_RESULT(no) + enable_cap="no" + ]) fi else # GTK + enable_cap=no + enable_gevolution=no + enable_gtkspell=no enable_screensaver=no enable_sm=no enable_startup_notification=no - enable_gtkspell=no - enable_gevolution=no fi # GTK AM_CONDITIONAL(ENABLE_GTK, test "x$enable_gtkui" = "xyes") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <amc...@us...> - 2006-10-08 09:47:28
|
Revision: 17449 http://svn.sourceforge.net/gaim/?rev=17449&view=rev Author: amc_grim Date: 2006-10-08 02:47:23 -0700 (Sun, 08 Oct 2006) Log Message: ----------- Patch from Kevin Stange to allow autogen/configure continue without libnm. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-10-08 08:40:09 UTC (rev 17448) +++ trunk/configure.ac 2006-10-08 09:47:23 UTC (rev 17449) @@ -889,9 +889,14 @@ ]) dnl Check for libnm_glib; if we don't have it, oh well + LIBNM_CFLAGS="" + LIBNM_LIBS="" PKG_CHECK_MODULES(LIBNM, libnm_glib, [ AC_DEFINE(HAVE_LIBNM, 1, [Check to see if we have NetworkManager]) + ], + [ + AC_MSG_RESULT(no) ]) AC_SUBST(LIBNM_CFLAGS) AC_SUBST(LIBNM_LIBS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |