diff options
| author |  waker <wakeroid@gmail.com> | 2012-10-09 21:49:33 +0200 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2012-10-09 21:49:33 +0200 |
| commit | c82ab50a979fa328b4f59fbcdace66a4a708ff46 (patch) | |
| tree | a2463864b29bc9bb08a7c9268c00410cfc814214 /configure.ac | |
| parent | aa6117ca31c934e443b60c5070107b15eaf358e1 (diff) | |
fixed gtk2/3 configure options -- now there's no --disable/enable-gtkui, only --disable/enable-gtk2 and -gtk3.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 890a6a80..acefaac5 100644 --- a/configure.ac +++ b/configure.ac @@ -70,7 +70,6 @@ AC_ARG_ENABLE(nullout, [AS_HELP_STRING([--disable-nullout ], [disable NULL outp AC_ARG_ENABLE(alsa, [AS_HELP_STRING([--disable-alsa ], [disable ALSA output plugin (default: enabled)])], [enable_alsa=$enableval], [enable_alsa=yes]) AC_ARG_ENABLE(oss, [AS_HELP_STRING([--disable-oss ], [disable Open Sound System output plugin (default: enabled)])], [enable_oss=$enableval], [enable_oss=yes]) AC_ARG_ENABLE(pulse, [AS_HELP_STRING([--disable-pulse ], [disable PulseAudio output plugin (default: enabled)])], [enable_pulse=$enableval], [enable_pulse=yes]) -AC_ARG_ENABLE(gtkui, [AS_HELP_STRING([--disable-gtkui ], [disable standard GTK+ user interface plugin (default: enabled)])], [enable_gtkui=$enableval], [enable_gtkui=yes]) AC_ARG_ENABLE(gtk3, [AS_HELP_STRING([--enable-gtk3 ], [build GTK3 version of gtkui plugin (default: enabled)])], [enable_gtk3=$enableval], [enable_gtk3=yes]) AC_ARG_ENABLE(gtk2, [AS_HELP_STRING([--disable-gtk2 ], [build GTK2 version of gtkui plugin (default: enabled)])], [enable_gtk2=$enableval], [enable_gtk2=yes]) AC_ARG_ENABLE(vfs_curl, [AS_HELP_STRING([--disable-vfs-curl], [disable HTTP streaming vfs plugin (default: enabled)])], [enable_vfs_curl=$enableval], [enable_vfs_curl=yes]) @@ -357,10 +356,8 @@ fi fi dnl gtkui plugin -if test "x$enable_gtkui" != "xno" ; then - if test "x$HAVE_GTK2" == "xyes" || test "x$HAVE_GTK3" == "xyes" ; then - HAVE_GTKUI=yes - fi +if test "x$HAVE_GTK2" == "xyes" || test "x$HAVE_GTK3" == "xyes" ; then + HAVE_GTKUI=yes fi if test "x$enable_alsa" != "xno" ; then @@ -608,7 +605,6 @@ AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLACPLUGIN" = "xyes") AM_CONDITIONAL(HAVE_WAVPACK, test "x$HAVE_WAVPACKPLUGIN" = "xyes") AM_CONDITIONAL(HAVE_SNDFILE, test "x$HAVE_SNDFILEPLUGIN" = "xyes") AM_CONDITIONAL(HAVE_CDDA, test "x$HAVE_CDDAPLUGIN" = "xyes") -AM_CONDITIONAL(HAVE_GTKUI, test "x$HAVE_GTKUI" = "xyes") AM_CONDITIONAL(HAVE_GTK2, test "x$HAVE_GTK2" = "xyes") AM_CONDITIONAL(HAVE_GTK3, test "x$HAVE_GTK3" = "xyes") AM_CONDITIONAL(HAVE_ALSA, test "x$HAVE_ALSAPLUGIN" = "xyes") |