Menu
▾
▴
E CVS: apps/evfs doursse
|
From: Enlightenment C. <no...@cv...> - 2007-07-16 13:25:58
|
Enlightenment CVS committal
Author : doursse
Project : e17
Module : apps/evfs
Dir : e17/apps/evfs
Modified Files:
Makefile.am configure.in
Added Files:
evfs.pc.in
Removed Files:
evfs.pc
Log Message:
switch from *-config to pkg-config, add informations at the end of configure, clean up a bit the build process
===================================================================
RCS file: /cvs/e/e17/apps/evfs/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 5 Apr 2006 11:44:33 -0000 1.3
+++ Makefile.am 16 Jul 2007 13:25:22 -0000 1.4
@@ -24,8 +24,7 @@
debian/libevfs0-plugin-tar.install \
debian/rules \
debian/changelog.in \
- debian/changelog
-
-bin_SCRIPTS = evfs-config
-
+ debian/changelog
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = evfs.pc
===================================================================
RCS file: /cvs/e/e17/apps/evfs/configure.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- configure.in 5 Jul 2007 18:46:49 -0000 1.30
+++ configure.in 16 Jul 2007 13:25:22 -0000 1.31
@@ -11,10 +11,11 @@
AC_ISC_POSIX
AC_PROG_CC
AM_PROG_CC_STDC
+AM_PROG_CC_C_O
AC_HEADER_STDC
AM_PROG_LIBTOOL
-AC_C_BIGENDIAN
+AC_C_BIGENDIAN
AC_STRUCT_ST_BLKSIZE
AC_STRUCT_ST_BLOCKS
@@ -36,10 +37,11 @@
dnl Samba 3.0
dnl ******************************
-AC_ARG_ENABLE(samba, [ --disable-samba build without samba support])
+AC_ARG_ENABLE(samba, AC_HELP_STRING([--disable-samba],[build without samba support]))
msg_samba="no"
if test "x$enable_samba" != "xno"; then
- AC_ARG_WITH(samba-includes, [ --with-samba-includes=PREFIX Location of samba includes.],
+ AC_ARG_WITH(samba-includes,
+ AC_HELP_STRING([--with-samba-includes=PREFIX],[Location of samba includes.]),
with_samba_includes="$withval", with_samba_includes="/usr/include")
have_samba_includes="no"
if test "x${with_samba_includes}" != "xno"; then
@@ -50,7 +52,7 @@
CPPFLAGS="$CPPFLAGS -I$with_samba_includes"
AC_CHECK_HEADER(libsmbclient.h, [ samba_includes="yes" ])
CPPFLAGS="$CPPFLAGS_save"
-
+
if test "x{samba_includes}" != "xno" -a "x${samba_includes}" != "x"; then
have_samba_includes="yes"
if test "${with_samba_includes}" != "/usr/include" ; then
@@ -58,7 +60,7 @@
else
SAMBA_CFLAGS=""
fi
-
+
CPPFLAGS="$CPPFLAGS -I$with_samba_includes"
AC_CHECK_MEMBER(SMBCCTX.flags,
[AC_DEFINE(HAVE_SAMBA_FLAGS,, [Defined if flags availible in SMBCCTXT])],,
@@ -72,11 +74,12 @@
fi
fi
echo "have_samba_includes: ${have_samba_includes}"
- AC_ARG_WITH(samba-libs, [ --with-samba-libs=PREFIX Location of Samba libs.],
+ AC_ARG_WITH(samba-libs,
+ AC_HELP_STRING([--with-samba-libs=PREFIX],[Location of Samba libs.]),
with_samba_libs="$withval", with_samba_libs="/usr/lib")
if test "x${with_samba_libs}" != "xno" -a "x${have_samba_includes}" != "xno"; then
LDFLAGS_save="$LDFLAGS"
-
+
LDFLAGS="$LDFLAGS -L$with_samba_libs"
AC_CHECK_LIB(smbclient, smbc_new_context,samba_libs="yes", samba_libs="no")
LDFLAGS="$LDFLAGS_save"
@@ -86,7 +89,7 @@
if test x$with_samba_libs != x/usr/lib; then
SAMBA_LIBS="-L$with_samba_libs -lsmbclient"
else
- SAMBA_LIBS="-lsmbclient"
+ SAMBA_LIBS="-lsmbclient"
fi
else
SAMBA_CFLAGS=""
@@ -100,30 +103,15 @@
AC_SUBST(SAMBA_CFLAGS)
AC_SUBST(SAMBA_LIBS)
-
-dnl Check for libxml.
-AC_ARG_WITH(xml2,
- AC_HELP_STRING([--with-xml2=DIR],[use libxml2 found in DIR]),
- [CFLAGS="$CFLAGS -I$withval/include"
- LIBS="-L$withval/lib $LIBS"])
-
-AC_PATH_GENERIC(xml2, 2.3.10, [
- AC_SUBST(xml2_libs)
- AC_SUBST(xml2_cflags)],
- AC_MSG_ERROR(Cannot find libxml2: Is xml2-config in path?))
-xml2_libs=`xml2-config --libs`
-xml2_cflags=`xml2-config --cflags`
-
-
dnl Checking for Perl:
AC_PATH_PROG(PERL,perl,0)
AC_SUBST(PERL)
dnl Check for pkg-config stuff
-PKG_CHECK_MODULES(ECORE, [ecore ecore-desktop ecore-ipc])
-
-dnl Check for pkg-config stuff
+PKG_CHECK_MODULES(EET, [eet])
PKG_CHECK_MODULES(EVAS, [evas])
+PKG_CHECK_MODULES(ECORE, [ecore ecore-desktop ecore-ipc])
+PKG_CHECK_MODULES(XML2, [libxml-2.0 >= 2.3.10])
PROG="curl-config";
@@ -148,7 +136,7 @@
AC_CHECK_LIB(bz2, bzCompressInit, AC_DEFINE(HAVE_OLDER_BZIP2, 1, [Define to 1 if older bzip2 version is used]))
AC_CHECK_HEADERS(bzlib.h,
BZ2_LIBS="$BZ2_LIBS -lbz2",
- AC_MSG_WARN([evfs requires libbz2 to compile.])
+ AC_MSG_ERROR([evfs requires libbz2 to compile.])
)
AC_SUBST(BZ2_LIBS)
@@ -158,9 +146,6 @@
)
AC_SUBST(SQLITE_LIBS)
-dnl Check for pkg-config stuff
-PKG_CHECK_MODULES(EET, [eet])
-
PROG="taglib-config";
AC_PATH_PROG(TAGLIB_CONFIG, $PROG, "", $PATH)
msg_taglib="no"
@@ -276,16 +261,11 @@
AC_PATH_PROG(JADE, jade)
AM_CONDITIONAL(HAVE_JADE, test "x$JADE" != "x" && test -d "$DB_STYLESHEETS")
-dnl Volume monitor stuff
+dnl Volume monitor stuff
AC_CHECK_FUNCS(setmntent endmntent hasmntopt getmntinfo)
AC_CHECK_HEADERS(mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h sys/mntctl.h sys/vfs.h sys/vmount.h sys/sysctl.h fstab.h fnmatch.h)
-
-dnl Various conditionals
-AM_CONDITIONAL(BUILD_ECORE_DEPENDENT, test "$ecore" != "no")
-AC_DEFINE(HAVE_ECORE, 1, [Build with ecore])
-
AC_OUTPUT([
Makefile
src/Makefile
@@ -298,8 +278,31 @@
src/demo/Makefile
src/include/Makefile
src/common/Makefile
-evfs-config
+evfs.pc
debian/changelog
-], [
-chmod +x evfs-config
])
+
+#####################################################################
+## Info
+
+echo
+echo "------------------------------------------------------------------------"
+echo "$PACKAGE $VERSION"
+echo "------------------------------------------------------------------------"
+echo
+echo "Configuration Options Summary:"
+echo
+echo "Optional File Plugins:"
+echo " Samba.....................: $msg_samba"
+echo " Ftp.......................: $msg_curl"
+echo
+echo "Optional MetaData Plugins:"
+echo " Audio Tags................: $msg_taglib"
+echo " Extractor.................: $extractor"
+echo
+echo "------------------------------------------------------------------------"
+echo
+echo "Now type 'make' ('gmake' on some systems) to compile $PACKAGE,"
+echo "and then afterwards as root (or the user who will install this), type"
+echo "'make install'. Change users with 'su' or 'sudo' appropriately."
+echo
|