From: Andreas Oberritter <obi@opendreambox.org>
Date: Tue, 25 Mar 2008 19:49:07 +0000 (+0000)
Subject: set package name/version to enigma2/2.4,
X-Git-Tag: 2.6.0~1440
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/5e0e6db325daef245a7bec8a79b143aab52bfe9b

set package name/version to enigma2/2.4,
prefer pkg-config files over <package>-config when looking for freetype and sdl libraries (fallback to old behaviour if required),
use freetype pkg-config file as an indication for a library newer than 2.0.x (also set -DFREETYPE2 in this case),
create an AM_CONDITIONAL 'WITH_SDL' to be used by Makefiles
---

diff --git a/configure.ac b/configure.ac
index f3239d21..540ba7fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-AC_INIT(tuxbox-enigma,0.0.1)
-AM_INIT_AUTOMAKE(tuxbox-enigma,0.0.1)
+AC_INIT(enigma2,2.4)
+AM_INIT_AUTOMAKE(enigma2,2.4)
 
 TUXBOX_APPS
 TUXBOX_APPS_DIRECTORY
@@ -20,7 +20,10 @@ AC_PYTHON_DEVEL
 
 TUXBOX_APPS_DVB
 
-TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)
+_TUXBOX_APPS_LIB_PKGCONFIG_OPTIONAL(FREETYPE, freetype2, HAVE_FREETYPE2)
+if test "$HAVE_FREETYPE2" = "no" ; then
+	TUXBOX_APPS_LIB_CONFIG(FREETYPE, freetype-config)
+fi
 TUXBOX_APPS_LIB_PKGCONFIG(FRIBIDI,fribidi)
 TUXBOX_APPS_LIB_PKGCONFIG(ID3TAG,id3tag)
 TUXBOX_APPS_LIB_PKGCONFIG(MAD,mad)
@@ -44,9 +47,14 @@ TUXBOX_APPS_LIB_PKGCONFIG(XML2,libxml-2.0)
 TUXBOX_APPS_LIB_SYMBOL(XMLCCWRAP, xmlccwrap, exit)
 
 if test "$withsdl" = "yes" ; then
-	TUXBOX_APPS_LIB_CONFIG(SDL,sdl-config)
-	AC_DEFINE_UNQUOTED([WITH_SDL],[$withsdl],[With SDL])
+	_TUXBOX_APPS_LIB_PKGCONFIG_OPTIONAL(SDL,sdl,WITH_SDL)
+	if test "$WITH_SDL" = "no" ; then
+		TUXBOX_APPS_LIB_CONFIG(SDL,sdl-config)
+		AC_DEFINE_UNQUOTED([WITH_SDL],[$withsdl],[With SDL])
+	fi
 fi
+# allow 'if WITH_SDL' conditionals in Makefile.am
+AM_CONDITIONAL(WITH_SDL, test "$WITH_SDL" = "yes")
 
 CPPFLAGS="$CPPFLAGS "'-I$(top_srcdir)'
 CPPFLAGS="$CPPFLAGS -D_REENTRANT $PYTHON_CPPFLAGS $MD5SUM_CFLAGS $FREETYPE_CFLAGS $FRIBIDI_CFLAGS $ID3TAG_CFLAGS $MAD_CFLAGS $PLUGINS_CFLAGS $PNG_CFLAGS $SDL_CFLAGS $SIGC_CFLAGS $XMLTREE_CFLAGS $DVBSI_CFLAGS $GSTREAMER_CFLAGS $LIBUNGIF_CLFAGS"