diff --git a/src/Makefile.in b/src/Makefile.in index 7d88108..09d754a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -86,11 +86,11 @@ MPATH=-DMUD_LIB='"$(MUD_LIB)"' -DBINDIR='"$(BINDIR)"' -DERQ_DIR='"$(ERQ_DIR)"' # # would be nicer to have this idn include in autoconf but it shouldn't hurt # here either.. it makes this compile on OpenSolaris.. --lynX via tg 2010 -CFLAGS=-DPROGNAME='"@PROGNAME@"' @EXTRA_CFLAGS@ $(OPTIMIZE) $(DEBUG) $(WARN) $(MPATH) $(PROFIL) -I/usr/include/idn +CFLAGS=-DPROGNAME='"@PROGNAME@"' @EXTRA_CFLAGS@ $(OPTIMIZE) $(DEBUG) $(WARN) $(MPATH) $(PROFIL) -I/usr/include/idn -I/usr/local/include # LIBS=@LIBS@ @PKGLIBS@ # -LDFLAGS=$(PROFIL) @LDFLAGS@ +LDFLAGS=$(PROFIL) -L/usr/local/lib @LDFLAGS@ # #Note that, if you use smalloc with SBRK_OK(which is the default), and #don't link statically, it could happen that the system malloc is linked diff --git a/src/autoconf/configure.in b/src/autoconf/configure.in index b61bd96..b593eaa 100644 --- a/src/autoconf/configure.in +++ b/src/autoconf/configure.in @@ -105,7 +105,7 @@ dnl define default values for package arguments dnl and declare the package arguments dnl -AC_MY_ARG_ENABLE(erq,erq,[no/erq/xerq],[Enables and or selects ERQ demon]) +AC_MY_ARG_ENABLE(erq,erq,[no/erq],[Enables and or selects ERQ demon]) AC_MY_ARG_ENABLE(access-control,yes,,) AC_MY_ARG_ENABLE(access-log,no,,) AC_MY_ARG_ENABLE(align-functions,yes,,) @@ -269,11 +269,11 @@ dnl (here the variable names are used; with a "_" instead of a dash "-" !) dnl AC_UPDATE_VAR(enable_erq) -if test "x$enable_erq" = "xerq" || test "x$enable_erq" = "xyes"; then +if test "_$enable_erq" = "_erq" || test "x$enable_erq" = "xyes"; then cdef_erq_demon="#define" erq_sub=erq AC_DEFINE(ERQ_INCLUDE,"util/erq/erq.h",[define the erq include file.]) -elif test "x$enable_erq" = "xxerq"; then +elif test "_$enable_erq" = "_xerq"; then cdef_erq_demon="#define" erq_sub=xerq AC_DEFINE(ERQ_INCLUDE,"util/xerq/erq.h") @@ -3000,8 +3000,8 @@ dnl dnl Ok. now lets make the Makefiles; also these in subdirs! [Mubo] dnl make config.h, too. [Mubo] dnl -AC_OUTPUT(Makefile config.h util/Makefile util/indent/Makefile -util/xerq/Makefile util/erq/Makefile) +AC_OUTPUT(Makefile config.h util/Makefile util/erq/Makefile) +dnl util/xerq/Makefile util/indent/Makefile dnl dnl At last, warn if any feature could not be enabled