diff --git a/acinclude.m4 b/acinclude.m4 index 2118bdc..e23b0b5 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,8 +1,52 @@ +dnl as-ac-expand.m4 0.1.0 +dnl autostars m4 macro for expanding directories using configure's prefix +dnl thomas@apestaart.org + +dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR) +dnl +dnl example +dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) +dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local + +AC_DEFUN([AS_AC_EXPAND], +[ + EXP_VAR=[$1] + FROM_VAR=[$2] + + dnl first expand prefix and exec_prefix if necessary + prefix_save=$prefix + exec_prefix_save=$exec_prefix + + dnl if no prefix given, then use /usr/local, the default prefix + if test "x$prefix" = "xNONE"; then + prefix=$ac_default_prefix + fi + dnl if no exec_prefix given, then use prefix + if test "x$exec_prefix" = "xNONE"; then + exec_prefix=$prefix + fi + + full_var="$FROM_VAR" + dnl loop until it doesn't change anymore + while true; do + new_full_var="`eval echo $full_var`" + if test "x$new_full_var"="x$full_var"; then break; fi + full_var=$new_full_var + done + + dnl clean up + full_var=$new_full_var + AC_SUBST([$1], "$full_var") + + dnl restore prefix and exec_prefix + prefix=$prefix_save + exec_prefix=$exec_prefix_save +]) dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page dnl also defines GSTUFF_PKG_ERRORS on error -AC_DEFUN(PKG_CHECK_MODULES, [ +AC_DEFUN([PKG_CHECK_MODULES], [ succeeded=no if test -z "$PKG_CONFIG"; then diff --git a/autogen.sh b/autogen.sh index ff2037e..a415b7c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -7,7 +7,7 @@ srcdir=${srcdir:-.} # default version requirements ... REQUIRED_AUTOCONF_VERSION=${REQUIRED_AUTOCONF_VERSION:-2.53} -REQUIRED_AUTOMAKE_VERSION=${REQUIRED_AUTOMAKE_VERSION:-1.9} +REQUIRED_AUTOMAKE_VERSION=${REQUIRED_AUTOMAKE_VERSION:-1.8} REQUIRED_LIBTOOL_VERSION=${REQUIRED_LIBTOOL_VERSION:-1.4.3} REQUIRED_GETTEXT_VERSION=${REQUIRED_GETTEXT_VERSION:-0.10.40} REQUIRED_GLIB_GETTEXT_VERSION=${REQUIRED_GLIB_GETTEXT_VERSION:-2.2.0} diff --git a/configure.ac b/configure.ac index a1e7a7f..eabfab2 100644 --- a/configure.ac +++ b/configure.ac @@ -158,75 +158,20 @@ AC_DEFINE_UNQUOTED(LINUX, "1", [Badly named building-under-autoconf variable]) #####3 Directory management - from dbus' configure.in -#### Have to go $localstatedir->$prefix/var->/usr/local/var -#### someone please fix this a better way... - -#### find the actual value for $prefix that we'll end up with -## (I know this is broken and should be done in the Makefile, but -## that's a major pain and almost nobody actually seems to care) -REAL_PREFIX= -if test "x$prefix" = "xNONE"; then - REAL_PREFIX=$ac_default_prefix -else - REAL_PREFIX=$prefix -fi - -## temporarily change prefix and exec_prefix -old_prefix=$prefix -prefix=$REAL_PREFIX - -if test "x$exec_prefix" = xNONE ; then - REAL_EXEC_PREFIX=$REAL_PREFIX -else - REAL_EXEC_PREFIX=$exec_prefix -fi -old_exec_prefix=$exec_prefix -exec_prefix=$REAL_EXEC_PREFIX - -## eval everything -LOCALSTATEDIR_TMP="$localstatedir" -EXPANDED_LOCALSTATEDIR=`eval echo $LOCALSTATEDIR_TMP` -AC_SUBST(EXPANDED_LOCALSTATEDIR) - -PKGLIBEXECDIR_TMP="$libexecdir/$PACKAGE" -EXPANDED_PKGLIBEXECDIR=`eval echo $PKGLIBEXECDIR_TMP` -AC_SUBST(EXPANDED_PKGLIBEXECDIR) - -# hack. $datadir by default doesn't get expanded, you're supposed to -# fiddle with it at make time, not configure. See autoconf manual, -# "Installation Directory Variables" -#DATADIR_TMP="$datadir" -DATADIR_TMP="$prefix/share" -EXPANDED_DATADIR=`eval echo $DATADIR_TMP` -AC_SUBST(EXPANDED_DATADIR) - -SYSCONFDIR_TMP="$sysconfdir" -EXPANDED_SYSCONFDIR=`eval echo $SYSCONFDIR_TMP` -AC_SUBST(EXPANDED_SYSCONFDIR) - -BINDIR_TMP="$bindir" -EXPANDED_BINDIR=`eval echo $BINDIR_TMP` -AC_SUBST(EXPANDED_BINDIR) - -SBINDIR_TMP="$sbindir" -EXPANDED_SBINDIR=`eval echo $SBINDIR_TMP` -AC_SUBST(EXPANDED_SBINDIR) - -LIBDIR_TMP="$libdir" -EXPANDED_LIBDIR=`eval echo $LIBDIR_TMP` -AC_SUBST(EXPANDED_LIBDIR) - -## put prefix and exec_prefix back -prefix=$old_prefix -exec_prefix=$old_exec_prefix +AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir) +AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) +AS_AC_EXPAND(DATADIR, $datadir) +AS_AC_EXPAND(BINDIR, $bindir) +AS_AC_EXPAND(SBINDIR, $sbindir) +AS_AC_EXPAND(LIBDIR, $libdir) ### Paths -XPL_DEFAULT_DATA_DIR=${EXPANDED_DATADIR}/bongo +XPL_DEFAULT_DATA_DIR=${DATADIR}/bongo AC_SUBST(XPL_DEFAULT_DATA_DIR) AC_DEFINE_UNQUOTED(XPL_DEFAULT_DATA_DIR, "$XPL_DEFAULT_DATA_DIR", [Default data directory]) -XPL_DEFAULT_STATE_DIR=${EXPANDED_LOCALSTATEDIR}/bongo +XPL_DEFAULT_STATE_DIR=${LOCALSTATEDIR}/bongo AC_SUBST(XPL_DEFAULT_STATE_DIR) AC_DEFINE_UNQUOTED(XPL_DEFAULT_STATE_DIR, "$XPL_DEFAULT_STATE_DIR", [Default state directory]) @@ -242,19 +187,19 @@ XPL_DEFAULT_CACHE_DIR=${XPL_DEFAULT_STATE_DIR}/cache AC_SUBST(XPL_DEFAULT_CACHE_DIR) AC_DEFINE_UNQUOTED(XPL_DEFAULT_CACHE_DIR, "$XPL_DEFAULT_CACHE_DIR", [Default cache directory]) -XPL_DEFAULT_BIN_DIR=${EXPANDED_SBINDIR} +XPL_DEFAULT_BIN_DIR=${SBINDIR} AC_SUBST(XPL_DEFAULT_BIN_DIR) AC_DEFINE_UNQUOTED(XPL_DEFAULT_BIN_DIR, "$XPL_DEFAULT_BIN_DIR", [Default binary directory]) -XPL_DEFAULT_LIB_DIR=${EXPANDED_LIBDIR} +XPL_DEFAULT_LIB_DIR=${LIBDIR} AC_SUBST(XPL_DEFAULT_LIB_DIR) AC_DEFINE_UNQUOTED(XPL_DEFAULT_LIB_DIR, "$XPL_DEFAULT_LIB_DIR", [Default library directory]) -XPL_DEFAULT_CONF_DIR=${EXPANDED_SYSCONFDIR}/bongo +XPL_DEFAULT_CONF_DIR=${SYSCONFDIR}/bongo AC_SUBST(XPL_DEFAULT_CONF_DIR) AC_DEFINE_UNQUOTED(XPL_DEFAULT_CONF_DIR, "$XPL_DEFAULT_CONF_DIR", [Default config directory]) -XPL_DEFAULT_NLS_DIR=${EXPANDED_DATADIR}/bongo/nls +XPL_DEFAULT_NLS_DIR=${DATADIR}/bongo/nls AC_SUBST(XPL_DEFAULT_NLS_DIR) AC_DEFINE_UNQUOTED(XPL_DEFAULT_NLS_DIR, "$XPL_DEFAULT_NLS_DIR", [Default nls directory]) diff --git a/import/clucene/m4/dps_float_byte.m4 b/import/clucene/m4/dps_float_byte.m4 index 6f1481f..b5f9944 100644 --- a/import/clucene/m4/dps_float_byte.m4 +++ b/import/clucene/m4/dps_float_byte.m4 @@ -3,8 +3,8 @@ AC_DEFUN([dps_float_byte], [AC_MSG_CHECKING(whether ${CXX} supports our byte<->float conversions) AC_CACHE_VAL(mdl_cv_have_float_byte_support, [ AC_TRY_RUN( - changequote(<<<, >>>)dnl - <<< + changequote(<:<, >:>)dnl + <:< typedef long double float_t; typedef long int32_t; typedef char uint8_t; @@ -80,7 +80,7 @@ AC_DEFUN([dps_float_byte], return 0; } ->>> +>:> changequote([, ]), dps_float_byte_fail=0, dps_float_byte_fail=1, dps_float_byte_fail=2 )] @@ -97,4 +97,4 @@ AC_DEFUN([dps_float_byte], AC_DEFINE([HAVE_NO_FLOAT_BYTE], [], [Does not support new float byte<->float conversions]) fi -]) \ No newline at end of file +]) diff --git a/import/clucene/m4/dps_static_const_type.m4 b/import/clucene/m4/dps_static_const_type.m4 index 725bbf1..c9be7fa 100644 --- a/import/clucene/m4/dps_static_const_type.m4 +++ b/import/clucene/m4/dps_static_const_type.m4 @@ -30,4 +30,4 @@ AC_DEFUN([dps_static_const], AC_MSG_ERROR([Cannot figure out how to write static consts in classes. Check the m4 script or upgrade your compiler]) fi -]) \ No newline at end of file +])