diff options
| -rw-r--r-- | buildlib/config.h.in | 12 | ||||
| -rw-r--r-- | buildlib/defaults.mak | 27 | ||||
| -rw-r--r-- | configure.in | 8 |
3 files changed, 31 insertions, 16 deletions
diff --git a/buildlib/config.h.in b/buildlib/config.h.in index 4df268022..386d7a619 100644 --- a/buildlib/config.h.in +++ b/buildlib/config.h.in @@ -4,9 +4,6 @@ byte first (like Motorola and SPARC, unlike Intel and VAX). */ #undef WORDS_BIGENDIAN -/* Define if the X Window System is missing or not being used. */ -#undef X_DISPLAY_MISSING - /* The number of bytes in a unsigned char. */ #undef SIZEOF_UNSIGNED_CHAR @@ -18,3 +15,12 @@ /* The number of bytes in a unsigned short. */ #undef SIZEOF_UNSIGNED_SHORT + +/* Define if we have libgpm. */ +#undef HAVE_LIBGPM + +/* Define if we have the SLang library from Davis. */ +#undef HAVE_LIBSLANG + +/* Define if we have the X11 windowing system. */ +#undef HAVE_X11 diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index 50f27de5a..adbaf2758 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -26,9 +26,21 @@ # but by explicly setting the BUILD variable. Make is invoked from # within the source itself which is much more compatible with compilation # environments. +.SILENT: -ifndef BUILD -BUILD=$(BASE)/build +# Search for the build directory +ifdef BUILD +BUILD_POSSIBLE = $(BUILD) +else +BUILD_POSSIBLE = $(BASE) $(BASE)/build +endif + +BUILD:= $(foreach i,$(BUILD_POSSIBLE),$(wildcard $(i)/environment.mak)) +BUILD:= $(firstword $(dir $(BUILD))) + +ifeq ($(words $(BUILD)),0) +error-all: + echo Can't find the build directory in $(BUILD_POSSIBLE) -- use BUILD= endif # Base definitions @@ -57,15 +69,8 @@ SUBDIRS+= HEADER_TARGETDIRS+= # Options -CXX = c++ -CC = cc -CPPFLAGS+= -I$(INCLUDE) -CXXFLAGS+= -Wall -g -fno-implicit-templates -fno-exceptions -PICFLAGS+= -fPIC -DPIC -LFLAGS+= -INLINEDEPFLAG = -MD -DEBIANDOC_HTML = yes -DEBIANDOC_TEXT = yes +include $(BUILD)/environment.mak +CPPFLAGS+= -I$(BUILD)/include # Phony rules. Other things hook these by appending to the dependency # list diff --git a/configure.in b/configure.in index 2ecd0b15d..b3f6c57f4 100644 --- a/configure.in +++ b/configure.in @@ -33,16 +33,17 @@ AC_SUBST(X11LIB) X11LIB= if test "$no_x" != "yes"; then X11LIB="-lx11" + AC_DEFINE(HAVE_X11) fi dnl Checks for Slang -AC_CHECK_LIB(slang, init_SLang,SLANGLIB="-lslang") +AC_CHECK_LIB(slang, init_SLang,[AC_DEFINE(HAVE_LIBSLANG) SLANGLIB="-lslang"]) AC_SUBST(SLANGLIB) dnl Checks for GPM AC_ARG_WITH(gpm,[ --without-gpm do not use GPM mouse support]) if test "$with_gpm" != "no"; then - AC_CHECK_LIB(gpm, Gpm_Open,GPMLIB="-lgpm") + AC_CHECK_LIB(gpm, Gpm_Open,[AC_DEFINE(HAVE_LIBGPM) GPMLIB="-lgpm"]) AC_SUBST(GPMLIB) fi @@ -84,3 +85,6 @@ AC_CHECK_PROG(DEBIANDOC_HTML,debiandoc2html,"yes","") AC_CHECK_PROG(DEBIANDOC_TEXT,debiandoc2text,"yes","") AC_OUTPUT(environment.mak:buildlib/environment.mak.in) + +dnl Setup the directories +mkdir doc bin obj include/apt-pkg include/deity |