Changeset f093ba in git

Timestamp:

Oct 6, 2010, 5:15:56 PM (14 years ago)

Author:

Mohamed Barakat <mohamed.barakat@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

73c9c6ef6b10bf024a53271a8e0ba774c6ce1a6b

Parents:

7b05b52baa6f16125a7ab10bb272db452b5e3f33

git-author:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2010-10-06 17:15:56+02:00

git-committer:

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

Message:

reporter works with the new configure.in

Location:

reporter

Files:

• Makefile.in (modified) (1 diff)
• configure (modified) (1 diff)
• configure.in (moved) (moved from reporter/configure.ac) (1 diff)
• dError.c (modified) (1 diff)
• reporter.cc (modified) (2 diffs)
• reporter.h (modified) (1 diff)

reporter/Makefile.in

@@ -35 +35 @@
 CXXFLAGS        = -O3 -w -fomit-frame-pointer --no-rtti ${PIPE}
 CXXTEMPLFLAGS   = -fno-implicit-templates --no-exceptions
-CPPFLAGS        = -I${srcdir} -I${includedir}
+CPPFLAGS        = -I${srcdir} -I${includedir} -I${prefix}/include/singular
 DEFS            = -DNDEBUG -DOM_NDEBUG -Dix86_Linux -DHAVE_CONFIG_H
 

reporter/configure

@@ -3903 +3903 @@
 
 
+project=singular
+component=reporter
+
+
+# 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"
 

reporter/configure.in

@@ -49 +49 @@
 AC_SUBST(PIPE)
 
+dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+dnl path stuff
+dnl
+
+project=singular
+component=reporter
+
+dnl set exec_prefix, libdir, includedir to some sensible values
+dnl if they are not yet already set
+
+# 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([Makefile])
 AC_OUTPUT

reporter/dError.c

@@ -16 +16 @@
 #include "reporter.h"
 #ifdef HAVE_CONFIG_H
-#include <omalloc.h>
+#include <omalloc/omalloc.h>
 #endif
 

reporter/reporter.cc

@@ -11 +11 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include <mylimits.h>
+#include <misc/mylimits.h>
 #include <stdarg.h>
 #include <sys/stat.h>
@@ -22 +22 @@
 
 #include "reporter.h"
-#include <omalloc.h>
+#include <omalloc/omalloc.h>
 //#include "options.h"
 

reporter/reporter.h

@@ -10 +10 @@
 #include <stdio.h>
 #include <string.h>
-#include <auxiliary.h>
+#include <misc/auxiliary.h>
 
 extern char*  feErrors;