[vmkit-commits] [vmkit] r57489 - in /vmkit/trunk: Makefile.common.in autoconf/configure.ac configure

Nicolas Geoffray nicolas.geoffray at lip6.fr
Tue Oct 14 08:12:17 PDT 2008 

Author: geoffray
Date: Tue Oct 14 10:12:16 2008
New Revision: 57489

URL: http://llvm.org/viewvc/llvm-project?rev=57489&view=rev
Log:
Fix compilation when OBJ != SRC.


Modified:
    vmkit/trunk/Makefile.common.in
    vmkit/trunk/autoconf/configure.ac
    vmkit/trunk/configure

Modified: vmkit/trunk/Makefile.common.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.common.in?rev=57489&r1=57488&r2=57489&view=diff

==============================================================================
--- vmkit/trunk/Makefile.common.in (original)
+++ vmkit/trunk/Makefile.common.in Tue Oct 14 10:12:16 2008
@@ -38,4 +38,4 @@
   LIBS += -lgc
 endif
 
-include $(LEVEL)/Makefile.rules
+include $(PROJ_SRC_ROOT)/Makefile.rules

Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=57489&r1=57488&r2=57489&view=diff

==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Tue Oct 14 10:12:16 2008
@@ -31,7 +31,7 @@
 dnl===-----------------------------------------------------------------------===
 dnl Initialize autoconf and define the package name, version number and
 dnl email address for reporting bugs.
-AC_INIT([vmkit],[0.0.1],[nicolas.geoffray at lip6.fr])
+AC_INIT([vmkit],[0.24],[nicolas.geoffray at lip6.fr])
 
 dnl Provide a copyright substitution and ensure the copyright notice is included
 dnl in the output of --version option of the generated configure script.
@@ -180,24 +180,24 @@
 )
 
 if test "x$gc" = "xboehm";  then
-  GC_FLAGS="-I$PWD/lib/Mvm/BoehmGC -DGC_THREADS"
+  GC_FLAGS="-I\$(PROJ_SRC_ROOT)/lib/Mvm/BoehmGC -DGC_THREADS"
   AC_DEFINE([USE_GC_BOEHM], [1], [Using the boehm gc])
   AC_SUBST(GC_MMAP2, [0])
   AC_SUBST(GC_BOEHM, [1])
   GC_LIBS=BoehmGC
   case $target_os in
     *linux*)
-      GC_FLAGS="-I$PWD/lib/Mvm/BoehmGC -DGC_THREADS -DGC_LINUX_THREADS"
+      GC_FLAGS="-I\$(PROJ_SRC_ROOT)/lib/Mvm/BoehmGC -DGC_THREADS -DGC_LINUX_THREADS"
     ;;
   esac
 else
   GC_LIBS=GCMmap2
   if test "x$gc" = "xmulti-mmap"; then
-    GC_FLAGS="-I$PWD/lib/Mvm/GCMmap2 -DWITH_TRACER -DMULTIPLE_GC"
+    GC_FLAGS="-I\$(PROJ_SRC_ROOT)/lib/Mvm/GCMmap2 -DWITH_TRACER -DMULTIPLE_GC"
     AC_SUBST([GC_MULTI_MMAP], [1])
     AC_SUBST([GC_SINGLE_MMAP], [0])
   else
-    GC_FLAGS="-I$PWD/lib/Mvm/GCMmap2 -DWITH_TRACER"
+    GC_FLAGS="-I\$(PROJ_SRC_ROOT)/lib/Mvm/GCMmap2 -DWITH_TRACER"
     AC_SUBST([GC_MULTI_MMAP], [0])
     AC_SUBST([GC_SINGLE_MMAP], [1])
   fi
@@ -226,7 +226,7 @@
   ISOLATE_BUILD=1
 else 
   if test "x$vmtype" = "xservice"; then
-    VM_FLAGS="-DMULTIPLE_VM -DSERVICE_GC -DMULTIPLE_GC -DSERVICE_VM -I$PWD/lib/Mvm/Allocator"
+    VM_FLAGS="-DMULTIPLE_VM -DSERVICE_GC -DMULTIPLE_GC -DSERVICE_VM -I\$(PROJ_SRC_ROOT)/lib/Mvm/Allocator"
     SERVICE_BUILD=1
   fi
 fi

Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=57489&r1=57488&r2=57489&view=diff

==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Tue Oct 14 10:12:16 2008
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for vmkit 0.0.1.
+# Generated by GNU Autoconf 2.61 for vmkit 0.24.
 #
 # Report bugs to <nicolas.geoffray at lip6.fr>.
 #
@@ -576,8 +576,8 @@
 # Identity of this package.
 PACKAGE_NAME='vmkit'
 PACKAGE_TARNAME='vmkit'
-PACKAGE_VERSION='0.0.1'
-PACKAGE_STRING='vmkit 0.0.1'
+PACKAGE_VERSION='0.24'
+PACKAGE_STRING='vmkit 0.24'
 PACKAGE_BUGREPORT='nicolas.geoffray at lip6.fr'
 
 ac_unique_file="lib/Mvm/Object.cpp"
@@ -1243,7 +1243,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures vmkit 0.0.1 to adapt to many kinds of systems.
+\`configure' configures vmkit 0.24 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1309,7 +1309,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of vmkit 0.0.1:";;
+     short | recursive ) echo "Configuration of vmkit 0.24:";;
    esac
   cat <<\_ACEOF
 
@@ -1412,7 +1412,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-vmkit configure 0.0.1
+vmkit configure 0.24
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1428,7 +1428,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by vmkit $as_me 0.0.1, which was
+It was created by vmkit $as_me 0.24, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -3885,7 +3885,7 @@
 
 
 if test "x$gc" = "xboehm";  then
-  GC_FLAGS="-I$PWD/lib/Mvm/BoehmGC -DGC_THREADS"
+  GC_FLAGS="-I\$(PROJ_SRC_ROOT)/lib/Mvm/BoehmGC -DGC_THREADS"
 
 cat >>confdefs.h <<\_ACEOF
 #define USE_GC_BOEHM 1
@@ -3898,19 +3898,19 @@
   GC_LIBS=BoehmGC
   case $target_os in
     *linux*)
-      GC_FLAGS="-I$PWD/lib/Mvm/BoehmGC -DGC_THREADS -DGC_LINUX_THREADS"
+      GC_FLAGS="-I\$(PROJ_SRC_ROOT)/lib/Mvm/BoehmGC -DGC_THREADS -DGC_LINUX_THREADS"
     ;;
   esac
 else
   GC_LIBS=GCMmap2
   if test "x$gc" = "xmulti-mmap"; then
-    GC_FLAGS="-I$PWD/lib/Mvm/GCMmap2 -DWITH_TRACER -DMULTIPLE_GC"
+    GC_FLAGS="-I\$(PROJ_SRC_ROOT)/lib/Mvm/GCMmap2 -DWITH_TRACER -DMULTIPLE_GC"
     GC_MULTI_MMAP=1
 
     GC_SINGLE_MMAP=0
 
   else
-    GC_FLAGS="-I$PWD/lib/Mvm/GCMmap2 -DWITH_TRACER"
+    GC_FLAGS="-I\$(PROJ_SRC_ROOT)/lib/Mvm/GCMmap2 -DWITH_TRACER"
     GC_MULTI_MMAP=0
 
     GC_SINGLE_MMAP=1
@@ -3947,7 +3947,7 @@
   ISOLATE_BUILD=1
 else
   if test "x$vmtype" = "xservice"; then
-    VM_FLAGS="-DMULTIPLE_VM -DSERVICE_GC -DMULTIPLE_GC -DSERVICE_VM -I$PWD/lib/Mvm/Allocator"
+    VM_FLAGS="-DMULTIPLE_VM -DSERVICE_GC -DMULTIPLE_GC -DSERVICE_VM -I\$(PROJ_SRC_ROOT)/lib/Mvm/Allocator"
     SERVICE_BUILD=1
   fi
 fi
@@ -7545,7 +7545,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by vmkit $as_me 0.0.1, which was
+This file was extended by vmkit $as_me 0.24, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7598,7 +7598,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-vmkit config.status 0.0.1
+vmkit config.status 0.24
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

More information about the vmkit-commits mailing list