Mercurial > pidgin

comparison configure.ac @ 15806:0e54e4a48769

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor cleanups, and make 'make check' work with older versions of Check
author Stu Tomlinson <stu@nosnilmot.com>
date Sat, 17 Mar 2007 17:31:06 +0000
parents 79144a15ea78
children d8f98ce1cef0
comparison
equal deleted inserted replaced
15805:a0a5e323a6ac 15806:0e54e4a48769
414 414
415 if test x"$found_ncurses_h" = x"no" ; then 415 if test x"$found_ncurses_h" = x"no" ; then
416 GNT_LIBS="" 416 GNT_LIBS=""
417 GNT_CFLAGS="" 417 GNT_CFLAGS=""
418 enable_consoleui=no 418 enable_consoleui=no
419 AC_MSG_RESULT([no])
420 else
421 AC_MSG_RESULT([yes])
422 fi 419 fi
423 else 420 else
424 # ncursesw was not found. Look for plain old ncurses 421 # ncursesw was not found. Look for plain old ncurses
425 enable_consoleui=yes 422 enable_consoleui=yes
426 AC_CHECK_LIB(ncurses, initscr, [GNT_LIBS="-lncurses"], [enable_consoleui=no]) 423 AC_CHECK_LIB(ncurses, initscr, [GNT_LIBS="-lncurses"], [enable_consoleui=no])
719 msn) static_msn=yes ;; 716 msn) static_msn=yes ;;
720 novell) static_novell=yes ;; 717 novell) static_novell=yes ;;
721 oscar) static_oscar=yes ;; 718 oscar) static_oscar=yes ;;
722 aim) static_oscar=yes ;; 719 aim) static_oscar=yes ;;
723 icq) static_oscar=yes ;; 720 icq) static_oscar=yes ;;
724 qq) static_qq=yes ;; 721 qq) static_qq=yes ;;
725 sametime) static_sametime=yes ;; 722 sametime) static_sametime=yes ;;
726 silc) static_silc=yes ;; 723 silc) static_silc=yes ;;
727 simple) static_simple=yes ;; 724 simple) static_simple=yes ;;
728 toc) static_toc=yes ;; 725 toc) static_toc=yes ;;
729 yahoo) static_yahoo=yes ;; 726 yahoo) static_yahoo=yes ;;
772 msn) dynamic_msn=yes ;; 769 msn) dynamic_msn=yes ;;
773 novell) dynamic_novell=yes ;; 770 novell) dynamic_novell=yes ;;
774 oscar) dynamic_oscar=yes ;; 771 oscar) dynamic_oscar=yes ;;
775 aim) dynamic_oscar=yes ;; 772 aim) dynamic_oscar=yes ;;
776 icq) dynamic_oscar=yes ;; 773 icq) dynamic_oscar=yes ;;
777 qq) dynamic_qq=yes ;; 774 qq) dynamic_qq=yes ;;
778 sametime) dynamic_sametime=yes ;; 775 sametime) dynamic_sametime=yes ;;
779 silc) dynamic_silc=yes ;; 776 silc) dynamic_silc=yes ;;
780 simple) dynamic_simple=yes ;; 777 simple) dynamic_simple=yes ;;
781 toc) dynamic_toc=yes ;; 778 toc) dynamic_toc=yes ;;
782 yahoo) dynamic_yahoo=yes ;; 779 yahoo) dynamic_yahoo=yes ;;
823 dnl This leads to spurious warnings using GPOINTER_TO_INT(), et al. directly on a function call. 820 dnl This leads to spurious warnings using GPOINTER_TO_INT(), et al. directly on a function call.
824 dnl We'd need an intermediate variable. 821 dnl We'd need an intermediate variable.
825 dnl 822 dnl
826 dnl Consider adding -Wfloat-equal. 823 dnl Consider adding -Wfloat-equal.
827 dnl This leads to warnings with Perl. 824 dnl This leads to warnings with Perl.
828 dnl Perhaps we could write ugly configure magic and pass -Wno-float-equal down to that subdirectory. 825 dnl Perhaps we could write ugly configure magic and pass -Wno-float-equal down to that subdirectory.
829 dnl On the other hand, it's probably actually broken, so maybe the Perl folks should fix that? 826 dnl On the other hand, it's probably actually broken, so maybe the Perl folks should fix that?
830 dnl 827 dnl
831 dnl Consider removing -Wno-sign-compare (from the -Wextra set) and fixing all those cases. 828 dnl Consider removing -Wno-sign-compare (from the -Wextra set) and fixing all those cases.
832 dnl This is likely non-trivial. 829 dnl This is likely non-trivial.
833 dnl 830 dnl
913 if test "x$enable_libnm" = "xyes" ; then 910 if test "x$enable_libnm" = "xyes" ; then
914 LIBNM_CFLAGS="" 911 LIBNM_CFLAGS=""
915 LIBNM_LIBS="" 912 LIBNM_LIBS=""
916 PKG_CHECK_MODULES(LIBNM, libnm_glib, 913 PKG_CHECK_MODULES(LIBNM, libnm_glib,
917 [ 914 [
918 AC_DEFINE(HAVE_LIBNM, 1, [Check to see if we have NetworkManager]) 915 AC_DEFINE(HAVE_LIBNM, 1, [Define if you have NetworkManager])
919 enable_libnm=yes 916 enable_libnm=yes
920 ], 917 ],
921 [ 918 [
922 AC_MSG_RESULT(no) 919 AC_MSG_RESULT(no)
923 enable_libnm=no 920 enable_libnm=no
1016 else 1013 else
1017 DBUS_SERVICES_DIR="$datadir/dbus-1/services" 1014 DBUS_SERVICES_DIR="$datadir/dbus-1/services"
1018 fi 1015 fi
1019 fi 1016 fi
1020 AC_MSG_RESULT([$DBUS_SERVICES_DIR]) 1017 AC_MSG_RESULT([$DBUS_SERVICES_DIR])
1021 AC_DEFINE(HAVE_DBUS, 1, [Define if we are re using D-Bus.]) 1018 AC_DEFINE(HAVE_DBUS, 1, [Define if we are using D-Bus.])
1022 fi 1019 fi
1023 AC_SUBST(DBUS_SERVICES_DIR) 1020 AC_SUBST(DBUS_SERVICES_DIR)
1024 1021
1025 if test "x$enable_dbus" = "xyes" ; then 1022 if test "x$enable_dbus" = "xyes" ; then
1026 echo "Building with D-Bus support" 1023 echo "Building with D-Bus support"
1033 dnl ####################################################################### 1030 dnl #######################################################################
1034 dnl # Check for Mono support 1031 dnl # Check for Mono support
1035 dnl ####################################################################### 1032 dnl #######################################################################
1036 AC_ARG_ENABLE(mono, [AC_HELP_STRING([--enable-mono], [compile with Mono runtime support (experimental)])], , enable_mono=no) 1033 AC_ARG_ENABLE(mono, [AC_HELP_STRING([--enable-mono], [compile with Mono runtime support (experimental)])], , enable_mono=no)
1037 if test x"$enable_mono" = x"yes" ; then 1034 if test x"$enable_mono" = x"yes" ; then
1038 AC_MSG_CHECKING(for Mono compile flags) 1035 PKG_CHECK_MODULES(MONO, mono, [
1039 MONO_CFLAGS=`pkg-config --cflags mono 2> /dev/null` 1036 AC_SUBST(MONO_CFLAGS)
1040 if test $? != 0 ; then 1037 AC_SUBST(MONO_LIBS)
1041 AC_MSG_RESULT([not found, building without mono.]) 1038 enable_mono=yes
1042 MONO_CFLAGS= 1039 ], [
1043 MONO_LIBS= 1040 AC_MSG_RESULT(no)
1044 enable_mono=no 1041 enable_mono=no
1045 else 1042 ])
1046 MONO_LIBS=`pkg-config --libs mono 2> /dev/null` 1043 if test x"$enable_mono" = x"yes"; then
1047 AC_MSG_RESULT(ok)
1048
1049 oldLIBS="$LIBS" 1044 oldLIBS="$LIBS"
1050 LIBS="$LIBS $MONO_LIBS" 1045 LIBS="$LIBS $MONO_LIBS"
1051 AC_MSG_CHECKING(for libmono) 1046 AC_MSG_CHECKING(for libmono)
1052 AC_CHECK_FUNCS(mono_jit_init, [], enable_mono=no) 1047 AC_CHECK_FUNCS(mono_jit_init, [], enable_mono=no)
1053 LIBS="$oldLIBS" 1048 LIBS="$oldLIBS"
1252 1247
1253 if test "x$gnutls_includes" != "xno" -a \ 1248 if test "x$gnutls_includes" != "xno" -a \
1254 "x$gnutls_includes" != "x"; then 1249 "x$gnutls_includes" != "x"; then
1255 have_gnutls_includes="yes" 1250 have_gnutls_includes="yes"
1256 1251
1257 GNUTLS_CFLAGS="-I$with_gnutls_includes" 1252 if test "x$with_gnutls_includes" != "xNONE/include"; then
1253 GNUTLS_CFLAGS="-I$with_gnutls_includes"
1254 fi
1258 else 1255 else
1259 GNUTLS_CFLAGS="" 1256 GNUTLS_CFLAGS=""
1260 fi 1257 fi
1261 else 1258 else
1262 AC_MSG_CHECKING(for GnuTLS includes) 1259 AC_MSG_CHECKING(for GnuTLS includes)
1834 fi 1831 fi
1835 1832
1836 dnl ####################################################################### 1833 dnl #######################################################################
1837 dnl # Check for check 1834 dnl # Check for check
1838 dnl ####################################################################### 1835 dnl #######################################################################
1839 PKG_CHECK_MODULES(CHECK, check >= 0.9.4, have_check=yes, have_check=no) 1836 PKG_CHECK_MODULES(CHECK,[check >= 0.9.4],:,[
1840 AM_CONDITIONAL(HAVE_CHECK, test "x$have_check" = "xyes") 1837 ifdef([AM_PATH_CHECK],
1838 [AM_PATH_CHECK],
1839 [AC_MSG_RESULT([no, testing is disabled])])
1840 ])
1841 AM_CONDITIONAL(HAVE_CHECK, [test "x$CHECK_LIBS" != "x"])
1841 AC_SUBST(CHECK_CFLAGS) 1842 AC_SUBST(CHECK_CFLAGS)
1842 AC_SUBST(CHECK_LIBS) 1843 AC_SUBST(CHECK_LIBS)
1843 1844
1844 dnl ####################################################################### 1845 dnl #######################################################################
1845 dnl # Check for Doxygen and dot (part of GraphViz) 1846 dnl # Check for Doxygen and dot (part of GraphViz)