[FriBidi-commit]
fribidi ChangeLog, 1.60.2.17, 1.60.2.18 Makefile.am,
1.30.2.11, 1.30.2.12 acconfig.h, 1.4.2.1, NONE acinclude.m4,
1.4, NONE bootstrap, 1.12.2.1, 1.12.2.2 configure.in,
1.22.2.10, 1.22.2.11 stamp-h.in, 1.1.1.1, NONE
Behdad Esfahbod
behdad at freedesktop.org
Sun Sep 25 11:38:38 PDT 2005
Update of /cvs/fribidi/fribidi
In directory gabe:/tmp/cvs-serv9887
Modified Files:
Tag: STABLE
ChangeLog Makefile.am bootstrap configure.in
Removed Files:
Tag: STABLE
acconfig.h acinclude.m4 stamp-h.in
Log Message:
2005-09-25 Behdad Esfahbod <behdad at gnu.org>
* Makefile.am, bootstrap, configure.in: More update from the
fribidi2 tree, and voodoo to make it all work.
* acconfig.h, acinclude.m4, stamp-h.in: Removed, you generated
bastards!
Index: ChangeLog
===================================================================
RCS file: /cvs/fribidi/fribidi/ChangeLog,v
retrieving revision 1.60.2.17
retrieving revision 1.60.2.18
diff -u -d -r1.60.2.17 -r1.60.2.18
--- ChangeLog 25 Sep 2005 17:37:44 -0000 1.60.2.17
+++ ChangeLog 25 Sep 2005 18:38:36 -0000 1.60.2.18
@@ -1,6 +1,10 @@
2005-09-25 Behdad Esfahbod <behdad at gnu.org>
* configure.in: Updated to new autoconf/automake syntax. Copied
from fribidi2 tree.
+ * Makefile.am, bootstrap, configure.in: More update from the
+ fribidi2 tree, and voodoo to make it all work.
+ * acconfig.h, acinclude.m4, stamp-h.in: Removed, you generated
+ bastards!
2005-06-08 Behdad Esfahbod <fribidi at behdad.org>
* NEWS, README, AUTHORS, THANKS: Updated.
Index: Makefile.am
===================================================================
RCS file: /cvs/fribidi/fribidi/Makefile.am,v
retrieving revision 1.30.2.11
retrieving revision 1.30.2.12
diff -u -d -r1.30.2.11 -r1.30.2.12
--- Makefile.am 8 Jun 2005 19:01:22 -0000 1.30.2.11
+++ Makefile.am 25 Sep 2005 18:38:36 -0000 1.30.2.12
@@ -222,7 +222,12 @@
$(srcdir)/ltmain.sh \
$(srcdir)/missing \
`find "$(srcdir)" -type f -name Makefile.in -print` \
- `find "$(srcdir)" -type f -name "*~" -print`
+ `find "$(srcdir)" -type f -name "*~" -print` \
+ `$(srcdir)/bootstrap --write-configure`
+# The last line above is a horrible hack.
+# GNU Coding Standards recommends that `make maintainer-clean' should not
+# remove the configure script.
+# We instead make configure call bootstrap.
# Indent all C source and header files, using indent(1):
--- acconfig.h DELETED ---
--- acinclude.m4 DELETED ---
Index: bootstrap
===================================================================
RCS file: /cvs/fribidi/fribidi/bootstrap,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -d -r1.12.2.1 -r1.12.2.2
--- bootstrap 7 Jun 2005 13:37:31 -0000 1.12.2.1
+++ bootstrap 25 Sep 2005 18:38:36 -0000 1.12.2.2
@@ -1,7 +1,161 @@
#! /bin/sh
+##############################################################################
+# $Id$
+# $Author: behdad
+# $Date$
+# $Revision$
+# $Source$
+##############################################################################
+# -*- Bootstrap -*-
+# Run this file to produce a configure script.
-libtoolize --copy --force --automake &&
-aclocal --force &&
-autoheader --force &&
-automake --add-missing --copy --force &&
-autoconf --force
+DEFAULT_BOOTSTRAPFLAGS="--force --install --autoreconf=auto"
+DEFAULT_CONFIGUREFLAGS="--enable-maintainer-mode --enable-compile-warnings"
+
+OLDDIR=`pwd`
+
+# move to source dir
+DIR=`echo $0 | sed 's,[^/]*$,,'`
+test -n "$DIR" && cd "$DIR"
+
+if test "$1" = --write-configure; then
+ test -f configure && \
+ ((echo '#! /bin/sh
+ DIR=`echo $0 | sed "s,[^/]*\$,,"`
+ exec ${DIR}bootstrap --configure -- "$@"' > configure \
+ && chmod a+x configure) || \
+ echo Failed writing to configure >&2)
+
+ exit $?
+fi
+
+# check if we are invoked as configure, or bootstrap
+BASE=`echo $0 | sed 's,.*/,,'`
+if test "$BASE" = "configure"; then
+ CONFIG=--config
+ EXTRA_CONFIGUREFLAGS=$@
+else # bootstrap
+ EXTRA_BOOTSTRAPFLAGS=$*
+fi
+
+for arg in $DEFAULT_BOOTSTRAPFLAGS $BOOTSTRAPFLAGS $EXTRA_BOOTSTRAPFLAGS
+do
+if test -n "$DASHDASHFLAGS"; then
+ DASHDASHFLAGS="$DASHDASHFLAGS $arg"
+else
+ case $arg in
+ -h|--h|--he|--hel|--help)
+ HELP=--help ;;
+ -V|--vers|--versi|--versio|--version)
+ VERSION=--version ;;
+ -v|--verb|--verbo|--verbos|--verbose)
+ VERBOSE=--verbose ;;
+ -d|--de|--deb|--debu|--debug)
+ DEBUG=--debug ;;
+ -W|--w|--wa|--war|--warn|--warni|--warnin|--warning|--warnings|--warnings=yes|--warnings=all)
+ WARNS=--warnings=all ;;
+ --no-w|--no-wa|--no-war|--no-warn|--no-warni|--no-warnin|--no-warning|--no-warnings|--warn=no|--warning=no|--warnings=no)
+ WARNS=--warnings=none ;;
+ --w=*|--wa=*|--war=*|--warn=*|--warni=*|--warnin=*|--warning=*|--warnings=*)
+ WARNS=$arg ;;
+ -f|--f|--fo|--for|--forc|--force|--forced|--force=yes|--force-missing)
+ FORCE=--force ;;
+ --no-f|--no-fo|--no-for|--no-forc|--no-force|--no-forced|--force=no)
+ FORCE=--no-force ;;
+ -i|--i|--in|--ins|--inst|--insta|--instal|--install|--install=yes|-a|--add-missing)
+ INSTALL=--install ;;
+ --no-i|--no-in|--no-ins|--no-inst|--no-insta|--no-instal|--no-install|--install=no)
+ INSTALL= ;;
+ -s|--s|--sy|--sym|--syml|--symli|--symlin|--symlink|--symlink=yes|--no-copy|--copy=no)
+ SYMLINK=--symlink ;;
+ --no-s|--no-sy|--no-sym|--no-syml|--no-symli|--no-symlin|--no-symlink|--symlink=no|--copy|--copy=yes)
+ SYMLINK= ;;
+ -m|--m|--ma|--mak|--make|--make=yes)
+ MAKE=--make
+ CONFIG=--configure ;;
+ --no-m|--no-ma|--no-mak|--no-make|--make=no)
+ MAKE= ;;
+ -c|--c|--co|--con|--conf|--confi|--config|--configu|--configur|--configure|--configure=yes)
+ CONFIG=--configure ;;
+ --no-c|--no-co|--no-con|--no-conf|--no-confi|--no-config|--no-configu|--no-configur|--no-configure|--configure=no)
+ CONFIG= ;;
+ -n|--dr|--dry|--dry-|--dry-r|--dry-ru|--dry-run)
+ DRYRUN=echo ;;
+ --auto|--autoreconf=auto)
+ AUTORECONF=auto ;;
+ --autoreconf|--autoreconf=yes)
+ AUTORECONF=yes ;;
+ --no-autoreconf|--autoreconf=no)
+ AUTORECONF= ;;
+ --)
+ DASHDASHFLAGS=" " ;;
+ *)
+ echo Ignoring unknown parameter $arg
+ esac
+fi
+done
+
+test -z "$SYMLINK" && COPY=--copy
+test -n "$INSTALL" && ADDMISSING=--add-missing
+
+# use autoreconf if possible, just check for version 2+
+if test "$AUTORECONF" = auto; then
+ case `autoreconf --version 2>/dev/null` in
+ *"autoreconf (GNU Autoconf) 2."* )
+ echo Usable autoreconf found, running
+ ;;
+ *)
+ AUTORECONF=
+ ;;
+ esac
+fi
+
+if test -n "$AUTORECONF"; then
+ $DRYRUN autoreconf $HELP $VERSION $VERBOSE $DEBUG $FORCE $INSTALL $SYMLINK $MAKE $WARNS $AUTORECONFFLAGS || exit $?
+else
+
+# add files 'config.guess', 'config.sub', 'ltconfig', 'ltmain.sh'
+test -f Makefile.am && MY_LIBTOOLIZEFLAGS=--automake
+
+if grep -q '^ *AC_PROG_LIBTOOL' configure.ac configure.in 2>/dev/null; then
+ $DRYRUN libtoolize $HELP $VERSION $COPY $DEBUG $FORCE $MY_LIBTOOLIZEFLAGS $LIBTOOLIZEFLAGS || exit $?
+fi
+
+# generate 'aclocal.m4'
+if test -f configure.ac -o configure.in; then
+ $DRYRUN aclocal $HELP $VERSION $VERBOSE $FORCE $ACLOCALFLAGS || exit $?
+fi
+
+# generate 'config.h.in'
+if test -f configure.ac -o configure.in; then
+ $DRYRUN autoheader $HELP $VERSION $VERBOSE $DEBUG $FORCE $WARNS $AUTOHEADERFLAGS || exit $?
+fi
+
+# generate Makefile.in's from Makefile.am's
+if test -f Makefile.am; then
+ $DRYRUN automake $HELP $VERSION $VERBOSE $ADDMISSING $COPY $FORCE $WARNS $AUTOMAKEFLAGS || exit $?
+fi
+
+# generate configure from configure.ac
+if test -f configure.ac -o -f configure.in; then
+ $DRYRUN autoconf $HELP $VERSION $VERBOSE $DEBUG $FORCE $WARNS $AUTOCONFFLAGS || exit $?
+fi
+
+fi # !AUTOCONF
+
+# move to build dir
+cd $OLDDIR
+
+# configure
+if test -n "$CONFIG"; then
+ if test -f ${DIR}configure; then
+ $DRYRUN ${DIR}configure $HELP $VERSION $DEFAULT_CONFIGUREFLAGS $CONFIGUREFLAGS $DASHDASHFLAGS $EXTRA_CONFIGUREFLAGS || exit $?
+ fi
+fi
+
+# make
+if test -n "$MAKE"; then
+ if test -f Makefile; then
+ $DRYRUN make $MAKEFLAGS || exit $?
+ fi
+fi
Index: configure.in
===================================================================
RCS file: /cvs/fribidi/fribidi/configure.in,v
retrieving revision 1.22.2.10
retrieving revision 1.22.2.11
diff -u -d -r1.22.2.10 -r1.22.2.11
--- configure.in 25 Sep 2005 17:37:44 -0000 1.22.2.10
+++ configure.in 25 Sep 2005 18:38:36 -0000 1.22.2.11
@@ -35,7 +35,7 @@
AC_REVISION([$Id$])
AC_CONFIG_SRCDIR(fribidi.c)
AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE([gnits])
+AM_INIT_AUTOMAKE([gnu])
FRIBIDI_MAJOR_VERSION=fribidi_major_version()
FRIBIDI_MINOR_VERSION=fribidi_minor_version()
@@ -72,8 +72,6 @@
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-AC_PATH_PROG(SED, sed, $PATH)
dnl Checks for libraries
@@ -114,6 +112,14 @@
dnl check for fribidi_tab_char_type_*.i files
+AH_TEMPLATE(HAS_FRIBIDI_TAB_CHAR_TYPE_2_I)
+AH_TEMPLATE(HAS_FRIBIDI_TAB_CHAR_TYPE_3_I)
+AH_TEMPLATE(HAS_FRIBIDI_TAB_CHAR_TYPE_4_I)
+AH_TEMPLATE(HAS_FRIBIDI_TAB_CHAR_TYPE_5_I)
+AH_TEMPLATE(HAS_FRIBIDI_TAB_CHAR_TYPE_6_I)
+AH_TEMPLATE(HAS_FRIBIDI_TAB_CHAR_TYPE_7_I)
+AH_TEMPLATE(HAS_FRIBIDI_TAB_CHAR_TYPE_8_I)
+AH_TEMPLATE(HAS_FRIBIDI_TAB_CHAR_TYPE_9_I)
for n in 2 3 4 5 6 7 8 9; do
if test -f "${srcdir}/fribidi_tab_char_type_$n.i" ||
test -f "./fribidi_tab_char_type_$n.i"; then
@@ -131,7 +137,8 @@
AC_ARG_ENABLE(debug, dnl
[ --enable-debug turn debugging information on [default=no]],
[case "${enableval}" in
- yes) AC_DEFINE(DEBUG) ;;
+ yes) AC_DEFINE(DEBUG,1,
+ [Define to 1 if you want to include debug code in the library]) ;;
no) ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
esac])
@@ -140,7 +147,8 @@
AC_ARG_ENABLE(malloc, dnl
[ --enable-malloc do not allocate chunks of memory [default=no]],
[case "${enableval}" in
- yes) AC_DEFINE(USE_SIMPLE_MALLOC) ;;
+ yes) AC_DEFINE(USE_SIMPLE_MALLOC,1,
+ [Define to 1 if you prefer simple malloc instead of chunk memory]) ;;
no) ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-malloc) ;;
esac])
@@ -149,7 +157,8 @@
AC_ARG_ENABLE(memopt, dnl
[ --enable-memopt optimize for memory usage [default=no]],
[case "${enableval}" in
- yes) AC_DEFINE(MEM_OPTIMIZED)
+ yes) AC_DEFINE(MEM_OPTIMIZED,1,
+ [Define to 1 if you want to optimize for memory instead of speed])
memopt=true ;;
no) memopt=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-memopt) ;;
@@ -160,7 +169,8 @@
[ --without-charsets exclude character set converters from library
causes command-line tool to use iconv],
[case "${withval}" in
- yes) AC_DEFINE(FRIBIDI_NO_CHARSETS)
+ yes) AC_DEFINE(FRIBIDI_NO_CHARSETS,1,
+ [Define to 1 if you do not want character set conversion routines])
charsets=true ;;
no) charsets=false ;;
*) AC_MSG_ERROR(bad value ${withval} for --without-charsets) ;;
@@ -172,7 +182,8 @@
fi
AC_SUBST(FRIBIDI_NO_CHARSETS)
-AC_DEFINE(FRIBIDI_EXPORT)
+AC_DEFINE(FRIBIDI_EXPORTS,1,
+ [Define to 1])
AC_OUTPUT([
Makefile
--- stamp-h.in DELETED ---
More information about the fribidi-commit
mailing list