Changeset 73c9c6 in git

Timestamp:

Oct 6, 2010, 5:39:53 PM (14 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5d18ce584b38baa6dd8a42c5ea1c2382c2953d2d

Parents:

f093ba5e2b15f0f7b9fc7f07288a2b2ecd1b8b89

git-author:

Martin Lee <martinlee84@web.de>2010-10-06 17:39:53+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:55:33+01:00

Message:

resource builds with new configure.in

Location:

resource

Files:

• Makefile.in (modified) (1 diff)
• configure (modified) (2 diffs)
• configure.ac (deleted)
• configure.in (added)
• feFopen.cc (modified) (1 diff)
• feResource.cc (modified) (2 diffs)

resource/Makefile.in

@@ -35 +35 @@
 CXXFLAGS        = @CXXFLAGS@ ${PIPE}
 CXXTEMPLFLAGS   = -fno-implicit-templates --no-exceptions
-CPPFLAGS        = -I${srcdir} -I${includedir}
+CPPFLAGS        = -I${srcdir} -I${includedir} -I${prefix}/include/@project@/
 DEFS            = -DNDEBUG -DOM_NDEBUG -Dix86_Linux -DHAVE_CONFIG_H
 

resource/configure

@@ -597 +597 @@
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+project
 SINGUNAME
 EGREP
@@ -3651 +3652 @@
 
 
+
+project=singular
+component=resource
+
+
+
+
+# expand prefix
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+
+# expand exec_prefixad
+if test "x$exec_prefix" = xNONE; then
+ exec_prefix=${prefix}
+fi
+
+# expand libdir
+test "x$libdir" = 'x${exec_prefix}/lib'&& libdir="${exec_prefix}/lib/${project}/${component}"
+
+# expand includedir
+test "x$includedir" = 'x${prefix}/include' && includedir="${exec_prefix}/include/${project}/${component}"
+
 ac_config_files="$ac_config_files Makefile"
 

resource/feFopen.cc

@@ -8 +8 @@
 #include "config.h"
 
-#include <auxiliary.h>
+#include <misc/auxiliary.h>
 
-#include <omalloc.h>
-#include <reporter.h>
+#include <omalloc/omalloc.h>
+#include <reporter/reporter.h>
 
 #include "feFopen.h"

resource/feResource.cc

@@ -13 +13 @@
 #include "config.h"
 
-#include <auxiliary.h>
+#include <misc/auxiliary.h>
 
 #include "feResource.h"
@@ -28 +28 @@
 
 
-#include <reporter.h>
+#include <reporter/reporter.h>
 #if !defined(ESINGULAR) && !defined(TSINGULAR)
-#include <omalloc.h>
+#include <omalloc/omalloc.h>
 #else
 char* feResource(const char id, int warn = -1);