From 877ea5127d3d711c4708cbfe6ecb1efda1153d63 Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 4 Jul 2006 08:43:47 +0000 Subject: [PATCH] add some 64bit config info to config.make output git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1305 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- configure | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/configure b/configure index 8662f377..3b8ef60a 100755 --- a/configure +++ b/configure @@ -358,6 +358,23 @@ function genConfigMake() { cfgwrite "LIBRARY_COMBO=$LIBRARY_COMBO" cfgwrite "" + # Note: GNUSTEP_TARGET_CPU is not yet available (set by common.make), so we + # only have environment variables + # Note: we can't set SYSTEM_LIB_DIR in this location, it gets overridden by + # common.make + cfgwrite "ifeq (\$(findstring _64, \$(GNUSTEP_HOST_CPU)), _64)" + cfgwrite "CONFIGURE_64BIT:=yes" + cfgwrite "ifneq (\$(FHS_INSTALL_ROOT),)" + cfgwrite "CONFIGURE_FHS_INSTALL_LIBDIR:=\$(FHS_INSTALL_ROOT)/lib64/" + cfgwrite "endif" + cfgwrite "CONFIGURE_SYSTEM_LIB_DIR += -L\$(CONFIGURE_FHS_INSTALL_LIBDIR) -L/usr/lib64" + cfgwrite "else" + cfgwrite "ifneq (\$(FHS_INSTALL_ROOT),)" + cfgwrite "CONFIGURE_FHS_INSTALL_LIBDIR:=\$(FHS_INSTALL_ROOT)/lib/" + cfgwrite "endif" + cfgwrite "CONFIGURE_SYSTEM_LIB_DIR += -L\$(CONFIGURE_FHS_INSTALL_LIBDIR) -L/usr/lib" + cfgwrite "endif" + cfgwrite "# avoid a gstep-make warning" cfgwrite "PATH:=\$(GNUSTEP_SYSTEM_ROOT)/Tools:\$(PATH)" } @@ -377,6 +394,7 @@ function checkLinking() { echo >>$tmpmake "CTOOL_NAME := linktest" echo >>$tmpmake "linktest_C_FILES := dummytool.c" echo >>$tmpmake "linktest_TOOL_LIBS += -l$1" + echo >>$tmpmake "SYSTEM_LIB_DIR += \$(CONFIGURE_SYSTEM_LIB_DIR)" echo >>$tmpmake "SYSTEM_LIB_DIR += ${LINK_SYSLIBDIRS}" echo >>$tmpmake "include \$(GNUSTEP_MAKEFILES)/ctool.make" -- 2.39.5