Changeset 6de4f47 in git

Timestamp:

Sep 12, 2016, 7:26:33 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

730a1f54bc084f74380e5a9e677a2122a271085b

Parents:

98123a6d20c823df0a5dc471793cf7e98e0d5fc8

Message:

fix: the messed up xalloc configuration

Location:

xalloc

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• omalloc.pc.in (added)

xalloc/Makefile.am

@@ -19 +19 @@
 omTables_CPPFLAGS = ${AM_CPPFLAGS}
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = omalloc.pc
+
 CLEANFILES = $(BUILT_SOURCES)
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: omalloc
-Description: The Singular memory manager
-Version: @PACKAGE_VERSION@
-URL: https://github.com/Singular/Sources/tree/spielwiese/@PACKAGE@
-
-# Requires:
-# Conflicts:
-
-Cflags: -I${includedir}
-Libs: -L${libdir} -lomalloc
-# Libs.private:
-
-

xalloc/configure.ac

@@ -1 @@
-ACLOCAL_AMFLAGS = -I ../m4
+dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+dnl File: configure.ac
+dnl Purpose: Process this file with autoconf to produce configure
+dnl Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
+dnl Created: 11/99
+dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
 
-lib_LTLIBRARIES=libomalloc.la
+AC_INIT([xmalloc],[4.0])
 
-libomalloc_includedir=$(includedir)/omalloc
+AC_CONFIG_MACRO_DIR([../m4])
+AC_CONFIG_AUX_DIR([../build-aux])
+AC_CONFIG_SRCDIR(dummy.c)
+AC_CONFIG_HEADER([_config.h])
 
-libomalloc_include_HEADERS = omalloc.h omallocClass.h
+AC_PROG_CC
+AC_PROG_CXX
 
-SOURCES=dummy.c omallocClass.cc
+SING_RESET_FLAGS()
 
-AM_CPPFLAGS =-I${top_srcdir}/.. -I${top_builddir}/..
+AM_MAINTAINER_MODE([enable])
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
-libomalloc_la_SOURCES=$(SOURCES) $(noinst_HEADERS)
+AM_SANITY_CHECK
 
-libomalloc_la_LDFLAGS    = -release ${PACKAGE_VERSION}
+# Add pre'prefixed config
+AX_PREFIX_CONFIG_H([omConfig.h],[],[_config.h])
 
-libomalloc_la_CPPFLAGS  = ${AM_CPPFLAGS}
+# SING_CHECK_SET_ARGS()
 
-omTables_CPPFLAGS = ${AM_CPPFLAGS}
+AC_SUBST(VERSION)
 
-CLEANFILES = $(BUILT_SOURCES)
+CPPFLAGS="-I.. -I. $CPPFLAGS"
+AC_PROG_MAKE_SET
+AC_PROG_CC
+AC_PROG_CPP
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
+AC_PROG_LN_S
+AC_PROG_INSTALL
+AM_PROG_CC_C_O
+# AM_PROG_AR
+AC_C_CONST
+AC_C_INLINE
 
-Name: omalloc
-Description: The Singular memory manager
-Version: @PACKAGE_VERSION@
-URL: https://github.com/Singular/Sources/tree/spielwiese/@PACKAGE@
-
-# Requires:
-# Conflicts:
-
-Cflags: -I${includedir}
-Libs: -L${libdir} -lomalloc
-# Libs.private:
+LT_INIT
 
 
+dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+dnl check for programs
+dnl
+AC_CHECK_PROG(AR, ar, ar, :)
+if test "$ac_cv_prog_AR" = no; then
+  AC_MSG_ERROR(*** ar program not found)
+fi
+
+dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+dnl header file checks
+dnl
+AC_HEADER_STDC
+AC_CHECK_HEADERS(limits.h,,
+  AC_MSG_ERROR(Can not compile without limits.h))
+
+AC_CHECK_HEADERS(unistd.h sys/mman.h fcntl.h /usr/include/malloc.h)
+
+AC_CHECK_FUNCS(popen mmap sbrk random)
+
+dnl llllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+dnl Find out more about particularity of the system
+dnl
+
+# sizes
+AC_CHECK_SIZEOF(long,4)
+AC_CHECK_SIZEOF(void*,4)
+AC_CHECK_SIZEOF(double, 8)
+AC_CHECK_SIZEOF(size_t, 4)
+
+if test "$ac_cv_sizeof_long" != "$ac_cv_sizeof_voidp"; then
+  AC_MSG_ERROR(need equal sizes for long and void*)
+fi
+if test "$ac_cv_sizeof_voidp" != 4 && test "$ac_cv_sizeof_voidp" != 8; then
+  AC_MSG_ERROR(need void* to be 4 or 8 bytes long)
+fi
+if test "$ac_cv_sizeof_double" != 4 && test "$ac_cv_sizeof_double" != 8; then
+  AC_MSG_ERROR(need double to be 4 or 8 bytes long)
+fi
+
+dnl Set compiler, linker flags so that we can work with omalloc
+BACKUP_CFLAGS=$CFLAGS
+BACKUP_CXXFLAGS=$CXXFLAGS
+BACKUP_LDFLAGS=$LDFLAGS
+
+CFLAGS="$CFLAGS -I$srcdir"
+CXXFLAGS="$CXXFLAGS -I$srcdir"
+
+AC_SUBST(OM_MALLOC_HEADER)
+AC_SUBST(OM_MALLOC_SOURCE)
+
+dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
+dnl wrap it up
+dnl
+AC_CONFIG_FILES([Makefile omalloc.pc])
+AC_OUTPUT
+