Mercurial > pidgin.yaz
comparison configure.ac @ 18878:eeaf5afc8940
propagate from branch 'im.pidgin.pidgin' (head 128e100bae27b44dc77c5db5be0151b0fceaea8f)
to branch 'im.pidgin.soc.2007.msimprpl' (head 60fde40ff442f10e3f22d9f7bb0835beef9aac88)
author | Jeffrey Connelly <jaconnel@calpoly.edu> |
---|---|
date | Mon, 06 Aug 2007 04:04:23 +0000 |
parents | 1244b5f43661 9a1c7a566d7c |
children | 829b00936eef |
comparison
equal
deleted
inserted
replaced
18811:b68ced0ab472 | 18878:eeaf5afc8940 |
---|---|
856 if test "x$STATIC_PRPLS" != "x" -a "x$DYNAMIC_PRPLS" = "xall"; then | 856 if test "x$STATIC_PRPLS" != "x" -a "x$DYNAMIC_PRPLS" = "xall"; then |
857 DYNAMIC_PRPLS="" | 857 DYNAMIC_PRPLS="" |
858 fi | 858 fi |
859 | 859 |
860 if test "x$STATIC_PRPLS" = "xall" ; then | 860 if test "x$STATIC_PRPLS" = "xall" ; then |
861 STATIC_PRPLS="bonjour gg irc jabber msn novell oscar qq sametime silc simple yahoo zephyr" | 861 STATIC_PRPLS="bonjour gg irc jabber msn myspace novell oscar qq sametime silc simple yahoo zephyr" |
862 fi | 862 fi |
863 if test "x$have_meanwhile" != "xyes" ; then | 863 if test "x$have_meanwhile" != "xyes" ; then |
864 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'` | 864 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'` |
865 fi | 865 fi |
866 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then | 866 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then |
902 bonjour) static_bonjour=yes ;; | 902 bonjour) static_bonjour=yes ;; |
903 gg) static_gg=yes ;; | 903 gg) static_gg=yes ;; |
904 irc) static_irc=yes ;; | 904 irc) static_irc=yes ;; |
905 jabber) static_jabber=yes ;; | 905 jabber) static_jabber=yes ;; |
906 msn) static_msn=yes ;; | 906 msn) static_msn=yes ;; |
907 myspace) static_myspace=yes ;; | |
907 novell) static_novell=yes ;; | 908 novell) static_novell=yes ;; |
908 oscar) static_oscar=yes ;; | 909 oscar) static_oscar=yes ;; |
909 aim) static_oscar=yes ;; | 910 aim) static_oscar=yes ;; |
910 icq) static_oscar=yes ;; | 911 icq) static_oscar=yes ;; |
911 qq) static_qq=yes ;; | 912 qq) static_qq=yes ;; |
922 AM_CONDITIONAL(STATIC_BONJOUR, test "x$static_bonjour" = "xyes") | 923 AM_CONDITIONAL(STATIC_BONJOUR, test "x$static_bonjour" = "xyes") |
923 AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes") | 924 AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes") |
924 AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes") | 925 AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes") |
925 AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes") | 926 AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes") |
926 AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes") | 927 AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes") |
928 AM_CONDITIONAL(STATIC_MYSPACE, test "x$static_myspace" = "xyes") | |
927 AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes") | 929 AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes") |
928 AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes") | 930 AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes") |
929 AM_CONDITIONAL(STATIC_QQ, test "x$static_qq" = "xyes") | 931 AM_CONDITIONAL(STATIC_QQ, test "x$static_qq" = "xyes") |
930 AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes") | 932 AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes") |
931 AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes") | 933 AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes") |
937 AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init() { $load_proto }, | 939 AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init() { $load_proto }, |
938 [Loads static protocol plugin module initialization functions.]) | 940 [Loads static protocol plugin module initialization functions.]) |
939 | 941 |
940 AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`]) | 942 AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`]) |
941 if test "x$DYNAMIC_PRPLS" = "xall" ; then | 943 if test "x$DYNAMIC_PRPLS" = "xall" ; then |
942 DYNAMIC_PRPLS="bonjour gg irc jabber msn novell oscar qq sametime silc simple yahoo zephyr" | 944 DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace novell oscar qq sametime silc simple yahoo zephyr" |
943 fi | 945 fi |
944 if test "x$have_meanwhile" != "xyes"; then | 946 if test "x$have_meanwhile" != "xyes"; then |
945 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'` | 947 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'` |
946 fi | 948 fi |
947 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then | 949 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then |
961 bonjour) dynamic_bonjour=yes ;; | 963 bonjour) dynamic_bonjour=yes ;; |
962 gg) dynamic_gg=yes ;; | 964 gg) dynamic_gg=yes ;; |
963 irc) dynamic_irc=yes ;; | 965 irc) dynamic_irc=yes ;; |
964 jabber) dynamic_jabber=yes ;; | 966 jabber) dynamic_jabber=yes ;; |
965 msn) dynamic_msn=yes ;; | 967 msn) dynamic_msn=yes ;; |
968 myspace) dynamic_myspace=yes ;; | |
966 novell) dynamic_novell=yes ;; | 969 novell) dynamic_novell=yes ;; |
967 oscar) dynamic_oscar=yes ;; | 970 oscar) dynamic_oscar=yes ;; |
968 aim) dynamic_oscar=yes ;; | 971 aim) dynamic_oscar=yes ;; |
969 icq) dynamic_oscar=yes ;; | 972 icq) dynamic_oscar=yes ;; |
970 qq) dynamic_qq=yes ;; | 973 qq) dynamic_qq=yes ;; |
981 AM_CONDITIONAL(DYNAMIC_BONJOUR, test "x$dynamic_bonjour" = "xyes" -a [ [ "x$avahiincludes" = "xyes" -a "x$avahilibs " = "xyes" ] -o [ "x$howlincludes" = "xyes" -a "x$howllibs" = "xyes" ] ] ) | 984 AM_CONDITIONAL(DYNAMIC_BONJOUR, test "x$dynamic_bonjour" = "xyes" -a [ [ "x$avahiincludes" = "xyes" -a "x$avahilibs " = "xyes" ] -o [ "x$howlincludes" = "xyes" -a "x$howllibs" = "xyes" ] ] ) |
982 AM_CONDITIONAL(DYNAMIC_GG, test "x$dynamic_gg" = "xyes") | 985 AM_CONDITIONAL(DYNAMIC_GG, test "x$dynamic_gg" = "xyes") |
983 AM_CONDITIONAL(DYNAMIC_IRC, test "x$dynamic_irc" = "xyes") | 986 AM_CONDITIONAL(DYNAMIC_IRC, test "x$dynamic_irc" = "xyes") |
984 AM_CONDITIONAL(DYNAMIC_JABBER, test "x$dynamic_jabber" = "xyes") | 987 AM_CONDITIONAL(DYNAMIC_JABBER, test "x$dynamic_jabber" = "xyes") |
985 AM_CONDITIONAL(DYNAMIC_MSN, test "x$dynamic_msn" = "xyes") | 988 AM_CONDITIONAL(DYNAMIC_MSN, test "x$dynamic_msn" = "xyes") |
989 AM_CONDITIONAL(DYNAMIC_MYSPACE, test "x$dynamic_myspace" = "xyes") | |
986 AM_CONDITIONAL(DYNAMIC_NOVELL, test "x$dynamic_novell" = "xyes") | 990 AM_CONDITIONAL(DYNAMIC_NOVELL, test "x$dynamic_novell" = "xyes") |
987 AM_CONDITIONAL(DYNAMIC_OSCAR, test "x$dynamic_oscar" = "xyes") | 991 AM_CONDITIONAL(DYNAMIC_OSCAR, test "x$dynamic_oscar" = "xyes") |
988 AM_CONDITIONAL(DYNAMIC_QQ, test "x$dynamic_qq" = "xyes") | 992 AM_CONDITIONAL(DYNAMIC_QQ, test "x$dynamic_qq" = "xyes") |
989 AM_CONDITIONAL(DYNAMIC_SAMETIME, test "x$dynamic_sametime" = "xyes" -a "x$have_meanwhile" = "xyes") | 993 AM_CONDITIONAL(DYNAMIC_SAMETIME, test "x$dynamic_sametime" = "xyes" -a "x$have_meanwhile" = "xyes") |
990 AM_CONDITIONAL(DYNAMIC_SILC, test "x$dynamic_silc" = "xyes" -a "x$have_silc" = "xyes") | 994 AM_CONDITIONAL(DYNAMIC_SILC, test "x$dynamic_silc" = "xyes" -a "x$have_silc" = "xyes") |
2182 libpurple/protocols/bonjour/Makefile | 2186 libpurple/protocols/bonjour/Makefile |
2183 libpurple/protocols/gg/Makefile | 2187 libpurple/protocols/gg/Makefile |
2184 libpurple/protocols/irc/Makefile | 2188 libpurple/protocols/irc/Makefile |
2185 libpurple/protocols/jabber/Makefile | 2189 libpurple/protocols/jabber/Makefile |
2186 libpurple/protocols/msn/Makefile | 2190 libpurple/protocols/msn/Makefile |
2191 libpurple/protocols/myspace/Makefile | |
2187 libpurple/protocols/novell/Makefile | 2192 libpurple/protocols/novell/Makefile |
2188 libpurple/protocols/null/Makefile | 2193 libpurple/protocols/null/Makefile |
2189 libpurple/protocols/oscar/Makefile | 2194 libpurple/protocols/oscar/Makefile |
2190 libpurple/protocols/qq/Makefile | 2195 libpurple/protocols/qq/Makefile |
2191 libpurple/protocols/sametime/Makefile | 2196 libpurple/protocols/sametime/Makefile |