Enlightenment CVS committal
Author : kwo
Project : e16
Module : epplets
Dir : e16/epplets
Modified Files:
.cvsignore configure.in
Log Message:
New AC_INIT, autofoo cleanups. Bump version.
===================================================================
RCS file: /cvs/e/e16/epplets/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- .cvsignore 18 Mar 2007 01:08:10 -0000 1.6
+++ .cvsignore 11 Nov 2007 17:51:14 -0000 1.7
@@ -1,3 +1,6 @@
+.git
+.gitignore
+compile
config.log
config.sub
config.cache
===================================================================
RCS file: /cvs/e/e16/epplets/configure.in,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- configure.in 3 May 2007 22:01:53 -0000 1.51
+++ configure.in 11 Nov 2007 17:51:14 -0000 1.52
@@ -1,22 +1,14 @@
-AC_INIT(configure.in)
-
-E_PKG_VERSION=0.10
-#E_PKG_REVISION=0.01
-if test "x$E_PKG_REVISION" != "x"; then
- E_PKG_VER_REV=$E_PKG_VERSION-$E_PKG_REVISION
- E_RPM_REVISION=$E_PKG_REVISION
-else
- E_PKG_VER_REV=$E_PKG_VERSION
- E_RPM_REVISION=1
-fi
-
-AM_INIT_AUTOMAKE(epplets, $E_PKG_VER_REV)
-
-AC_DEFINE_UNQUOTED(E_PKG_VERSION, "$E_PKG_VERSION", [Version])
-AC_SUBST(E_PKG_VERSION)
-AC_DEFINE_UNQUOTED(E_PKG_REVISION, "$E_PKG_REVISION", [Revision])
-AC_SUBST(E_PKG_REVISION)
-AC_SUBST(E_RPM_REVISION)
+m4_define([pkg_version], [0.11])
+m4_define([pkg_revision], [0.00])
+m4_define([pkg_ver_rev], m4_ifdef([pkg_revision], [pkg_version-pkg_revision],
[pkg_version]))
+m4_define([rpm_revision], m4_ifdef([pkg_revision], [pkg_revision], [1]))
+
+AC_INIT(epplets, [pkg_ver_rev], [EMAIL PROTECTED])
+AM_INIT_AUTOMAKE([foreign])
+
+AC_DEFINE(E_PKG_VERSION, ["pkg_version"], [Version])
+AC_SUBST(E_PKG_VERSION, [pkg_version])
+AC_SUBST(E_RPM_REVISION, [rpm_revision])
# reasonable guesses for where stuff is installed
if test "x$prefix" = "xNONE"; then
@@ -38,7 +30,11 @@
dnl# At least make the attempt to support CygWin32
AC_CYGWIN
-AM_PROG_LIBTOOL
+define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
+define([AC_LIBTOOL_LANG_GCJ_CONFIG], [:])dnl
+AC_ENABLE_SHARED
+AC_PROG_LIBTOOL
AC_GCC_TRADITIONAL
@@ -65,14 +61,8 @@
AC_C_CONST
AC_C_INLINE
-AC_PATH_XTRA
-if test "$ac_cv_lib_socket_connect" = "yes" ; then
- SUBLIBS="-lsocket"
-fi
-if test "$ac_cv_lib_nsl_gethostbyname" = "yes" ; then
- SUBLIBS="$SUBLIBS -lnsl"
-fi
+AC_PATH_XTRA
dnl# Checks for header files.
AC_HEADER_SYS_WAIT
@@ -89,40 +79,6 @@
AC_CHECK_FUNCS(snprintf, x=1, x=0)
AC_SUBST(HAVE_SNPRINTF, $x)
AM_CONDITIONAL(BUILD_SNPRINTF, test "x$x" = "x0")
-
-# ok enlightenment d00ds want to ignore civilization and install
-# everything in one place. The rest of use prefer sanity.
-#
-AC_ARG_ENABLE(fsstd,
- [ --enable-fsstd install files following FSSTD
@<:@default=yes@:>@],,
- enable_fsstd=yes)
-if test "x$enable_fsstd" = "xyes"; then
- ENLIGHTENMENT_ROOT=${datadir}/e16
- ENLIGHTENMENT_BIN=${bindir}
- USE_FSSTD=yes
-else
- ENLIGHTENMENT_ROOT=${prefix}/e16
- ENLIGHTENMENT_BIN=${prefix}/e16/bin
- USE_FSSTD=no
-fi
-EROOT=`eval echo $ENLIGHTENMENT_ROOT`
-AC_SUBST(EROOT)
-
-dnl#
-dnl# X LIBRARIES
-dnl#
-AC_CHECK_LIB(X11, XOpenDisplay, X_LIBS="$X_LIBS -lX11", [
-echo "ERROR: You need libX11 to build Epplets. Verify that you have libX11.a
or";
-echo " libX11.so installed and that it is located in the X libraries";
-echo " directory shown above. If it is in a different directory, try
using";
-echo " the --x-libraries parameter to configure.";
- AC_MSG_ERROR([Fatal: libX11 not found.])], $X_LIBS $SUBLIBS)
-AC_CHECK_LIB(Xext, XextAddDisplay, X_LIBS="-lXext $X_LIBS", [
-echo "ERROR: You need libXext to build Epplets. Verify that you have
libXext.a or";
-echo " libXext.so installed and that it is located in the X libraries";
-echo " directory shown above. If it is in a different directory, try
using";
-echo " the --x-libraries parameter to configure.";
- AC_MSG_ERROR([Fatal: libXext not found.])], $X_LIBS $SUBLIBS)
AC_ARG_ENABLE(glx,
[ --enable-glx build with GLX support @<:@default=yes@:>@],,
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
