diff options
| author | Suren A. Chilingaryan <csa@dside.dyndns.org> | 2013-11-13 21:55:22 +0100 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@dside.dyndns.org> | 2013-11-13 21:55:22 +0100 |
| commit | 6a273c8ff6332b4b53a315acfcc65b938ea4d782 (patch) | |
| tree | 25fd6a785abd61e501b93f7d6fd5a245f788e90e | |
| parent | 4ecd877558d86495ffe83a62c4c3f276fec3f092 (diff) | |
| download | librcd-6a273c8ff6332b4b53a315acfcc65b938ea4d782.tar.gz librcd-6a273c8ff6332b4b53a315acfcc65b938ea4d782.tar.bz2 librcd-6a273c8ff6332b4b53a315acfcc65b938ea4d782.tar.xz librcd-6a273c8ff6332b4b53a315acfcc65b938ea4d782.zip | |
Merge build system fixes from LibRCC
| -rw-r--r-- | .bzrignore | 3 | ||||
| -rw-r--r-- | configure.ac (renamed from configure.in) | 14 |
2 files changed, 14 insertions, 3 deletions
@@ -28,3 +28,6 @@ CMakeFiles CMakeCache.txt cmake_install.cmake librcd.pc +ar-lib +m4 +compile diff --git a/configure.in b/configure.ac index 9e51720..c59f0e7 100644 --- a/configure.in +++ b/configure.ac @@ -1,6 +1,11 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(src/librcd.c) +AC_INIT(librcc, m4_esyscmd([head -n 1 VERSION | sed -e s/CVS.*$// | tr -d \\n])) +AC_CONFIG_SRCDIR([src/librcd.c]) AC_CONFIG_HEADERS(config.h) +AM_INIT_AUTOMAKE() +AC_CONFIG_MACRO_DIR([m4]) + +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) PACKAGE=librcd LIBRCD_VERSION_MAJOR=`cat VERSION | sed -e s/CVS// | cut -d . -f 1 | sed -e s/^$/0/` @@ -16,8 +21,6 @@ AC_SUBST(LIBRCD_VERSION_MINOR) AC_SUBST(LIBRCD_VERSION_SUBMINOR) AC_SUBST(LIBRCD_VERSION_INFO) -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) - AC_ARG_ENABLE( latin, [ --disable-latin disable detection of ISO-8859-1],, disable_latin="yes") @@ -34,6 +37,11 @@ AC_PATH_PROG(RM, rm, /bin/rm) AC_PATH_PROG(MV, mv, /bin/mv) AC_PATH_PROG(TAR, tar, /bin/tar) +dnl Fixing ugly libtool, see for details +dnl http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=523750 +RM="$RM -f" + + dnl Checks for programs. dnl Checks for libraries. |