Hey,
I've cleaned a bit the autotools stuff:
* use correct way to remove the check of g++ and g77 from libtool
* use correct way to deal with PACKAGE_DATA_DIR and PACKAGE_LIB_DIR
* use AC_HELP_STRING when missing
* formatting
later, I plan to add win32 support (compilation without x11. I don't think
i'll add any win32 specific graphic stuff)
if the formatting is good enough, i can commit.
Vincent? imlib2-1.4.1.000.tar.bz2
? imlib2.diff
Index: Makefile.am
===
RCS file: /cvs/e/e17/libs/imlib2/Makefile.am,v
retrieving revision 1.36
diff -u -r1.36 Makefile.am
--- Makefile.am 28 Jun 2006 07:20:17 - 1.36
+++ Makefile.am 11 May 2008 07:38:15 -
@@ -2,15 +2,9 @@
SUBDIRS = src data doc
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
- config.h.in config.sub configure install-sh \
- ltconfig ltmain.sh missing mkinstalldirs \
- stamp-h.in build-stamp configure-stamp depcomp \
- imlib2_docs.tar.gz imlib2.c \
- README \
- imlib2.pc \
- imlib2.spec \
- debian/changelog
+MAINTAINERCLEANFILES = aclocalm4 config.guess config.h.in \
+ config.sub configure depcomp install-sh \
+ ltmain.sh Makefile.in missing imlib2_docs.tar.gz
bin_SCRIPTS = imlib2-config
Index: configure.in
===
RCS file: /cvs/e/e17/libs/imlib2/configure.in,v
retrieving revision 1.147
diff -u -r1.147 configure.in
--- configure.in20 Apr 2008 12:19:22 - 1.147
+++ configure.in11 May 2008 07:38:15 -
@@ -16,22 +16,19 @@
AM_PROG_AS
dnl Set default visibility to hidden?
-AC_ARG_ENABLE(visibility-hiding,
- [ --enable-visibility-hiding enable visibility hiding @:@default=no@:@],,
- enable_visibility_hiding=no
+AC_ARG_ENABLE([visibility-hiding],
+ [AC_HELP_STRING([--enable-visibility-hiding], [enable visibility hiding
@:@default=no@:@])],
+ [enable_visibility_hiding=yes],
+ [enable_visibility_hiding=no]
)
AM_PROG_CC_STDC
AC_HEADER_STDC
AC_C_CONST
-AM_ENABLE_SHARED
dnl Next four lines is a hack to prevent libtool checking for CXX/F77
-m4_undefine([AC_PROG_CXX])
-m4_defun([AC_PROG_CXX],[])
-m4_undefine([AC_PROG_F77])
-m4_defun([AC_PROG_F77],[])
-
+define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
AM_PROG_LIBTOOL
dnl See if the compiler supports -std=gnu99 since some math
@@ -43,72 +40,6 @@
AC_TRY_COMPILE(,,,[cc_supports_gnu99=no;CPPFLAGS=$save_CPPFLAGS])
AC_MSG_RESULT($cc_supports_gnu99)
-if test x${bindir} = 'x${exec_prefix}/bin'; then
- 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
-fi
-
-if test x${libdir} = 'x${exec_prefix}/lib'; then
- 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
-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
-
-dnl Set PACKAGE_LIB_DIR in config.h.
-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_DATA_DIR in config.h.
-if test x${prefix} = xNONE; then
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,
${ac_default_prefix}/share/${PACKAGE}, [Shared Data Directory])
-else
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, ${prefix}/share/${PACKAGE}, [Shared
Data Directory])
-fi
-
-dnl Set PACKAGE_SOURCE_DIR in config.h.
-packagesrcdir=`cd $srcdir pwd`
-AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, ${packagesrcdir}, [Source code
directory])
-
-
mmx=no
amd64=no
@@ -124,29 +55,29 @@
esac
dnl
-AC_ARG_ENABLE(mmx,
-[ --enable-mmxattempt compiling using x86 mmx assembly
@:@default=auto@:@],
-[
- if test x$enableval =
