forked from enlightenment/efl
* fix DSO problem
* simplify a bit the autotools * add the possibility to disable the test SVN revision: 55499
This commit is contained in:
parent
ee1d0dbc23
commit
d8765063db
|
@ -52,7 +52,7 @@ AC_SUBST(VMAJ)
|
||||||
|
|
||||||
### Needed information
|
### Needed information
|
||||||
|
|
||||||
requirement_eeze="ecore >= 1.0.0 libudev"
|
requirement_eeze="ecore >= 1.0.0 eina >= 1.0.0 libudev"
|
||||||
|
|
||||||
|
|
||||||
### Checks for programs
|
### Checks for programs
|
||||||
|
@ -77,8 +77,7 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
|
||||||
|
|
||||||
### Checks for libraries
|
### Checks for libraries
|
||||||
|
|
||||||
PKG_CHECK_MODULES([ECORE], [ecore >= 1.0.0])
|
PKG_CHECK_MODULES([EEZE], [${requirement_eeze}])
|
||||||
PKG_CHECK_MODULES([LIBUDEV], [libudev])
|
|
||||||
|
|
||||||
udev_version=$(pkg-config libudev --modversion)
|
udev_version=$(pkg-config libudev --modversion)
|
||||||
|
|
||||||
|
@ -111,6 +110,10 @@ fi
|
||||||
EFL_COMPILER_FLAG([-Wshadow])
|
EFL_COMPILER_FLAG([-Wshadow])
|
||||||
|
|
||||||
|
|
||||||
|
### Binary
|
||||||
|
|
||||||
|
EFL_ENABLE_BIN([eeze-udev-test], ["yes"])
|
||||||
|
|
||||||
AC_SUBST(requirement_eeze)
|
AC_SUBST(requirement_eeze)
|
||||||
|
|
||||||
|
|
||||||
|
@ -137,6 +140,8 @@ echo "------------------------------------------------------------------------"
|
||||||
echo
|
echo
|
||||||
echo "Configuration Options Summary:"
|
echo "Configuration Options Summary:"
|
||||||
echo
|
echo
|
||||||
|
echo "Test...................: ${have_eeze_udev_test}"
|
||||||
|
echo
|
||||||
echo "Documentation..........: ${build_doc}"
|
echo "Documentation..........: ${build_doc}"
|
||||||
echo
|
echo
|
||||||
echo "Compilation............: make (or gmake)"
|
echo "Compilation............: make (or gmake)"
|
||||||
|
|
|
@ -0,0 +1,78 @@
|
||||||
|
dnl Copyright (C) 2010 Vincent Torri <vtorri at univ-evry dot fr>
|
||||||
|
dnl That code is public domain and can be freely used or copied.
|
||||||
|
|
||||||
|
dnl Macro that checks if a binary is built or not
|
||||||
|
|
||||||
|
dnl Usage: EFL_ENABLE_BIN(binary, dep[, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
|
||||||
|
dnl Call AC_SUBST(BINARY_PRG) (BINARY is the uppercase of binary, - being transformed into _)
|
||||||
|
dnl Define have_binary (- is transformed into _)
|
||||||
|
dnl Define conditional BUILD_BINARY (BINARY is the uppercase of binary, - being transformed into _)
|
||||||
|
|
||||||
|
AC_DEFUN([EFL_ENABLE_BIN],
|
||||||
|
[
|
||||||
|
|
||||||
|
m4_pushdef([UP], m4_translit([[$1]], [-a-z], [_A-Z]))dnl
|
||||||
|
m4_pushdef([DOWN], m4_translit([[$1]], [-A-Z], [_a-z]))dnl
|
||||||
|
|
||||||
|
dnl configure option
|
||||||
|
|
||||||
|
AC_ARG_ENABLE([$1],
|
||||||
|
[AC_HELP_STRING([--disable-$1], [disable building of ]DOWN)],
|
||||||
|
[
|
||||||
|
if test "x${enableval}" = "xyes" ; then
|
||||||
|
have_[]m4_defn([DOWN])="yes"
|
||||||
|
else
|
||||||
|
have_[]m4_defn([DOWN])="no"
|
||||||
|
fi
|
||||||
|
],
|
||||||
|
[have_[]m4_defn([DOWN])=$2])
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([whether to build ]DOWN[ binary])
|
||||||
|
AC_MSG_RESULT([$have_[]m4_defn([DOWN])])
|
||||||
|
|
||||||
|
if test "x$have_[]m4_defn([DOWN])" = "xyes"; then
|
||||||
|
UP[]_PRG=DOWN[${EXEEXT}]
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_SUBST(UP[]_PRG)
|
||||||
|
|
||||||
|
AM_CONDITIONAL(BUILD_[]UP, test "x$have_[]m4_defn([DOWN])" = "xyes")
|
||||||
|
|
||||||
|
AS_IF([test "x$have_[]m4_defn([DOWN])" = "xyes"], [$3], [$4])
|
||||||
|
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl Macro that specifies the binary to be used
|
||||||
|
|
||||||
|
dnl Usage: EFL_WITH_BIN(binary, package, msg)
|
||||||
|
dnl Call AC_SUBST(BINARY_PRG) (BINARY is the uppercase of binary, - being transformed into _)
|
||||||
|
dnl Define with_binary (- is transformed into _)
|
||||||
|
dnl Define conditional BUILD_BINARY (BINARY is the uppercase of binary, - being transformed into _)
|
||||||
|
|
||||||
|
AC_DEFUN([EFL_WITH_BIN],
|
||||||
|
[
|
||||||
|
|
||||||
|
m4_pushdef([UP], m4_translit([[$1]], [-a-z], [_A-Z]))dnl
|
||||||
|
m4_pushdef([DOWN], m4_translit([[$1]], [-A-Z], [_a-z]))dnl
|
||||||
|
|
||||||
|
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||||
|
AC_MSG_NOTICE([$PKG_CONFIG])
|
||||||
|
|
||||||
|
with_[]m4_defn([DOWN])=m4_esyscmd($PKG_CONFIG --variable=prefix $2)/bin/m4_defn([DOWN])
|
||||||
|
|
||||||
|
dnl configure option
|
||||||
|
|
||||||
|
AC_ARG_WITH([$1],
|
||||||
|
[AC_HELP_STRING([--with-$1-bin=PATH], [specify a specific path to ]DOWN)],
|
||||||
|
[
|
||||||
|
with_[]m4_defn([DOWN])=$withval
|
||||||
|
_efl_msg="( explicitely set)"
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_MSG_NOTICE([$msg: ]m4_defn([DOWN])[$_efl_msg])
|
||||||
|
|
||||||
|
AC_SUBST(with_[]m4_defn([DOWN]))
|
||||||
|
|
||||||
|
AS_IF([test "x$have_[]m4_defn([DOWN])" = "xyes"], [$4], [$5])
|
||||||
|
|
||||||
|
])
|
|
@ -1,14 +1,8 @@
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
EEZE_CPPFLAGS = \
|
bin_PROGRAMS = @EEZE_UDEV_TEST_PRG@
|
||||||
-I$(top_srcdir)/src/lib \
|
EXTRA_PROGRAMS = eeze_udev_test
|
||||||
@ECORE_CFLAGS@ \
|
|
||||||
@LIBUDEV_CFLAGS@
|
|
||||||
|
|
||||||
EEZE_UDEV_PROG = eeze_udev_test
|
|
||||||
|
|
||||||
bin_PROGRAMS = eeze_udev_test
|
|
||||||
|
|
||||||
eeze_udev_test_SOURCES = eeze_udev_test.c
|
eeze_udev_test_SOURCES = eeze_udev_test.c
|
||||||
eeze_udev_test_CPPFLAGS = $(EEZE_CPPFLAGS)
|
eeze_udev_test_CPPFLAGS = -I$(top_srcdir)/src/lib @EEZE_CFLAGS@
|
||||||
eeze_udev_test_LDADD = $(top_builddir)/src/lib/libeeze.la
|
eeze_udev_test_LDADD = $(top_builddir)/src/lib/libeeze.la @EEZE_LIBS@
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
AM_CPPFLAGS = @ECORE_CFLAGS@ @LIBUDEV_CFLAGS@
|
AM_CPPFLAGS = @EEZE_CFLAGS@
|
||||||
|
|
||||||
lib_LTLIBRARIES = libeeze.la
|
lib_LTLIBRARIES = libeeze.la
|
||||||
includes_HEADERS = Eeze.h
|
includes_HEADERS = Eeze.h
|
||||||
|
@ -14,7 +14,7 @@ eeze_udev_find.c \
|
||||||
eeze_udev_walk.c \
|
eeze_udev_walk.c \
|
||||||
eeze_udev_private.c
|
eeze_udev_private.c
|
||||||
|
|
||||||
libeeze_la_LIBADD = @ECORE_LIBS@ @LIBUDEV_LIBS@
|
libeeze_la_LIBADD = @EEZE_LIBS@
|
||||||
libeeze_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
|
libeeze_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
|
||||||
|
|
||||||
EXTRA_DIST = eeze_udev_private.h
|
EXTRA_DIST = eeze_udev_private.h
|
||||||
|
|
Loading…
Reference in New Issue