mt-daapd/fix-libs.patch

   1 *** mt-daapd-0.2.4.2/configure.in       2008-04-19 15:31:30.000000000 -0400
   2 --- mt-daapd-0.2.4.2.new/configure.in   2011-05-01 20:56:15.204853627 -0400
   3 ***************
   4 *** 20,27 ****
   5   CPPFLAGS="${CPPFLAGS} -g"
   6
   7   dnl fix freebsd's broken (?) libpthread
   8 ! AC_CHECK_LIB(c_r,pthread_creat,LDFLAGS="${LDFLAGS} -lc_r", [
   9 !   AC_CHECK_LIB(pthread,pthread_create,LDFLAGS="${LDFLAGS} -lpthread") ])
  10
  11   AC_ARG_ENABLE(debug,[  --enable-debug          Enable debugging features],
  12                        CPPFLAGS="${CPPFLAGS} -Wall")
  13 --- 20,27 ----
  14   CPPFLAGS="${CPPFLAGS} -g"
  15
  16   dnl fix freebsd's broken (?) libpthread
  17 ! AC_CHECK_LIB(c_r,pthread_creat,LIBS="${LIBS} -lc_r", [
  18 !   AC_CHECK_LIB(pthread,pthread_create,LIBS="${LIBS} -lpthread") ])
  19
  20   AC_ARG_ENABLE(debug,[  --enable-debug          Enable debugging features],
  21                        CPPFLAGS="${CPPFLAGS} -Wall")
  22 ***************
  23 *** 35,47 ****
  24                       esac ])
  25
  26   AC_ARG_ENABLE(efence,[  --enable-efence         Enable electric fence],
  27 !                       LDFLAGS="${LDFLAGS} -lefence")
  28   AC_ARG_ENABLE(nslu2,[  --enable-nslu2          Build for NSLU2/uNSLUng],
  29                        CFLAGS="${CFLAGS} -DNSLU2")
  30
  31   AC_ARG_ENABLE(howl,[  --enable-howl       Use howl 0.9.2 or later],
  32                       [ case "${enableval}" in
  33 !                         yes) rend_howl=true; rend_posix=false; rend_avahi=false; LDFLAGS="${LDFLAGS} -lhowl";
  34                         CPPFLAGS="${CPPFLAGS} -DWITH_HOWL";;
  35                         no)  rend_howl=false;;
  36                         *)   AC_MSG_ERROR(bad value ${enableval} for --enable-howl);;
  37 --- 35,47 ----
  38                       esac ])
  39
  40   AC_ARG_ENABLE(efence,[  --enable-efence         Enable electric fence],
  41 !                       LIBS="${LIBS} -lefence")
  42   AC_ARG_ENABLE(nslu2,[  --enable-nslu2          Build for NSLU2/uNSLUng],
  43                        CFLAGS="${CFLAGS} -DNSLU2")
  44
  45   AC_ARG_ENABLE(howl,[  --enable-howl       Use howl 0.9.2 or later],
  46                       [ case "${enableval}" in
  47 !                         yes) rend_howl=true; rend_posix=false; rend_avahi=false; LIBS="${LIBS} -lhowl";
  48                         CPPFLAGS="${CPPFLAGS} -DWITH_HOWL";;
  49                         no)  rend_howl=false;;
  50                         *)   AC_MSG_ERROR(bad value ${enableval} for --enable-howl);;
  51 ***************
  52 *** 50,56 ****
  53   AC_ARG_ENABLE(avahi,[  --enable-avahi          Use avahi 0.6 or later],
  54                       [ case "${enableval}" in
  55                           yes) PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6 ]);
  56 !                       rend_avahi=true; rend_howl=false; rend_posix=false; LDFLAGS="${LDFLAGS} $AVAHI_LIBS";
  57                         CPPFLAGS="${CPPFLAGS} $AVAHI_CFLAGS -DWITH_AVAHI";;
  58                         no)  rend_avahi=false;;
  59                         *)   AC_MSG_ERROR(bad value ${enableval} for --enable-avahi);;
  60 --- 50,56 ----
  61   AC_ARG_ENABLE(avahi,[  --enable-avahi          Use avahi 0.6 or later],
  62                       [ case "${enableval}" in
  63                           yes) PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6 ]);
  64 !                       rend_avahi=true; rend_howl=false; rend_posix=false; LIBS="${LIBS} $AVAHI_LIBS";
  65                         CPPFLAGS="${CPPFLAGS} $AVAHI_CFLAGS -DWITH_AVAHI";;
  66                         no)  rend_avahi=false;;
  67                         *)   AC_MSG_ERROR(bad value ${enableval} for --enable-avahi);;
  68 ***************
  69 *** 58,65 ****
  70
  71   AC_ARG_ENABLE(oggvorbis,[  --enable-oggvorbis      Enable Ogg/Vorbis support],
  72                              use_oggvorbis=true;
  73 ! #                           LDFLAGS="${LDFLAGS} -logg -lvorbis";
  74 !                            CPPFLAGS="${CPPFLAGS} -DOGGVORBIS")
  75
  76   AM_CONDITIONAL(COND_REND_HOWL, test x$rend_howl = xtrue)
  77   AM_CONDITIONAL(COND_REND_AVAHI, test x$rend_avahi = xtrue)
  78 --- 58,65 ----
  79
  80   AC_ARG_ENABLE(oggvorbis,[  --enable-oggvorbis      Enable Ogg/Vorbis support],
  81                              use_oggvorbis=true;
  82 ! #                           LIBS="${LIBS} -logg -lvorbis";
  83 !                            CPPFLAGS="${LIBS} -DOGGVORBIS")
  84
  85   AM_CONDITIONAL(COND_REND_HOWL, test x$rend_howl = xtrue)
  86   AM_CONDITIONAL(COND_REND_AVAHI, test x$rend_avahi = xtrue)
  87 ***************
  88 *** 82,88 ****
  89         CPPFLAGS="$CPPFLAGS -DNOT_HAVE_SA_LEN -D_XPG4_2"
  90         CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__ -DHAVE_BROKEN_RECVIF_NAME"
  91         CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
  92 !       LDFLAGS="$LDFLAGS -lnsl -lsocket";;
  93   *freebsd*)
  94         CPPFLAGS="$CPPFLAGS -DFREEBSD";;
  95   *linux*)
  96 --- 82,88 ----
  97         CPPFLAGS="$CPPFLAGS -DNOT_HAVE_SA_LEN -D_XPG4_2"
  98         CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__ -DHAVE_BROKEN_RECVIF_NAME"
  99         CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
 100 !       LIBS="$LIBS -lnsl -lsocket";;
 101   *freebsd*)
 102         CPPFLAGS="$CPPFLAGS -DFREEBSD";;
 103   *linux*)
 104 ***************
 105 *** 154,163 ****
 106   AC_CHECK_LIB(gdbm,gdbm_open,echo "Have gdbm", echo "Must have gdbm";exit)
 107
 108   if test "$STATIC_LIBS" != "no"; then
 109 !   LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libgdbm.a"
 110     echo "Adding static libgdbm"
 111   else
 112 !   LDFLAGS="${LDFLAGS} -lgdbm"
 113     echo "Adding dynamic libgdbm"
 114   fi
 115
 116 --- 154,163 ----
 117   AC_CHECK_LIB(gdbm,gdbm_open,echo "Have gdbm", echo "Must have gdbm";exit)
 118
 119   if test "$STATIC_LIBS" != "no"; then
 120 !   LIBS="${LIBS} ${STATIC_LIBS}/libgdbm.a"
 121     echo "Adding static libgdbm"
 122   else
 123 !   LIBS="${LIBS} -lgdbm"
 124     echo "Adding dynamic libgdbm"
 125   fi
 126
 127 ***************
 128 *** 170,179 ****
 129   AC_CHECK_LIB(id3tag,id3_file_open,echo "Have id3tag",echo "Must have libid3tag";exit)
 130
 131   if test "$STATIC_LIBS" != "no"; then
 132 !   LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libid3tag.a -lz"
 133     echo "Adding static libid3tag"
 134   else
 135 !   LDFLAGS="${LDFLAGS} -lid3tag -lz"
 136     echo "Adding dynamic libid3tag"
 137   fi
 138   CFLAGS=$oldcflags
 139 --- 170,179 ----
 140   AC_CHECK_LIB(id3tag,id3_file_open,echo "Have id3tag",echo "Must have libid3tag";exit)
 141
 142   if test "$STATIC_LIBS" != "no"; then
 143 !   LIBS="${LIBS} ${STATIC_LIBS}/libid3tag.a -lz"
 144     echo "Adding static libid3tag"
 145   else
 146 !   LIBS="${LIBS} -lid3tag -lz"
 147     echo "Adding dynamic libid3tag"
 148   fi
 149   CFLAGS=$oldcflags
 150 ***************
 151 *** 184,193 ****
 152     AC_CHECK_LIB(ogg,ogg_sync_init,echo "Have ogg",echo "Must have libogg for Ogg/Vorbis support";exit)
 153
 154     if test x"$STATIC_LIBS" != x"no"; then
 155 !     LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libogg.a"
 156       echo "Adding static libogg"
 157     else
 158 !     LDFLAGS="${LDFLAGS} -logg"
 159       echo "Adding dynamic libogg"
 160     fi
 161
 162 --- 184,193 ----
 163     AC_CHECK_LIB(ogg,ogg_sync_init,echo "Have ogg",echo "Must have libogg for Ogg/Vorbis support";exit)
 164
 165     if test x"$STATIC_LIBS" != x"no"; then
 166 !     LIBS="${LIBS} ${STATIC_LIBS}/libogg.a"
 167       echo "Adding static libogg"
 168     else
 169 !     LIBS="${LIBS} -logg"
 170       echo "Adding dynamic libogg"
 171     fi
 172
 173 ***************
 174 *** 196,205 ****
 175     AC_CHECK_LIB(vorbis,vorbis_info_init,echo "Have vorbis",echo "Must have libvorbis for Ogg/Vorbis support";exit)
 176
 177     if test x"$STATIC_LIBS" != x"no"; then
 178 !     LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libvorbis.a"
 179       echo "Adding static libvorbis"
 180     else
 181 !     LDFLAGS="${LDFLAGS} -lvorbis"
 182       echo "Adding dynamic libvorbis"
 183     fi
 184   fi
 185 --- 196,205 ----
 186     AC_CHECK_LIB(vorbis,vorbis_info_init,echo "Have vorbis",echo "Must have libvorbis for Ogg/Vorbis support";exit)
 187
 188     if test x"$STATIC_LIBS" != x"no"; then
 189 !     LIBS="${LIBS} ${STATIC_LIBS}/libvorbis.a"
 190       echo "Adding static libvorbis"
 191     else
 192 !     LIBS="${LIBS} -lvorbis"
 193       echo "Adding dynamic libvorbis"
 194     fi
 195   fi