forked from enlightenment/efl
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 and c++ compilers * 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 some hardcoded gcc compiler flags SVN revision: 32346
This commit is contained in:
parent
50240194f5
commit
c4a6c0dea6
|
@ -1,7 +1,12 @@
|
||||||
AC_INIT(configure.in)
|
rm -f config.cache
|
||||||
|
|
||||||
|
AC_INIT(efreet, 0.0.3.006, enlightenment-devel@lists.sourceforge.net)
|
||||||
|
AC_PREREQ(2.52)
|
||||||
|
AC_CONFIG_SRCDIR(configure.in)
|
||||||
AC_CANONICAL_BUILD
|
AC_CANONICAL_BUILD
|
||||||
AC_CANONICAL_HOST
|
AC_CANONICAL_HOST
|
||||||
AM_INIT_AUTOMAKE(efreet, 0.0.3.006)
|
|
||||||
|
AM_INIT_AUTOMAKE(1.6 dist-bzip2)
|
||||||
AM_CONFIG_HEADER(config.h)
|
AM_CONFIG_HEADER(config.h)
|
||||||
|
|
||||||
AC_ISC_POSIX
|
AC_ISC_POSIX
|
||||||
|
@ -9,13 +14,21 @@ AC_PROG_CC
|
||||||
AM_PROG_CC_STDC
|
AM_PROG_CC_STDC
|
||||||
AC_HEADER_STDC
|
AC_HEADER_STDC
|
||||||
AC_C_CONST
|
AC_C_CONST
|
||||||
AM_ENABLE_SHARED
|
|
||||||
AM_PROG_LIBTOOL
|
|
||||||
AC_FUNC_ALLOCA
|
|
||||||
AC_C___ATTRIBUTE__
|
AC_C___ATTRIBUTE__
|
||||||
|
|
||||||
dnl Set PACKAGE_DATA_DIR in config.h.
|
AC_LIBTOOL_WIN32_DLL
|
||||||
AC_DEFINE_DIR([PACKAGE_DATA_DIR], [datadir], [Shared Data Directory.])
|
define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
|
||||||
|
define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
|
||||||
|
AC_PROG_LIBTOOL
|
||||||
|
|
||||||
|
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)
|
||||||
|
|
||||||
|
AC_FUNC_ALLOCA
|
||||||
|
|
||||||
PCFLAGS=$CFLAGS
|
PCFLAGS=$CFLAGS
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,13 @@ SUBDIRS = data compare
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
INCLUDES = \
|
AM_CPPFLAGS = \
|
||||||
-I. -I$(top_srcdir)/src/lib @ECORE_CFLAGS@
|
-I. \
|
||||||
|
-I$(top_srcdir)/src/lib \
|
||||||
|
@ECORE_CFLAGS@ \
|
||||||
|
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
||||||
|
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
||||||
|
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\"
|
||||||
|
|
||||||
bin_PROGRAMS = efreet_test efreet_spec_test efreet_cache_test
|
bin_PROGRAMS = efreet_test efreet_spec_test efreet_cache_test
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
INCLUDES = \
|
AM_CPPFLAGS = \
|
||||||
-I. -I$(top_srcdir)/src/lib @ECORE_CFLAGS@
|
-I. \
|
||||||
|
-I$(top_srcdir)/src/lib \
|
||||||
|
@ECORE_CFLAGS@
|
||||||
|
|
||||||
bin_PROGRAMS = efreet_alloc efreet_menu_alloc
|
bin_PROGRAMS = efreet_alloc efreet_menu_alloc
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
SUBDIRS = sub
|
SUBDIRS = sub
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
testdir = $(pkgdatadir)/test
|
testdir = $(pkgdatadir)/test
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
|
|
||||||
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
testdir = $(pkgdatadir)/test/sub
|
testdir = $(pkgdatadir)/test/sub
|
||||||
test_DATA = \
|
test_DATA = \
|
||||||
test.desktop
|
test.desktop
|
||||||
|
|
||||||
EXTRA_DIST = $(test_DATA)
|
EXTRA_DIST = $(test_DATA)
|
||||||
|
|
|
@ -1,10 +1,9 @@
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
INCLUDES = \
|
AM_CPPFLAGS = \
|
||||||
-I$(top_builddir) \
|
-I$(top_builddir) \
|
||||||
-I$(top_srcdir) \
|
-I$(top_srcdir) \
|
||||||
-g -O0 -W -Wall \
|
|
||||||
@ECORE_CFLAGS@
|
@ECORE_CFLAGS@
|
||||||
|
|
||||||
lib_LTLIBRARIES = libefreet.la libefreet_mime.la
|
lib_LTLIBRARIES = libefreet.la libefreet_mime.la
|
||||||
|
@ -48,6 +47,6 @@ installed_headersdir = $(prefix)/include/efreet
|
||||||
installed_headers_DATA = $(EFREETHEADERS) $(EFREETMIMEHEADERS)
|
installed_headers_DATA = $(EFREETHEADERS) $(EFREETMIMEHEADERS)
|
||||||
|
|
||||||
libefreet_la_LIBADD = @ECORE_LIBS@
|
libefreet_la_LIBADD = @ECORE_LIBS@
|
||||||
libefreet_la_LDFLAGS = -version-info 1:0:0
|
libefreet_la_LDFLAGS = -version-info @version_info@
|
||||||
|
|
||||||
libefreet_mime_la_LIBADD = @ECORE_LIBS@ libefreet.la
|
libefreet_mime_la_LIBADD = @ECORE_LIBS@ libefreet.la
|
||||||
|
|
Loading…
Reference in New Issue