autostuff improvements:

* use non deprecated version of AC_INIT and AM_INIT_AUTOMAKE
   and check the required minimal versions.
 * add bzipped distribution archive
 * add AC_LIBTOOL_WIN32_DLL
 * forbid libtool to check fortran
 * compute libtool versioning from the version of the package
 * pass the directories based on ${prefix} to the preoprocessor
   with the -D option
 * replace INCLUDES, wich is deprecated since 2001 by AM_CPPFLAGS
 * remove useless -L flags in *_la_LDFLAGS


SVN revision: 32338
This commit is contained in:
doursse 2007-11-04 09:29:20 +00:00 committed by doursse
parent e21fb0f122
commit be1229247a
16 changed files with 80 additions and 128 deletions

View File

@ -1,12 +1,17 @@
dnl Process this file with autoconf to produce a configure script.
rm -f config.cache
AC_INIT(configure.in)
AC_INIT(ecore, 0.9.9.041, enlightenment-devel@lists.sourceforge.net)
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR(configure.in)
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_ISC_POSIX
AM_INIT_AUTOMAKE(ecore, 0.9.9.041)
AM_INIT_AUTOMAKE(1.6 dist-bzip2)
AM_CONFIG_HEADER(config.h)
AC_PROG_CXX
AC_C_BIGENDIAN
AC_PROG_CC
AM_PROG_CC_STDC
@ -14,38 +19,18 @@ AC_HEADER_STDC
AC_C_CONST
AC_CHECK_SIZEOF(int, 4)
AC_CHECK_SIZEOF(long, 4)
AM_ENABLE_SHARED
AM_PROG_LIBTOOL
AC_C___ATTRIBUTE__
if test "x${bindir}" = 'xNONE'; then
if test "x${prefix}" = "xNONE"; then
PACKAGE_BIN_DIR="${ac_default_prefix}/bin"
else
PACKAGE_BIN_DIR="${prefix}/bin"
fi
else
PACKAGE_BIN_DIR="${bindir}"
fi
AC_SUBST(PACKAGE_BIN_DIR)
AC_LIBTOOL_WIN32_DLL
define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
AC_PROG_LIBTOOL
if test "x${libdir}" = 'xNONE'; then
if test "x${prefix}" = "xNONE"; then
PACKAGE_LIB_DIR="${ac_default_prefix}/lib"
else
PACKAGE_LIB_DIR="${prefix}/lib"
fi
else
PACKAGE_LIB_DIR="${libdir}"
fi
AC_SUBST(PACKAGE_LIB_DIR)
if test "x${prefix}" = "xNONE"; then
PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}"
else
PACKAGE_DATA_DIR="${prefix}/share/${PACKAGE}"
fi
AC_SUBST(PACKAGE_DATA_DIR)
VMAJ=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $1);}'`
VMIN=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $2);}'`
VMIC=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $3);}'`
SNAP=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $4);}'`
version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
AC_SUBST(version_info)
dnl Use -Wall if we have gcc.
changequote(,)dnl

View File

@ -8,15 +8,15 @@ ECORE_CONFIG_PROG =
ECORE_CONFIG_LIB =
endif
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_config \
-I$(top_builddir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore_config \
@EET_CFLAGS@ \
-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\"
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
@EET_CFLAGS@
bin_PROGRAMS = $(ECORE_CONFIG_PROG)

View File

@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
INCLUDES =
AM_CPPFLAGS =
lib_LTLIBRARIES = libecore.la
include_HEADERS = \
@ -33,5 +33,5 @@ ecore_tree.c \
ecore_value.c \
ecore_private.h
libecore_la_LIBADD = -lm @dlopen_libs@ @winsock_libs@ @create_shared_lib@
libecore_la_LDFLAGS = -version-info 1:0:0
libecore_la_LIBADD = @dlopen_libs@ @winsock_libs@ -lm
libecore_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@

View File

@ -1,15 +1,12 @@
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore_con \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_con \
@SSL_CFLAGS@ @CURL_CFLAGS@
libecore_con_la_LDFLAGS = -version-info 1:0:0 \
-L$(top_builddir)/src/lib/ecore/.libs
if BUILD_ECORE_CON
lib_LTLIBRARIES = libecore_con.la
@ -26,6 +23,8 @@ libecore_con_la_LIBADD = \
$(top_builddir)/src/lib/ecore/libecore.la \
@SSL_LIBS@ @winsock_libs@ @CURL_LIBS@
libecore_con_la_LDFLAGS = -version-info @version_info@
libecore_con_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la

View File

@ -1,22 +1,19 @@
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_ipc \
-I$(top_srcdir)/ \
-I$(top_builddir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore_ipc \
-I$(top_builddir)/ \
@EVAS_CFLAGS@ @EET_CFLAGS@ \
-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\"
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
@EVAS_CFLAGS@ @EET_CFLAGS@
CLEANFILES = $(DB)
libecore_config_la_LDFLAGS = -version-info 1:0:0 \
-L$(top_builddir)/src/lib/ecore/.libs
if BUILD_ECORE_CONFIG
#DB = system.db
@ -30,6 +27,8 @@ lib_LTLIBRARIES = libecore_config.la
include_HEADERS = \
Ecore_Config.h
libecore_config_la_LDFLAGS = -version-info @version_info@
#config_DATA = $(DB)
#configdir = $(pkgdatadir)
@ -75,7 +74,6 @@ $(top_builddir)/src/lib/ecore/libecore.la
endif
endif
EXTRA_DIST = \

View File

@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore_file \
-I$(top_builddir)/src/lib/ecore_desktop \
@ -8,10 +8,6 @@ INCLUDES = \
-I$(top_srcdir)/src/lib/ecore_file \
-I$(top_srcdir)/src/lib/ecore_desktop
libecore_desktop_la_LDFLAGS = -version-info 1:0:0 \
-L$(top_builddir)/src/lib/ecore/.libs \
-L$(top_builddir)/src/lib/ecore_file/.libs
if BUILD_ECORE_DESKTOP
lib_LTLIBRARIES = libecore_desktop.la
@ -31,6 +27,8 @@ libecore_desktop_la_LIBADD = \
$(top_builddir)/src/lib/ecore/libecore.la \
$(top_builddir)/src/lib/ecore_file/libecore_file.la
libecore_desktop_la_LDFLAGS = -version-info @version_info@
libecore_desktop_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la \
$(top_builddir)/src/lib/ecore_file/libecore_file.la

View File

@ -1,13 +1,10 @@
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore \
@DIRECTFB_CFLAGS@
libecore_directfb_la_LDFLAGS = -version-info 1:0:0 \
-L$(top_builddir)/src/lib/ecore/.libs
if BUILD_ECORE_DIRECTFB
lib_LTLIBRARIES = libecore_directfb.la
@ -17,12 +14,14 @@ Ecore_DirectFB.h
libecore_directfb_la_SOURCES = \
ecore_directfb.c \
ecore_directfb_keys.h \
ecore_directfb_private.h
ecore_directfb_private.h
libecore_directfb_la_LIBADD = \
$(top_builddir)/src/lib/ecore/libecore.la \
@DIRECTFB_LIBS@
libecore_directfb_la_LDFLAGS = -version-info @version_info@
libecore_directfb_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la

View File

@ -3,54 +3,44 @@ MAINTAINERCLEANFILES = Makefile.in
if BUILD_ECORE_X
ECORE_X_INC = -I$(top_srcdir)/src/lib/ecore_x
ECORE_X_LIB = $(top_builddir)/src/lib/ecore_x/libecore_x.la
ECORE_X_LDF = -L$(top_builddir)/src/lib/ecore_x/.libs
else
ECORE_X_INC =
ECORE_X_LIB =
ECORE_X_LDF =
ECORE_X_LIB =
endif
if BUILD_ECORE_FB
ECORE_FB_INC = -I$(top_srcdir)/src/lib/ecore_fb
ECORE_FB_LIB = $(top_builddir)/src/lib/ecore_fb/libecore_fb.la
ECORE_FB_LDF = -L$(top_builddir)/src/lib/ecore_fb/.libs
else
ECORE_FB_INC =
ECORE_FB_LIB =
ECORE_FB_LDF =
endif
if BUILD_ECORE_DIRECTFB
ECORE_DIRECTFB_INC = -I$(top_srcdir)/src/lib/ecore_directfb -I@DIRECTFB_CFLAGS@
ECORE_DIRECTFB_LIB = $(top_builddir)/src/lib/ecore_directfb/libecore_directfb.la
ECORE_DIRECTFB_LDF = -L$(top_builddir)/src/lib/ecore_directfb/.libs
else
ECORE_DIRECTFB_INC =
ECORE_DIRECTFB_LIB =
ECORE_DIRECTFB_LDF =
endif
if BUILD_ECORE_WIN32
ECORE_WIN32_INC = -I$(top_srcdir)/src/lib/ecore_win32
ECORE_WIN32_LIB = $(top_builddir)/src/lib/ecore_win32/libecore_win32.la
ECORE_WIN32_LDF = -L$(top_builddir)/src/lib/ecore_win32/.libs
else
ECORE_WIN32_INC =
ECORE_WIN32_LIB =
ECORE_WIN32_LDF =
ECORE_WIN32_LIB =
endif
if BUILD_ECORE_SDL
ECORE_SDL_INC = -I$(top_srcdir)/src/lib/ecore_sdl @sdl_cflags@
ECORE_SDL_LIB = $(top_builddir)/src/lib/ecore_sdl/libecore_sdl.la
ECORE_SDL_LDF = -L$(top_builddir)/src/lib/ecore_sdl/.libs
else
ECORE_SDL_INC =
ECORE_SDL_LIB =
ECORE_SDL_LDF =
endif
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_evas \
-I$(top_builddir)/src/lib/ecore \
@ -63,14 +53,6 @@ $(ECORE_SDL_INC) \
@EVAS_CFLAGS@ \
@XCB_CFLAGS@
libecore_evas_la_LDFLAGS = -version-info 1:0:0 \
$(ECORE_X_LDF) \
$(ECORE_FB_LDF) \
$(ECORE_DIRECTFB_LDF) \
$(ECORE_WIN32_LDF) \
$(ECORE_SDL_LDF) \
-L$(top_builddir)/src/lib/ecore/.libs
if BUILD_ECORE_EVAS
lib_LTLIBRARIES = libecore_evas.la
@ -99,6 +81,8 @@ $(top_builddir)/src/lib/ecore/libecore.la \
@XCB_LIBS@ \
@create_shared_lib@
libecore_evas_la_LDFLAGS = -version-info @version_info@
libecore_evas_la_DEPENDENCIES = \
$(ECORE_X_LIB) \
$(ECORE_FB_LIB) \

View File

@ -1,12 +1,9 @@
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore
libecore_fb_la_LDFLAGS = -version-info 1:0:0 \
-L$(top_builddir)/src/lib/ecore/.libs
if BUILD_ECORE_FB
lib_LTLIBRARIES = libecore_fb.la
@ -18,15 +15,17 @@ ecore_fb.c \
ecore_fb_vt.c \
ecore_fb_li.c \
ecore_fb_private.h
# deprecated sources (might not compile):
# deprecated sources (might not compile):
# ecore_fb_ts.c
# ecore_fb_kbd.c
# ecore_fb_kbd.c
# ecore_fb_ps2.c
libecore_fb_la_LIBADD = \
@tslib_libs@ \
$(top_builddir)/src/lib/ecore/libecore.la
libecore_fb_la_LDFLAGS = -version-info @version_info@
libecore_fb_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la

View File

@ -1,13 +1,10 @@
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore \
@CURL_CFLAGS@
libecore_file_la_LDFLAGS = @create_shared_lib@ -version-info 1:0:0 \
-L$(top_builddir)/src/lib/ecore/.libs
if BUILD_ECORE_FILE
lib_LTLIBRARIES = libecore_file.la
@ -27,6 +24,8 @@ libecore_file_la_LIBADD = \
$(top_builddir)/src/lib/ecore/libecore.la \
@fam_libs@ @CURL_LIBS@ @ecore_file_win32_lib@ @winsock_libs@
libecore_file_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@
endif
EXTRA_DIST = \

View File

@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore_con \
-I$(top_builddir)/src/lib/ecore_ipc \
@ -9,10 +9,6 @@ INCLUDES = \
-I$(top_srcdir)/src/lib/ecore_ipc \
@SSL_CFLAGS@
libecore_ipc_la_LDFLAGS = -version-info 1:0:0 \
-L$(top_builddir)/src/lib/ecore/.libs \
-L$(top_builddir)/src/lib/ecore_con/.libs
if BUILD_ECORE_IPC
lib_LTLIBRARIES = libecore_ipc.la
@ -28,6 +24,8 @@ $(top_builddir)/src/lib/ecore/libecore.la \
$(top_builddir)/src/lib/ecore_con/libecore_con.la \
@SSL_LIBS@ @winsock_libs@
libecore_ipc_la_LDFLAGS = -version-info @version_info@
libecore_ipc_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la \
$(top_builddir)/src/lib/ecore_con/libecore_con.la

View File

@ -1,13 +1,9 @@
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore
libecore_job_la_LDFLAGS = -version-info 1:0:0 \
@create_shared_lib@ \
-L$(top_builddir)/src/lib/ecore/.libs
if BUILD_ECORE_JOB
lib_LTLIBRARIES = libecore_job.la
@ -21,6 +17,8 @@ ecore_job_private.h
libecore_job_la_LIBADD = \
$(top_builddir)/src/lib/ecore/libecore.la
libecore_job_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@
libecore_job_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la

View File

@ -1,13 +1,10 @@
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore \
@sdl_cflags@
libecore_sdl_la_LDFLAGS = -version-info 1:0:0 \
-L$(top_builddir)/src/lib/ecore/.libs
if BUILD_ECORE_SDL
lib_LTLIBRARIES = libecore_sdl.la
@ -22,6 +19,8 @@ libecore_sdl_la_LIBADD = \
$(top_builddir)/src/lib/ecore/libecore.la \
@sdl_libs@ @create_shared_lib@
libecore_sdl_la_LDFLAGS = -version-info @version_info@
libecore_sdl_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la

View File

@ -1,17 +1,14 @@
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore \
@iconv_cflags@
libecore_txt_la_LDFLAGS = -version-info 1:0:0 \
@create_shared_lib@ \
-L$(top_builddir)/src/lib/ecore/.libs
if BUILD_ECORE_TXT
lib_LTLIBRARIES = libecore_txt.la
include_HEADERS = \
Ecore_Txt.h
@ -19,10 +16,9 @@ libecore_txt_la_SOURCES = \
ecore_txt.c \
ecore_txt_private.h
# FIXME: may have to link with -liconv
libecore_txt_la_LIBADD = \
@iconv_libs@
libecore_txt_la_LIBADD = @iconv_libs@
libecore_txt_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@
libecore_txt_la_DEPENDENCIES =

View File

@ -1,18 +1,14 @@
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore
libecore_win32_la_LDFLAGS = \
-version-info 1:0:0 \
@create_shared_lib@ \
-L$(top_builddir)/src/lib/ecore/.libs
if BUILD_ECORE_WIN32
lib_LTLIBRARIES = libecore_win32.la
include_HEADERS = \
Ecore_Win32.h
@ -30,6 +26,8 @@ libecore_win32_la_LIBADD = \
-lwsock32 \
$(top_builddir)/src/lib/ecore/libecore.la
libecore_win32_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@
endif
EXTRA_DIST = \

View File

@ -1,7 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
if BUILD_ECORE_X_XCB
INCLUDES = \
AM_CPPFLAGS = \
@XCB_DAMAGE_CFLAGS@ \
@XCB_COMPOSITE_CFLAGS@ \
@XCB_DPMS_CFLAGS@ \
@ -19,7 +19,7 @@ INCLUDES = \
-I$(top_builddir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore_txt
else
INCLUDES = \
AM_CPPFLAGS = \
@Xcursor_cflags@ \
@XDAMAGE_CFLAGS@ \
@XCOMPOSITE_CFLAGS@ \
@ -37,10 +37,6 @@ INCLUDES = \
-I$(top_builddir)/src/lib/ecore_txt
endif
libecore_x_la_LDFLAGS = -version-info 1:0:0 \
-L$(top_builddir)/src/lib/ecore/.libs \
-L$(top_builddir)/src/lib/ecore_txt/.libs
if BUILD_ECORE_X_XCB
lib_LTLIBRARIES = libecore_x.la
@ -93,11 +89,13 @@ libecore_x_la_LIBADD = \
$(top_builddir)/src/lib/ecore/libecore.la \
$(top_builddir)/src/lib/ecore_txt/libecore_txt.la
libecore_x_la_LDFLAGS = -version-info @version_info@
libecore_x_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la \
$(top_builddir)/src/lib/ecore_txt/libecore_txt.la
endif
else
if BUILD_ECORE_X
@ -149,12 +147,16 @@ libecore_x_la_LIBADD = \
$(top_builddir)/src/lib/ecore/libecore.la \
$(top_builddir)/src/lib/ecore_txt/libecore_txt.la
libecore_x_la_LDFLAGS = -version-info @version_info@
libecore_x_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la \
$(top_builddir)/src/lib/ecore_txt/libecore_txt.la
endif
endif
EXTRA_DIST = \
Ecore_X.h \
Ecore_X_Atoms.h \