changeset 410:4ba6416227e2

Cleanups
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 02 Jun 2006 15:03:05 +0000
parents 711ef8d16f56
children a26263683929
files configure.in
diffstat 1 files changed, 20 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Fri Jun 02 14:54:05 2006 +0000
+++ b/configure.in	Fri Jun 02 15:03:05 2006 +0000
@@ -86,10 +86,10 @@
                         not under GNU GPL, refer to README for license.
 ],
 [
-if test "x$enableval" = xyes; then
+if test "x$enableval" = "xyes"; then
 OPT_THEMETUNE=yes
 else
-if test "x$enableval" = xno; then
+if test "x$enableval" = "xno"; then
 	OPT_THEMETUNE=no
 	else
 	OPT_THEMETUNE=no
@@ -100,7 +100,7 @@
 ])
 
 dnl *** Bits and pieces stolen from Glade generated configure.in
-if test "x$OPT_THEMETUNE" = xyes; then
+if test "x$OPT_THEMETUNE" = "xyes"; then
 	THEMETUNE_FILE="Kummatti_City.sid"
 
 	if test "x${datadir}" = 'x${prefix}/share'; then
@@ -127,12 +127,12 @@
 [
   --with-sidplay1=PREFIX   Enable SIDPlay1 with install-PREFIX],
 [
-if test "x$withval" = xyes; then
+if test "x$withval" = "xyes"; then
 xs_sidplay1=yes
 xs_sidplay1_library=""
 xs_sidplay1_includes=""
 else
-if test "x$withval" = xno; then
+if test "x$withval" = "xno"; then
 	xs_sidplay1=no
 	else
 	xs_sidplay1=yes
@@ -163,12 +163,12 @@
 [
   --with-sidplay2=PREFIX   Enable SIDPlay2 with install-PREFIX],
 [
-if test "x$withval" = xyes; then
+if test "x$withval" = "xyes"; then
 xs_sidplay2=yes
 xs_sidplay2_library=""
 xs_sidplay2_includes=""
 else
-if test "x$withval" = xno; then
+if test "x$withval" = "xno"; then
 	xs_sidplay2=no
 	else
 	xs_sidplay2=yes
@@ -197,17 +197,17 @@
 dnl *** Determine if libraries are wanted and available
 dnl ***
 OPT_SIDPLAY1="no"
-if test "x$xs_sidplay1" = xtry; then
+if test "x$xs_sidplay1" = "xtry"; then
 	XS_PATH_LIBSIDPLAY1
 	else
-	if test "x$xs_sidplay1" = xyes; then
+	if test "x$xs_sidplay1" = "xyes"; then
 		XS_PATH_LIBSIDPLAY1
-		if test "x$xs_have_sidplay1" = xno; then
+		if test "x$xs_have_sidplay1" = "xno"; then
 		AC_MSG_ERROR([libSIDPlay1 library and/or headers were not found!])
 		fi
 	fi
 fi
-if test "x$xs_have_sidplay1" = xyes; then
+if test "x$xs_have_sidplay1" = "xyes"; then
 	AC_DEFINE([HAVE_SIDPLAY1])
 	OPT_SIDPLAY1="yes"
 fi
@@ -216,23 +216,23 @@
 
 OPT_SIDPLAY2="no"
 LIBSIDPLAY2_REQUIRED_VERSION="2.1.0"
-if test "x$xs_sidplay2" = xtry; then
+if test "x$xs_sidplay2" = "xtry"; then
 	XS_PATH_LIBSIDPLAY2
 	else
-	if test "x$xs_sidplay2" = xyes; then
+	if test "x$xs_sidplay2" = "xyes"; then
 		XS_PATH_LIBSIDPLAY2
-		if test "x$xs_have_sidplay2" = xno; then
+		if test "x$xs_have_sidplay2" = "xno"; then
 		AC_MSG_ERROR([libSIDPlay2 library and/or headers were not found!])
 		fi
 	fi
 fi
-if test "x$xs_have_sidplay2" = xyes; then
+if test "x$xs_have_sidplay2" = "xyes"; then
 	AC_DEFINE([HAVE_SIDPLAY2])
 	OPT_SIDPLAY2="yes"
 	BUILDERS_FIND
 	BUILDERS_FIND_RESID
 	BUILDERS_FIND_HARDSID
-	if test "x$builders_available" = xno; then
+	if test "x$builders_available" = "xno"; then
 		AC_MSG_ERROR([No builder modules were found in the sidbuilders directory!]);
 	fi
 fi
@@ -241,8 +241,8 @@
 dnl ***
 dnl *** Check if we have some emulator library available?
 dnl ***
-if test "x$OPT_SIDPLAY1" = xno; then
-if test "x$OPT_SIDPLAY2" = xno; then
+if test "x$OPT_SIDPLAY1" = "xno"; then
+if test "x$OPT_SIDPLAY2" = "xno"; then
 AC_MSG_ERROR([Either libSIDPlay1 or libSIDPlay2 is required! Please read INSTALL for more information!])
 fi
 fi
@@ -253,12 +253,11 @@
 dnl ***
 AC_MSG_CHECKING([for song position patch])
 tmp_CPPFLAGS=$CPPFLAGS
-if test -d "$prefix" ;then
+if test -d "$prefix"; then
   CPPFLAGS="$CPPFLAGS -I${prefix}/include"
 fi
 
-AC_EGREP_HEADER([set_song_position],[xmms/plugin.h],
-[
+AC_EGREP_HEADER([set_song_position],[xmms/plugin.h],[
 OPT_SONGPOS="yes"
 AC_DEFINE(HAVE_SONG_POSITION)
 AC_MSG_RESULT([yes])