Drop apache 1 build-dependency

[sope] / sope-core / NGExtensions / GNUmakefile.preamble

diff --git a/sope-core/NGExtensions/GNUmakefile.preamble b/sope-core/NGExtensions/GNUmakefile.preamble
index ff4bc08c461817aaee7786260a10a9bc3979f0d8..998376cd81992c3f3f826481839f9cd7cf4523c7 100644 (file)
--- a/sope-core/NGExtensions/GNUmakefile.preamble
+++ b/sope-core/NGExtensions/GNUmakefile.preamble
@@ -8,6 +8,17 @@ ADDITIONAL_CPP_FLAGS     += -Wall -Wno-import -Wno-protocol -O2
 libNGExtensions_INCLUDE_DIRS += -I..
 
 
+# Parameters for resource lookup
+
+ifneq ($(FHS_INSTALL_ROOT),)
+ADDITIONAL_CPPFLAGS += -DFHS_INSTALL_ROOT=\@\"$(FHS_INSTALL_ROOT)\"
+endif
+
+ifeq ($(CONFIGURE_64BIT),yes)
+ADDITIONAL_CPPFLAGS += -DCONFIGURE_64BIT=1
+endif
+
+
 # dependencies
 
 libNGExtensions_LIBRARIES_DEPEND_UPON += \
@@ -36,7 +47,11 @@ ADDITIONAL_LIB_DIRS += \
        $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
 endif
 
+ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
+SYSTEM_LIB_DIR += -L/usr/local/lib64 -L/usr/lib64
+else
 SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+endif
 
 
 # Apple