Wed Jan 19 17:10:29 2005 Michael Jennings (mej)

Fix imlib2 and evas spec files to depend on /usr/bin/freetype-config
so that they'll build on both RH/Fedora/cAos (freetype-devel) and SuSE
(freetype2-devel).
----------------------------------------------------------------------

SVN revision: 13020

diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in
index 8a466af..874592b 100644 (file)
--- a/legacy/evas/configure.in
+++ b/legacy/evas/configure.in
@@ -152,13 +152,14 @@ AC_ARG_ENABLE(software-x11, [  --enable-software-x11           enable the Softwa
        ]
 )
 if test "x$have_evas_software_x11" = "xyes"; then
+  AC_PATH_XTRA
   AC_CHECK_HEADER(X11/X.h,
     [
       AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_X11, true)
       AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend])
-      x_dir="/usr/X11R6";
-      x_cflags="-I"$x_dir"/include"
-      x_libs="-L"$x_dir"/lib -lX11 -lXext"
+      x_dir=${x_dir:-/usr/X11R6}
+      x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+      x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
       ENGINE_SOFTWARE_X11_PRG="evas_software_x11_test evas_software_x11_perf_test evas_software_x11_perf_load"
     ],
     [
@@ -369,9 +370,9 @@ if test "x$have_evas_gl_x11" = "xyes"; then
          AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend])
          AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true)
          AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support])
-         x_dir="/usr/X11R6";
-         x_cflags="-I"$x_dir"/include"
-         x_libs="-L"$x_dir"/lib -lX11 -lXext"
+         x_dir=${x_dir:-/usr/X11R6};
+         x_cflags=${x_cflags:--I$x_dir/include}
+         x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}"
          gl_cflags="-I/usr/include"
          gl_libs="-L/usr/lib32 -lGL -lGLU -lpthread"
          gl_dir=""

diff --git a/legacy/evas/evas.spec b/legacy/evas/evas.spec
index 24cea16..e7303f4 100644 (file)
--- a/legacy/evas/evas.spec
+++ b/legacy/evas/evas.spec
@@ -11,9 +11,9 @@ Source: ftp://ftp.enlightenment.org/pub/evas/evas-%{version}_pre13.tar.gz
 Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <mej@eterm.org>}
 Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)}
 Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
-#BuildSuggests: xorg-x11-devel freetype2-devel
+#BuildSuggests: xorg-x11-devel freetype2-devel freetype-devel
 BuildRequires: libpng-devel eet-devel edb-devel XFree86-devel libjpeg-devel
-BuildRequires: freetype-devel >= 2
+BuildRequires: /usr/bin/freetype-config
 Provides: evas evas_software_x11 evas_loader_png evas_loader_jpeg evas_loader_eet evas_loader_edb
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -27,6 +27,7 @@ Summary: Evas headers, static libraries, documentation and test programs
 Group: System Environment/Libraries
 Requires: %{name} = %{version}
 Requires: libpng-devel eet-devel edb-devel XFree86-devel libjpeg-devel
+Requires: /usr/bin/freetype-config
 
 %description devel
 Headers, static libraries, test programs and documentation for Evas.
@@ -35,7 +36,7 @@ Headers, static libraries, test programs and documentation for Evas.
 %setup -q -n %{name}-%{version}_pre13
 
 %build
-%{configure} --prefix=%{_prefix}
+%{configure} --prefix=%{_prefix} --x-libraries=%{_prefix}/X11R6/%{_lib}
 %{__make} %{?_smp_mflags} %{?mflags}
 test -x `which doxygen` && /bin/sh gendoc || :