ogdi

2019-02-07 01:09:06 +03:00
parent 18a21796e9
commit 93d4f8bdc3
6 changed files with 552 additions and 7 deletions
@@ -0,0 +1,82 @@
+diff --git a/aclocal.m4 b/acinclude.m4
+similarity index 88%
+rename from aclocal.m4
+rename to acinclude.m4
+index 163a446..9d3308e 100644
+--- a/aclocal.m4
+++ b/acinclude.m4
+@@ -1,4 +1,4 @@
+-AC_DEFUN(AC_COMPILER_WFLAGS,
+AC_DEFUN([AC_COMPILER_WFLAGS],
+ [
+ 	# Remove -g from compile flags, we will add via CFG variable if
+ 	# we need it.
+@@ -8,17 +8,17 @@ AC_DEFUN(AC_COMPILER_WFLAGS,
+ 	# check for GNU compiler, and use -Wall
+ 	if test "$GCC" = "yes"; then
+ 		C_WFLAGS="-Wall"
+-		AC_DEFINE(USE_GNUCC)
+		AC_DEFINE([USE_GNUCC])
+ 	fi
+ 	if test "$GXX" = "yes"; then
+ 		CXX_WFLAGS="-Wall"
+-		AC_DEFINE(USE_GNUCC)
+		AC_DEFINE([USE_GNUCC])
+ 	fi
+-	AC_SUBST(CXX_WFLAGS,$CXX_WFLAGS)
+-	AC_SUBST(C_WFLAGS,$C_WFLAGS)
+	AC_SUBST([CXX_WFLAGS],$CXX_WFLAGS)
+	AC_SUBST([C_WFLAGS],$C_WFLAGS)
+ ])
+ 
+-AC_DEFUN(AC_COMPILER_PIC,
+AC_DEFUN([AC_COMPILER_PIC],
+ [
+ 	echo 'void f(){}' > conftest.c
+ 	if test -z "`${CC-cc} -fPIC -c conftest.c 2>&1`"; then
+@@ -33,8 +33,8 @@ AC_DEFUN(AC_COMPILER_PIC,
+ 	fi
+ 	rm -f conftest*
+ 
+-	AC_SUBST(CXX_PIC,$CXX_PIC)
+-	AC_SUBST(C_PIC,$C_PIC)
+	AC_SUBST([CXX_PIC],$CXX_PIC)
+	AC_SUBST([C_PIC],$C_PIC)
+ ])
+ 
+ dnl
+@@ -42,7 +42,7 @@ dnl Try to find something to link shared libraries with.  Use "c++ -shared"
+ dnl in preference to "ld -shared" because it will link in required c++
+ dnl run time support for us. 
+ dnl
+-AC_DEFUN(AC_LD_SHARED,
+AC_DEFUN([AC_LD_SHARED],
+ [
+   echo 'void g(); int main(){ g(); return 0; }' > conftest1.c
+ 
+@@ -88,7 +88,7 @@ AC_DEFUN(AC_LD_SHARED,
+   fi
+   rm -f conftest* libconftest* 
+ 
+-  AC_SUBST(LD_SHARED,$LD_SHARED)
+  AC_SUBST([LD_SHARED],$LD_SHARED)
+ ])
+ 
+ 
+diff --git a/config/generic.mak.in b/config/generic.mak.in
+index 699166b..355a53a 100644
+--- a/config/generic.mak.in
+++ b/config/generic.mak.in
+@@ -35,10 +35,10 @@ AR		= ar cr
+ # Compilation and linking flags
+ #
+ SHLIB_CFLAGS	= @C_PIC@
+-COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1
+COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 @C_PIC@
+ 
+ SHLIB_LDFLAGS	= -shared 
+-COMMON_LDFLAGS  = $(OPTIMIZATION) 
+COMMON_LDFLAGS  = $(OPTIMIZATION) @LDFLAGS@
+ 
+ RPC_INCLUDES = @RPC_INCLUDES@
+