diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | build/Makefile.am | 1 | ||||
| -rw-r--r-- | build/autotools/Makefile.am | 3 | ||||
| -rw-r--r-- | build/autotools/shave-libtool.in | 73 | ||||
| -rw-r--r-- | build/autotools/shave.in | 79 | ||||
| -rw-r--r-- | build/autotools/shave.m4 | 77 | ||||
| -rw-r--r-- | configure.ac | 29 |
7 files changed, 18 insertions, 250 deletions
diff --git a/Makefile.am b/Makefile.am index 68fd066..30a0adc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,16 +1,16 @@ +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + if USE_GTK3 VER=3 else VER= endif -ACLOCAL_AMFLAGS = -I build/autotools - V = @ Q = $(V:1=) QUIET_GEN = $(Q:@=@echo ' GEN '$@;) -SUBDIRS = build src example +SUBDIRS = src example %-0.1.pc: %.pc $(QUIET_GEN) cp -f $< $@ diff --git a/build/Makefile.am b/build/Makefile.am deleted file mode 100644 index 8c90237..0000000 --- a/build/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = autotools diff --git a/build/autotools/Makefile.am b/build/autotools/Makefile.am deleted file mode 100644 index a17717f..0000000 --- a/build/autotools/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -EXTRA_DIST = shave-libtool.in shave.in shave.m4 - -DISTCLEANFILES = shave-libtool shave diff --git a/build/autotools/shave-libtool.in b/build/autotools/shave-libtool.in deleted file mode 100644 index 7b3d63f..0000000 --- a/build/autotools/shave-libtool.in +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh - -# we need sed -SED=@SED@ -if test -z "$SED" ; then -SED=sed -fi - -lt_unmangle () -{ - last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` -} - -tempval=`echo $1 | sed s/\'//g` -if test "x$tempval" = "x$SHELL"; then - shift -fi -tempval=`echo $1 | sed s/\'//g` -LIBTOOL="$tempval" -shift - -# if 1, don't print anything, the underlaying wrapper will do it -pass_though=0 - -# scan the arguments, keep the right ones for libtool, and discover the mode -preserved_args= -while test "$#" -gt 0; do - opt="$1" - shift - - case $opt in - --mode=*) - mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` - preserved_args="$preserved_args $opt" - ;; - -o) - lt_output="$1" - preserved_args="$preserved_args $opt" - ;; - *) - preserved_args="$preserved_args $opt" - ;; - esac -done - -case "$mode" in -compile) - # shave will be called and print the actual CC/CXX/LINK line - preserved_args="$preserved_args --shave-mode=$mode" - pass_though=1 - ;; -link) - preserved_args="$preserved_args --shave-mode=$mode" - Q=" LINK " - ;; -*) - # let's u - # echo "*** libtool: Unimplemented mode: $mode, fill a bug report" - ;; -esac - -lt_unmangle "$lt_output" -output=$last_result - -if test -z $V; then - if test $pass_though -eq 0; then - echo "$Q$output" - fi - $LIBTOOL --silent $preserved_args -else - echo $LIBTOOL $preserved_args - $LIBTOOL $preserved_args -fi diff --git a/build/autotools/shave.in b/build/autotools/shave.in deleted file mode 100644 index 5c16f27..0000000 --- a/build/autotools/shave.in +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh - -# we need sed -SED=@SED@ -if test -z "$SED" ; then -SED=sed -fi - -lt_unmangle () -{ - last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` -} - -# the tool to wrap (cc, cxx, ar, ranlib, ..) -tool="$1" -shift - -# the reel tool (to call) -REEL_TOOL="$1" -shift - -pass_through=0 -preserved_args= -while test "$#" -gt 0; do - opt="$1" - shift - - case $opt in - --shave-mode=*) - mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` - ;; - -o) - lt_output="$1" - preserved_args="$preserved_args $opt" - ;; - *) - preserved_args="$preserved_args $opt" - ;; - esac -done - -# mode=link is handled in the libtool wrapper -case "$mode,$tool" in -link,*) - pass_through=1 - ;; -*,cxx) - Q=" CXX " - ;; -*,cc) - Q=" CC " - ;; -*,fc) - Q=" FC " - ;; -*,f77) - Q=" F77 " - ;; -*,objc) - Q=" OBJC " - ;; -*,*) - # should not happen - Q=" CC " - ;; -esac - -lt_unmangle "$lt_output" -output=$last_result - -if test -z $V; then - if test $pass_through -eq 0; then - echo "$Q$output" - fi - $REEL_TOOL $preserved_args -else - echo $REEL_TOOL $preserved_args - $REEL_TOOL $preserved_args -fi diff --git a/build/autotools/shave.m4 b/build/autotools/shave.m4 deleted file mode 100644 index 0a3509e..0000000 --- a/build/autotools/shave.m4 +++ /dev/null @@ -1,77 +0,0 @@ -dnl Make automake/libtool output more friendly to humans -dnl Damien Lespiau <damien.lespiau@gmail.com> -dnl -dnl SHAVE_INIT([shavedir],[default_mode]) -dnl -dnl shavedir: the directory where the shave scripts are, it defaults to -dnl $(top_builddir) -dnl default_mode: (enable|disable) default shave mode. This parameter -dnl controls shave's behaviour when no option has been -dnl given to configure. It defaults to disable. -dnl -dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just -dnl before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and -dnl LIBTOOL, you don't want the configure tests to have these variables -dnl re-defined. -dnl * This macro requires GNU make's -s option. - -AC_DEFUN([_SHAVE_ARG_ENABLE], -[ - AC_ARG_ENABLE([shave], - AS_HELP_STRING( - [--enable-shave], - [use shave to make the build pretty [[default=$1]]]),, - [enable_shave=$1] - ) -]) - -AC_DEFUN([SHAVE_INIT], -[ - dnl you can tweak the default value of enable_shave - m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)]) - - if test x"$enable_shave" = xyes; then - dnl where can we find the shave scripts? - m4_if([$1],, - [shavedir="$ac_pwd"], - [shavedir="$ac_pwd/$1"]) - AC_SUBST(shavedir) - - dnl make is now quiet - AC_SUBST([MAKEFLAGS], [-s]) - AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`']) - - dnl we need sed - AC_CHECK_PROG(SED,sed,sed,false) - - dnl substitute libtool - SHAVE_SAVED_LIBTOOL=$LIBTOOL - LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'" - AC_SUBST(LIBTOOL) - - dnl substitute cc/cxx - SHAVE_SAVED_CC=$CC - SHAVE_SAVED_CXX=$CXX - SHAVE_SAVED_FC=$FC - SHAVE_SAVED_F77=$F77 - SHAVE_SAVED_OBJC=$OBJC - CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}" - CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}" - FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}" - F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}" - OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}" - AC_SUBST(CC) - AC_SUBST(CXX) - AC_SUBST(FC) - AC_SUBST(F77) - AC_SUBST(OBJC) - - V=@ - else - V=1 - fi - Q='$(V:1=)' - AC_SUBST(V) - AC_SUBST(Q) -]) - diff --git a/configure.ac b/configure.ac index e56a252..a712bd8 100644 --- a/configure.ac +++ b/configure.ac @@ -14,17 +14,21 @@ m4_define([ido_interface_age], [0]) m4_define([ido_binary_age], [m4_eval(100 * ido_minor_version + ido_micro_version)]) -AC_PREREQ(2.59) +AC_PREREQ([2.64]) AC_INIT([ido], [ido_version], - [https://bugs.launchpad.net/avani]) + [http://bugs.launchpad.net/ido], + [ido], + [http://launchpad.net/ido]) + +AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([src/libido.h]) -AC_CONFIG_MACRO_DIR([build/autotools]) +AC_CONFIG_MACRO_DIR([m4]) -AM_CONFIG_HEADER([config.h]) +AM_INIT_AUTOMAKE([1.11 foreign]) -AM_INIT_AUTOMAKE([1.9 foreign]) +AM_SILENT_RULES([yes]) IDO_MAJOR_VERSION=ido_major_version IDO_MINOR_VERSION=ido_minor_version @@ -53,8 +57,11 @@ dnl =========================================================================== # Checks for programs AC_PROG_CC AM_PROG_CC_C_O -AC_DISABLE_STATIC -AC_PROG_LIBTOOL + +# Initialize libtool +LT_PREREQ([2.2]) +LT_INIT([disable-static]) + AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums]) PKG_PROG_PKG_CONFIG @@ -96,7 +103,7 @@ AC_SUBST(GCC_FLAGS) # use strict compiler flags only on development releases m4_define([maintainer_flags_default], [m4_if(m4_eval(ido_minor_version % 2), [1], [yes], [no])]) AC_ARG_ENABLE([maintainer-flags], - [AC_HELP_STRING([--enable-maintainer-flags=@<:@no/yes@:>@], + [AS_HELP_STRING([--enable-maintainer-flags=@<:@no/yes@:>@], [Use strict compiler flags @<:@default=no@:>@])], [], [enable_maintainer_flags=maintainer_flags_default]) @@ -117,14 +124,8 @@ GTK_DOC_CHECK([1.8]) dnl =========================================================================== -SHAVE_INIT([build/autotools], [enable]) - AC_CONFIG_FILES([ Makefile - build/Makefile - build/autotools/Makefile - build/autotools/shave-libtool - build/autotools/shave src/Makefile example/Makefile libido.pc |