Changeset 5839:bb64c0dfed90 in roaraudio

Timestamp:

01/07/13 02:55:19 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make use of #ifdef so we do not end up on usage of undefined macros

File:

• libroar/config.c (modified) (1 diff)

libroar/config.c

@@ -492 +492 @@
 
  // bins:
+#ifdef ROAR_HAVE_BIN_SH
  {"bin-sh",             ROAR_HAVE_BIN_SH, 0, 0},
+#endif
+#ifdef ROAR_HAVE_BIN_OGG123
  {"bin-ogg123",         ROAR_HAVE_BIN_OGG123, 0, 0},
+#endif
+#ifdef ROAR_HAVE_BIN_FLAC
  {"bin-flac",           ROAR_HAVE_BIN_FLAC, 0, 0},
+#endif
+#ifdef ROAR_HAVE_BIN_TIMIDITY
  {"bin-timidity",       ROAR_HAVE_BIN_TIMIDITY, 0, 0},
+#endif
+#ifdef ROAR_HAVE_BIN_CDPARANOIA
  {"bin-cdparanoia",     ROAR_HAVE_BIN_CDPARANOIA, 0, 0},
+#endif
+#ifdef ROAR_HAVE_BIN_GNUPLOT
  {"bin-gnuplot",        ROAR_HAVE_BIN_GNUPLOT, 0, 0},
+#endif
+#ifdef ROAR_HAVE_BIN_SSH
  {"bin-ssh",            ROAR_HAVE_BIN_SSH, 0, 0},
+#endif
+#ifdef ROAR_HAVE_BIN_PINENTRY
  {"bin-pinentry",       ROAR_HAVE_BIN_PINENTRY, 0, 0},
- {"bin-ssh_askpass",    ROAR_HAVE_BIN_SSH_ASKPASS, 0, 0},
+#endif
+#ifdef ROAR_HAVE_BIN_SSH_ASKPASS
+ {"bin-ssh-askpass",    ROAR_HAVE_BIN_SSH_ASKPASS, 0, 0},
+#endif
+#ifdef ROAR_HAVE_BIN_GTK_LED_ASKPASS
  {"bin-gtk-led-askpass", ROAR_HAVE_BIN_GTK_LED_ASKPASS, 0, 0},
+#endif
+#ifdef ROAR_HAVE_BIN_X11_SSH_ASKPASS
  {"bin-x11-ssh-askpass", ROAR_HAVE_BIN_X11_SSH_ASKPASS, 0, 0},
+#endif
+#ifdef ROAR_HAVE_BIN_GNOME_SSH_ASKPASS
  {"bin-gnome-ssh-askpass", ROAR_HAVE_BIN_GNOME_SSH_ASKPASS, 0, 0},
+#endif
+#ifdef ROAR_HAVE_BIN_GPG
  {"bin-gpg",            ROAR_HAVE_BIN_GPG, 0, 0},
+#endif
+#ifdef ROAR_HAVE_BIN_EJECT
  {"bin-eject",          ROAR_HAVE_BIN_EJECT, 0, 0},
+#endif
 
  // devices: