[gentoo-commits] gentoo-x86 commit in dev-cpp/rudiments/files: 0.40-configure.patch

[gentoo-commits] gentoo-x86 commit in dev-cpp/rudiments/files: 0.40-configure.patch

[Tiziano Mueller (dev-zero)]

dev-zero    13/02/07 10:05:32

  Added:                0.40-configure.patch
  Log:
  Version bump (bug #454716), use EAPI-5, fix build-system, don't always install static libs.
  
  (Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key 0xAE9C1E30!)

Revision  Changes    Path
1.1                  dev-cpp/rudiments/files/0.40-configure.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/rudiments/files/0.40-configure.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/rudiments/files/0.40-configure.patch?rev=1.1&content-type=text/plain

Index: 0.40-configure.patch
===================================================================
diff --git a/config.mk.in b/config.mk.in
index ae29f27..c0b7e3d 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -11,7 +11,7 @@ includedir = @includedir@
 libdir = @libdir@
 mandir = @mandir@
 datadir = @datadir@
-docdir = ${datadir}/doc/rudiments
+docdir = @docdir@
 
 # compiler to use
 CC = @CC@
diff --git a/configure.in b/configure.in
index d82ea0e..290a80b 100644
--- a/configure.in
+++ b/configure.in
@@ -28,7 +28,7 @@ AC_ARG_WITH(pthread-prefix,
 	PTHREADPATH="")
 AC_ARG_ENABLE(ssl,
 	[  --disable-ssl           Disable SSL support],
-	ENABLE_RUDIMENTS_SSL="no",
+	ENABLE_RUDIMENTS_SSL="$enableval",
 	ENABLE_RUDIMENTS_SSL="yes")
 AC_ARG_WITH(ssl-includes,
 	[  --with-ssl-includes     SSL includes],
@@ -40,7 +40,7 @@ AC_ARG_WITH(ssl-libs,
 	SSLLIBS="")
 AC_ARG_ENABLE(pcre,
 	[  --disable-pcre          Don't use PCRE for regular expressions],
-	ENABLE_RUDIMENTS_PCRE="no",
+	ENABLE_RUDIMENTS_PCRE="$enableval",
 	ENABLE_RUDIMENTS_PCRE="yes")
 AC_ARG_WITH(pcre-includes,
 	[  --with-pcre-includes    PCRE includes],
@@ -56,7 +56,7 @@ AC_ARG_ENABLE(built-in-regex,
 	USE_BUILT_IN_REGULAREXPRESSION="0")
 AC_ARG_ENABLE(threads,
 	[  --disable-threads       Disable thread support],
-	ENABLE_RUDIMENTS_THREADS="no",
+	ENABLE_RUDIMENTS_THREADS="$enableval",
 	ENABLE_RUDIMENTS_THREADS="yes")
 
 dnl   options to disable building various classes
@@ -3393,6 +3393,10 @@ if ( test "`echo $datadir | cut -c1`" = "/" )
 then
 	datadir='${DESTDIR}'"$datadir"
 fi
+if ( test "`echo $docdir | cut -c1`" = "/" )
+then
+	docdir='${DESTDIR}'"$docdir"
+fi
 
 
 dnl Output files.
diff --git a/src/Makefile.in b/src/Makefile.in
index a224d83..3b990fb 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -4,7 +4,7 @@ include ../config.mk
 
 .PHONY: all clean install uninstall
 
-CPPFLAGS = $(WERROR) $(BASECPPFLAGS) -I../ -I../include @EXTRACPPFLAGS@
+CPPFLAGS = $(BASECPPFLAGS) -I../ -I../include @EXTRACPPFLAGS@
 
 SRCS = namevaluepairs.cpp winsock.cpp @SRCS@
 LOBJS = namevaluepairs.lo winsock.lo @LOBJS@