Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/imlib2
Dir : e17/libs/imlib2
Modified Files:
configure.in imlib2.spec
Log Message:
distipoos
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/configure.in,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- configure.in 15 Apr 2004 11:54:58 -0000 1.68
+++ configure.in 16 Apr 2004 05:15:39 -0000 1.69
@@ -7,6 +7,60 @@
AM_CONFIG_HEADER(config.h)
+if test "x${exec_prefix}" = "xNONE"; then
+ if test "x${prefix}" = "xNONE"; then
+ bindir="${ac_default_prefix}/bin";
+ else
+ bindir="${prefix}/bin";
+ fi
+else
+ if test "x${prefix}" = "xNONE"; then
+ bindir="${ac_default_prefix}/bin";
+ else
+ bindir="${prefix}/bin";
+ fi
+fi
+
+if test "x${exec_prefix}" = "xNONE"; then
+ if test "x${prefix}" = "xNONE"; then
+ libdir="${ac_default_prefix}/lib";
+ else
+ libdir="${prefix}/lib";
+ fi
+else
+ if test "x${prefix}" = "xNONE"; then
+ libdir="${ac_default_prefix}/lib";
+ else
+ libdir="${prefix}/lib";
+ fi
+fi
+
+dnl Set PACKAGE_BIN_DIR in config.h.
+if test "x${bindir}" = 'xNONE'; then
+ if test "x${prefix}" = "xNONE"; then
+ AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin", [Installation
directory for user executables])
+ else
+ AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", [Installation directory for
user executables])
+ fi
+else
+ AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", [Installation directory for user
executables])
+fi
+
+if test "x${libdir}" = 'xNONE'; then
+ if test "x${prefix}" = "xNONE"; then
+ AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib", [Installation
directory for libraries] )
+ else
+ AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", [Installation directory for
libraries])
+ fi
+else
+ AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", [Installation directory for
libraries])
+fi
+
+dnl Set PACKAGE_SOURCE_DIR in config.h.
+packagesrcdir=`cd $srcdir && pwd`
+AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code directory])
+
+
dnl here was freetype stuff (1)
# check for freetype
@@ -355,13 +409,11 @@
AC_SUBST(freetype_cflags)
AC_SUBST(freetype_libs)
-AC_SUBST(pkglibdir)
-
dnl AC_SUBST(freetype_libs)
dnl AC_SUBST(freetype_includes)
AC_CONFIG_FILES([imlib2-config imlib2.pc Makefile loaders/Makefile src/Makefile
test/Makefile \
- filters/Makefile demo/Makefile doc/Makefile src/loaderpath.h \
+ filters/Makefile demo/Makefile doc/Makefile \
])
AC_CONFIG_COMMANDS([default],[[
chmod +x imlib2-config
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/imlib2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- imlib2.spec 15 Apr 2004 05:18:50 -0000 1.20
+++ imlib2.spec 16 Apr 2004 05:15:39 -0000 1.21
@@ -149,37 +149,37 @@
%{_includedir}/*
%files filters
-%attr(755,root,root) %{_libdir}/loaders/filter/*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/filter/*
%files loader_jpeg
-%attr(755,root,root) %{_libdir}/loaders/image/jpeg.*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/image/jpeg.*
%files loader_png
-%attr(755,root,root) %{_libdir}/loaders/image/png.*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/image/png.*
%files loader_argb
-%attr(755,root,root) %{_libdir}/loaders/image/argb.*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/image/argb.*
%files loader_bmp
-%attr(755,root,root) %{_libdir}/loaders/image/bmp.*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/image/bmp.*
%files loader_gif
-%attr(755,root,root) %{_libdir}/loaders/image/gif.*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/image/gif.*
%files loader_pnm
-%attr(755,root,root) %{_libdir}/loaders/image/pnm.*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/image/pnm.*
%files loader_tga
-%attr(755,root,root) %{_libdir}/loaders/image/tga.*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/image/tga.*
%files loader_tiff
-%attr(755,root,root) %{_libdir}/loaders/image/tiff.*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/image/tiff.*
%files loader_xpm
-%attr(755,root,root) %{_libdir}/loaders/image/xpm.*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/image/xpm.*
%files loader_gzbz2
-%attr(755,root,root) %{_libdir}/loaders/image/gzbz2.*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/image/gzbz2.*
%changelog
* Mon Jan 8 2001 The Rasterman <[EMAIL PROTECTED]>
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
