Fri Nov 11 19:51:27 PST 2005
- Previous message: [Slony1-commit] By wieck: Bumped version number in preparation of release.
- Next message: [Slony1-commit] By xfade: Update configure to reflect previous changes
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Log Message: ----------- Add an option to disable rpath. Use configure --disable-rpath to disable rpath. Modified Files: -------------- slony1-engine: configure.ac (r1.51 -> r1.52) Makefile.global.in (r1.30 -> r1.31) slony1-engine/src/slon: Makefile (r1.36 -> r1.37) slony1-engine/src/slonik: Makefile (r1.19 -> r1.20) -------------- next part -------------- Index: Makefile.global.in =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/Makefile.global.in,v retrieving revision 1.30 retrieving revision 1.31 diff -LMakefile.global.in -LMakefile.global.in -u -w -r1.30 -r1.31 --- Makefile.global.in +++ Makefile.global.in @@ -42,6 +42,7 @@ PTHREAD_LIBS= @PTHREAD_LIBS@ YFLAGS= @YFLAGS@ FLEXFLAGS= @LEXFLAGS@ $(LFLAGS) +enable_rpath= @enable_rpath@ #libs PTHREAD_LIBS= @PTHREAD_LIBS@ Index: configure.ac =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure.ac,v retrieving revision 1.51 retrieving revision 1.52 diff -Lconfigure.ac -Lconfigure.ac -u -w -r1.51 -r1.52 --- configure.ac +++ configure.ac @@ -90,6 +90,10 @@ AC_SUBST(PERL) AC_SUBST(SED) +dnl Check whether to use the evil rpath or not +SLON_AC_ARG_BOOL(enable, rpath, yes, + [ --disable-rpath do not embed shared library search path in executables]) +AC_SUBST(enable_rpath) ACX_PTHREAD() Index: Makefile =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/Makefile,v retrieving revision 1.36 retrieving revision 1.37 diff -Lsrc/slon/Makefile -Lsrc/slon/Makefile -u -w -r1.36 -r1.37 --- src/slon/Makefile +++ src/slon/Makefile @@ -15,8 +15,6 @@ CC = $(PTHREAD_CC) override CFLAGS += $(PTHREAD_CFLAGS) -I$(slony_top_builddir) -I$(slony_top_builddir)/$(slony_subdir) -I$(pgincludedir) -override LDFLAGS += $(rpath) $(PTHREAD_LIBS) -L$(pglibdir) -lpq - PROG = slon Index: Makefile =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slonik/Makefile,v retrieving revision 1.19 retrieving revision 1.20 diff -Lsrc/slonik/Makefile -Lsrc/slonik/Makefile -u -w -r1.19 -r1.20 --- src/slonik/Makefile +++ src/slonik/Makefile @@ -17,7 +17,6 @@ endif override CFLAGS += -I$(slony_top_builddir) -I$(pgincludedir) -I$(pgincludeserverdir) -DPGSHARE="\"$(pgsharedir)\"" -override LDFLAGS += $(rpath) -lpq PROG = slonik
- Previous message: [Slony1-commit] By wieck: Bumped version number in preparation of release.
- Next message: [Slony1-commit] By xfade: Update configure to reflect previous changes
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list