[Lemon-commits] [lemon_svn] ladanyi: r1741 - in hugo/trunk: . config doc src/lemon

[Lemon SVN]

Author: ladanyi
Date: Tue Apr  5 10:43:51 2005
New Revision: 1741

Added:
   hugo/trunk/doc/Doxyfile.in
      - copied unchanged from r1740, /hugo/branches/akos/doc/Doxyfile.in
   hugo/trunk/src/lemon/lemon.pc.in
      - copied unchanged from r1740, /hugo/branches/akos/src/lemon/lemon.pc.in
Removed:
   hugo/trunk/doc/Doxyfile
Modified:
   hugo/trunk/   (props changed)
   hugo/trunk/bootstrap
   hugo/trunk/config/   (props changed)
   hugo/trunk/configure.ac
   hugo/trunk/doc/   (props changed)
   hugo/trunk/src/lemon/   (props changed)
   hugo/trunk/src/lemon/Makefile.am

Log:
Merged my branch (branches/akos) changes r1654:1740 into the trunk.

Modified: hugo/trunk/bootstrap
==============================================================================
--- hugo/trunk/bootstrap	(original)
+++ hugo/trunk/bootstrap	Tue Apr  5 10:43:51 2005
@@ -1,4 +1,71 @@
-#! /bin/sh
-aclocal-1.7 \
-&& automake-1.7 --gnu --add-missing \
-&& autoconf
+#!/bin/bash
+
+prev=
+for option
+do
+  if test -n "$prev"
+  then
+    eval "$prev=\$option"
+    prev=
+    continue
+  fi
+
+  optarg=`expr "x$option" : 'x[^=]*=\(.*\)'`
+
+  case $option in
+
+  -amver | --amver)
+    prev=amver ;;
+  -amver=* | --amver=*)
+    amver=$optarg ;;
+
+  -acver | --acver)
+    prev=acver ;;
+  -acver=* | --acver=*)
+    acver=$optarg ;;
+
+  --help | -h)
+    cat << EOF
+Usage: $0 [OPTION]
+
+Options:
+  -h, --help            display this help and exit
+      --amver=VERSION   use VERSION version of automake
+      --acver=VERSION   use VERSION version of autoconf
+
+Expamle:
+  $0 --amver=1.8 --acver=2.59
+EOF
+    exit 0
+    ;;
+
+  *)
+    cat << EOF >&2
+$0: unrecognized option: $option
+Try \`$0 --help' for more information.
+EOF
+    exit 1
+    ;;
+
+  esac
+done
+
+automake=automake
+aclocal=aclocal
+autoconf=autoconf
+
+if test -n "$amver"
+then
+  automake=automake-$amver
+  aclocal=aclocal-$amver
+fi
+
+if test -n "$acver"
+then
+  autoconf=autoconf-$acver
+fi
+
+$aclocal \
+&& libtoolize --force --copy \
+&& $automake --add-missing --copy --gnu \
+&& $autoconf

Modified: hugo/trunk/configure.ac
==============================================================================
--- hugo/trunk/configure.ac	(original)
+++ hugo/trunk/configure.ac	Tue Apr  5 10:43:51 2005
@@ -6,8 +6,9 @@
 AC_PREREQ(2.57)
 
 dnl Checks for programs.
-AC_PROG_CC
 AC_PROG_CXX
+AC_PROG_INSTALL
+AC_PROG_LIBTOOL
 
 CXXFLAGS="$CXXFLAGS -Wall"
 
@@ -27,5 +28,16 @@
 AC_HEADER_STDC
 AC_CHECK_FUNCS(gettimeofday times ctime_r)
 
-AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile src/lemon/Makefile src/test/Makefile src/benchmark/Makefile src/demo/Makefile autopackage/default.apspec])
+AC_CONFIG_FILES([
+Makefile
+autopackage/default.apspec
+doc/Makefile
+doc/Doxyfile
+src/Makefile
+src/lemon/Makefile
+src/lemon/lemon.pc
+src/benchmark/Makefile
+src/demo/Makefile
+src/test/Makefile
+])
 AC_OUTPUT

Modified: hugo/trunk/src/lemon/Makefile.am
==============================================================================
--- hugo/trunk/src/lemon/Makefile.am	(original)
+++ hugo/trunk/src/lemon/Makefile.am	Tue Apr  5 10:43:51 2005
@@ -1,3 +1,11 @@
+AM_CPPFLAGS = -I$(top_srcdir)/src
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = lemon.pc
+
+lib_LTLIBRARIES = libemon.la
+libemon_la_SOURCES =
+
 pkginclude_HEADERS =							\
 	array_map.h                                                     \
 	bezier.h                                                        \