Mercurial > pidgin

comparison configure.ac @ 15572:8eaa1f23443b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '017eca04bf34860761af5c6fe3ff1c1ea28f0fc3' and '01871e9d112ea919162917990541a5fe9132611d'
author Sean Egan <seanegan@gmail.com>
date Mon, 05 Feb 2007 12:13:45 +0000
parents 442128853bdb 01c293ca8196
children 023030b74a15
comparison
equal deleted inserted replaced
15559:442128853bdb 15572:8eaa1f23443b
887 AC_SUBST(CFLAGS) 887 AC_SUBST(CFLAGS)
888 888
889 AC_PATH_PROG(gaimpath, gaim) 889 AC_PATH_PROG(gaimpath, gaim)
890 890
891 dnl ####################################################################### 891 dnl #######################################################################
892 dnl # Check for DBUS libraries 892 dnl # Check for D-Bus libraries
893 dnl ####################################################################### 893 dnl #######################################################################
894 894
895 AC_ARG_ENABLE(dbus, [AC_HELP_STRING([--enable-dbus], [enable DBUS support])], , enable_dbus=yes) 895 AC_ARG_ENABLE(dbus, [AC_HELP_STRING([--enable-dbus], [enable D-Bus support])], , enable_dbus=yes)
896 AC_ARG_ENABLE(nm, [AC_HELP_STRING([--enable-nm], [enable NetworkManager support (buggy) (requires D-Bus)])], enable_libnm=yes, enable_libnm=no)
896 897
897 if test "x$enable_dbus" = "xyes" ; then 898 if test "x$enable_dbus" = "xyes" ; then
898 AC_CHECK_PROG(enable_dbus, dbus-binding-tool, yes, no) 899 AC_CHECK_PROG(enable_dbus, dbus-binding-tool, yes, no)
899 fi 900 fi
900 901
906 ], [ 907 ], [
907 AC_MSG_RESULT(no) 908 AC_MSG_RESULT(no)
908 enable_dbus=no 909 enable_dbus=no
909 ]) 910 ])
910 911
911 dnl Check for libnm_glib; if we don't have it, oh well 912 dnl Check for libnm_glib; if we don't have it, oh well
912 LIBNM_CFLAGS="" 913 if test "x$enable_libnm" = "xyes" ; then
913 LIBNM_LIBS="" 914 LIBNM_CFLAGS=""
914 PKG_CHECK_MODULES(LIBNM, libnm_glib, 915 LIBNM_LIBS=""
915 [ 916 PKG_CHECK_MODULES(LIBNM, libnm_glib,
916 AC_DEFINE(HAVE_LIBNM, 1, [Check to see if we have NetworkManager]) 917 [
917 ], 918 AC_DEFINE(HAVE_LIBNM, 1, [Check to see if we have NetworkManager])
918 [ 919 enable_libnm=yes
919 AC_MSG_RESULT(no) 920 ],
920 ]) 921 [
921 AC_SUBST(LIBNM_CFLAGS) 922 AC_MSG_RESULT(no)
922 AC_SUBST(LIBNM_LIBS) 923 enable_libnm=no
924 ])
925 AC_SUBST(LIBNM_CFLAGS)
926 AC_SUBST(LIBNM_LIBS)
927 fi
928 else
929 enable_libnm=no
923 fi 930 fi
924 931
925 dnl ####################################################################### 932 dnl #######################################################################
926 dnl # Check for Python 933 dnl # Check for Python
927 dnl ####################################################################### 934 dnl #######################################################################
928 935
929 dnl Python scripts are used to auto-generate about 3000 lines of C 936 dnl Python scripts are used to auto-generate about 3000 lines of C
930 dnl and XML code that wraps (part of) the existing Gaim API so that 937 dnl and XML code that wraps (part of) the existing Gaim API so that
931 dnl it is now accessible through DBUS. 938 dnl it is now accessible through D-Bus.
932 939
933 dnl Python is only required if --enable-dbus is used, and only for 940 dnl Python is only required if --enable-dbus is used, and only for
934 dnl the build process to generate the code, not for running gaim. 941 dnl the build process to generate the code, not for running gaim.
935 dnl This autogenerated code is system-independent, so in principle we 942 dnl This autogenerated code is system-independent, so in principle we
936 dnl can generate all of it before shipping. But I thought adding 943 dnl can generate all of it before shipping. But I thought adding
1009 else 1016 else
1010 DBUS_SERVICES_DIR="$datadir/dbus-1/services" 1017 DBUS_SERVICES_DIR="$datadir/dbus-1/services"
1011 fi 1018 fi
1012 fi 1019 fi
1013 AC_MSG_RESULT([$DBUS_SERVICES_DIR]) 1020 AC_MSG_RESULT([$DBUS_SERVICES_DIR])
1014 AC_DEFINE(HAVE_DBUS, 1, [Define if we are re using DBUS.]) 1021 AC_DEFINE(HAVE_DBUS, 1, [Define if we are re using D-Bus.])
1015 fi 1022 fi
1016 AC_SUBST(DBUS_SERVICES_DIR) 1023 AC_SUBST(DBUS_SERVICES_DIR)
1017 1024
1018 if test "x$enable_dbus" = "xyes" ; then 1025 if test "x$enable_dbus" = "xyes" ; then
1019 echo "Building with DBUS support" 1026 echo "Building with D-Bus support"
1020 else 1027 else
1021 echo "Building without DBUS support" 1028 echo "Building without D-Bus support"
1022 fi 1029 fi
1023 1030
1024 AM_CONDITIONAL(ENABLE_DBUS, test "x$enable_dbus" = "xyes") 1031 AM_CONDITIONAL(ENABLE_DBUS, test "x$enable_dbus" = "xyes")
1025 1032
1026 dnl ####################################################################### 1033 dnl #######################################################################
1888 AC_OUTPUT([Makefile 1895 AC_OUTPUT([Makefile
1889 Doxyfile 1896 Doxyfile
1890 gaim.apspec 1897 gaim.apspec
1891 gaim.service 1898 gaim.service
1892 doc/Makefile 1899 doc/Makefile
1893 doc/gaim.1 1900 doc/pidgin.1
1894 doc/gaim-text.1 1901 doc/gaim-text.1
1895 m4macros/Makefile 1902 m4macros/Makefile
1896 pidgin/Makefile 1903 pidgin/Makefile
1897 pidgin/pixmaps/Makefile 1904 pidgin/pixmaps/Makefile
1898 pidgin/pixmaps/animations/Makefile 1905 pidgin/pixmaps/animations/Makefile
1983 echo 1990 echo
1984 echo Protocols to build dynamically : $DYNAMIC_PRPLS 1991 echo Protocols to build dynamically : $DYNAMIC_PRPLS
1985 echo Protocols to link statically.. : $STATIC_PRPLS 1992 echo Protocols to link statically.. : $STATIC_PRPLS
1986 echo 1993 echo
1987 echo Build with GStreamer support.. : $enable_gst 1994 echo Build with GStreamer support.. : $enable_gst
1988 echo Build with DBUS support....... : $enable_dbus 1995 echo Build with D-Bus support...... : $enable_dbus
1989 if test "x$enable_dbus" = "xyes" ; then 1996 if test "x$enable_dbus" = "xyes" ; then
1990 eval eval echo DBUS services directory....... : $DBUS_SERVICES_DIR 1997 eval eval echo D-Bus services directory...... : $DBUS_SERVICES_DIR
1991 fi 1998 fi
1999 echo Build with NetworkManager..... : $enable_libnm
1992 echo SSL Library/Libraries......... : $msg_ssl 2000 echo SSL Library/Libraries......... : $msg_ssl
1993 echo Build with Cyrus SASL support. : $enable_cyrus_sasl 2001 echo Build with Cyrus SASL support. : $enable_cyrus_sasl
1994 echo Use kerberos 4 with zephyr.... : $kerberos 2002 echo Use kerberos 4 with zephyr.... : $kerberos
1995 echo Use external libzephyr........ : $zephyr 2003 echo Use external libzephyr........ : $zephyr
1996 echo Has you....................... : yes 2004 echo Has you....................... : yes