← Back to branch summary

~ubuntu-dev/ubuntu/lucid/mpd/lucid-201002101903

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Porcheron
  • Date: 2009-01-01 19:42:24 UTC
  • mfrom: (1.1.9 upstream) (2.1.8 sid)
  • Revision ID: james.westby@ubuntu.com-20090101194224-hmi8pfu2vhwxkad0
Tags: 0.14-1ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
  - debian/mpd.init.d: read mpd user from mpd.conf (Forwarded to Debian, bug 504609)
  - debian/control: promote avahi-daemon from suggest to recommends

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
1
AC_PREREQ(2.60)
2
 
AC_INIT(mpd, 0.14~beta3, musicpd-dev-team@lists.sourceforge.net)
 
2
AC_INIT(mpd, 0.14, musicpd-dev-team@lists.sourceforge.net)
3
3
AC_CONFIG_SRCDIR([src/main.c])
4
4
AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2])
5
5
AM_CONFIG_HEADER(config.h)
94
94
        [enable_tcp=yes])
95
95
 
96
96
AC_ARG_ENABLE(un,
97
 
        AS_HELP_STRING([--enable-un],
98
 
                [enable support for clients connecting via unix domain sockets (default: disable)]),
 
97
        AS_HELP_STRING([--disable-un],
 
98
                [disable support for clients connecting via unix domain sockets (default: enable)]),
99
99
        [enable_un=$enableval],
100
100
        [enable_un=yes])
101
101
 
121
121
        enable_ao=$enableval,
122
122
        enable_ao=no)
123
123
 
124
 
AC_ARG_ENABLE(shout_ogg,
125
 
        AS_HELP_STRING([--disable-shout_ogg],
 
124
AC_ARG_ENABLE(shout-ogg,
 
125
        AS_HELP_STRING([--disable-shout-ogg],
126
126
                [disable support for ogg streaming through shout (default: enable)]),
127
127
        [enable_shout_ogg=$enableval],
128
128
        [enable_shout_ogg=yes])
129
129
 
130
 
AC_ARG_ENABLE(shout_mp3,
131
 
        AS_HELP_STRING([--disable-shout_mp3],
 
130
AC_ARG_ENABLE(shout-mp3,
 
131
        AS_HELP_STRING([--disable-shout-mp3],
132
132
                [disable support for mp3 streaming through shout (default: enable)]),
133
133
        [enable_shout_mp3=$enableval],
134
134
        [enable_shout_mp3=yes])
220
220
        AS_HELP_STRING([--enable-mod],
221
221
                [enable MOD support (default: disable)]),
222
222
        enable_mod=$enableval,
223
 
        enable_mod=yes)
 
223
        enable_mod=no)
224
224
 
225
225
AC_ARG_ENABLE(mpc,
226
226
        AS_HELP_STRING([--disable-mpc],
903
903
        MPD_CHECK_FLAG([-pedantic])
904
904
fi
905
905
 
906
 
 
907
 
dnl
908
 
dnl generate files
909
 
dnl
910
 
 
911
 
 
912
 
AC_OUTPUT(doc/Makefile src/Makefile Makefile)
913
 
 
914
 
 
915
906
dnl
916
907
dnl pretty-print result
917
908
dnl
1151
1142
        echo " HTTP streaming (libcurl) ......disabled"
1152
1143
fi
1153
1144
 
1154
 
 
1155
1145
echo ""
1156
1146
echo "##########################################"
1157
1147
echo ""
 
1148
 
 
1149
echo "Generating needed files for compilation"
 
1150
echo ""
 
1151
 
 
1152
dnl
 
1153
dnl generate files
 
1154
dnl
 
1155
 
 
1156
AC_OUTPUT(doc/Makefile src/Makefile Makefile)
 
1157
 
 
1158
echo ""
 
1159
 
1158
1160
echo "You are now ready to compile MPD"
1159
1161
echo "Type \"make\" to compile MPD"