changeset 874:5b29a6fe9295 trunk

[svn] - clear up some configure bugs, pointed out by freebsd port patches
author nenolod
date Sat, 17 Mar 2007 00:58:49 -0700
parents 84413425840f
children 623eca8326e5
files ChangeLog configure.ac
diffstat 2 files changed, 16 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Mar 17 00:30:46 2007 -0700
+++ b/ChangeLog	Sat Mar 17 00:58:49 2007 -0700
@@ -1,3 +1,10 @@
+2007-03-17 07:30:46 +0000  Daniel Bradshaw <nazca@atheme.org>
+  revision [1846]
+  - These two lines probably shouldn't be in here as it is doubtful they do anything helpful
+  trunk/src/smb/smb.c |    2 --
+  1 file changed, 2 deletions(-)
+
+
 2007-03-17 07:25:24 +0000  Daniel Bradshaw <nazca@atheme.org>
   revision [1844]
   - Slight tweak ... smbc_init returns 0 on sucess, not fail
--- a/configure.ac	Sat Mar 17 00:30:46 2007 -0700
+++ b/configure.ac	Sat Mar 17 00:58:49 2007 -0700
@@ -380,7 +380,7 @@
     )
 else
     AC_MSG_RESULT([*** Audacious OSD plugin disabled per user request ***])
-    have_aosd="yes"
+    have_aosd="no"
 fi
 
 if test "x$have_aosd" = "xyes"; then
@@ -998,12 +998,12 @@
 [have_mms=$enableval],
 [have_mms=yes])
 
-if test "x$ap_disable_paranormal" = "xyes"; then
+if test "x$have_mms" = "xyes"; then
+    have_mms=yes
+    PKG_CHECK_MODULES(MMS, [libmms >= 0.3], [CONTAINER_PLUGINS="$CONTAINER_PLUGINS mms" ], [have_mms="no"])
+else
     have_mms=no
     AC_MSG_RESULT([*** mms plugin disabled by request ***])
-else
-    have_mms=yes
-    PKG_CHECK_MODULES(MMS, [libmms >= 0.3], [CONTAINER_PLUGINS="$CONTAINER_PLUGINS mms" ], [have_mms="no"])
 fi
 
 dnl *** libparanormal checks
@@ -1013,15 +1013,15 @@
 [have_paranormal=$enableval],
 [have_paranormal=yes])
 
-if test "x$ap_disable_paranormal" = "xyes"; then
-    have_paranormal=no
-    AC_MSG_RESULT([*** paranormal plugin disabled by request ***])
-else
+if test "x$have_paranormal" = "xyes"; then
     have_paranormal=yes
     AM_PATH_SDL(1.2.5, , [
 	AC_MSG_WARN([*** SDL is not installed. Paranormal will not be built. ***])
 	have_paranormal="no"
     ])
+else
+    have_paranormal=no
+    AC_MSG_RESULT([*** paranormal plugin disabled by request ***])
 fi
 
 AC_ARG_ENABLE(xspf,