diff options
| author | Adam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864> | 2010-03-08 03:08:37 +0000 |
|---|---|---|
| committer | Adam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864> | 2010-03-08 03:08:37 +0000 |
| commit | 27364ac890a39d1b387013b20451f414c9db9289 (patch) | |
| tree | d593ed93639772bbb79038d1ef0a9aca07ac13f3 /src | |
| parent | dd7d2d4cf0f27f35dc7c27b0f9a527dfead2ca6e (diff) | |
Added the --with-mysqlpp option to configure to tell it where mysql++ is installed at
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2804 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/modules/Makefile | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index 08ca50c13..4c1dc7de0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -16,7 +16,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \ 'TOUCH=${TOUCH}' 'SHELL=${SHELL}' \ 'RUNGROUP=${RUNGROUP}' \ 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}' \ - 'MAKEBIN=${MAKEBIN}' + 'MAKEBIN=${MAKEBIN}' 'MYSQLDIR=${MYSQLDIR}' .c.o: $(MAKEBIN) $(CC) $(CFLAGS) -I../include/ -c $< diff --git a/src/modules/Makefile b/src/modules/Makefile index b2686ae84..723e24494 100644 --- a/src/modules/Makefile +++ b/src/modules/Makefile @@ -11,6 +11,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \ OBJECTS= $(SRCS:.c=.so) OBJECTS+= $(SRCS:.cpp=.so) CDEFS= -rdynamic -Wall +MYSQL_ARGS = -I$(MYSQLDIR)/include/ -L$(MYSQLDIR)/lib/ -Wl,-rpath -Wl,$(MYSQLDIR)/lib/ -lmysqlpp all: modules subs @@ -28,12 +29,12 @@ distclean: spotless .c.so: $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} \ - $(if $(shell grep RequiredLibraries $< | grep mysqlpp),-lmysqlpp) \ + $(if $(shell grep RequiredLibraries $< | grep mysqlpp), $(MYSQL_ARGS)) \ -I../${INCLUDEDIR} -o $@ $< .cpp.so: $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} \ - $(if $(shell grep RequiredLibraries $< | grep mysqlpp),-lmysqlpp) \ + $(if $(shell grep RequiredLibraries $< | grep mysqlpp), $(MYSQL_ARGS)) \ -I../${INCLUDEDIR} -o $@ $< subs: |