[patch] libmix-2.05-autotools.patch

libmix-2.05-autotools.patch (text/plain), 4.48 KB, created by Doktor Notor on 2010-03-20 21:38:18 UTC

--- Makefile.in.orig	2003-01-02 17:52:41.000000000 +0100
+++ Makefile.in	2010-03-20 22:10:42.000000000 +0100
@@ -1,6 +1,6 @@
-INSTALL_INCLUDES_IN = /usr/include
-INSTALL_LIBRARY_IN = /usr/lib
-INSTALL_MANPAGE_IN = /usr/local/man
+includedir = /usr/@includedir@
+libdir = /usr/@libdir@
+mandir = @mandir@
 
 # Compiler to produce C/C++ libraries with (autodetected)
 GCC = @CCAUTO@
@@ -11,6 +11,7 @@
 INSTALL = @INSTALL@
 
 CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
 CLIB = @CLIB@
 
 AESOBJ = aes/aes.o aes/cast-256.o aes/mars.o aes/saferp.o aes/twofish.o aes/rijndael.o aes/md5.o
@@ -29,14 +30,14 @@
 	@echo ""
 
 libmix.so: mix/net.h ${AESOBJ} ${NETOBJ} ${MISCOBJ}
-	${GCC} ${CFLAGS} -shared ${AESOBJ} ${NETOBJ} ${MISCOBJ} -o libmix.so ${CLIB}
+	${GCC} ${CFLAGS} -shared ${AESOBJ} ${NETOBJ} ${MISCOBJ} -o libmix.so ${LDFLAGS} -Wl,-soname,libmix.so.0 ${CLIB}
 
 libmix.a: mix/net.h ${AESOBJ} ${NETOBJ} ${MISCOBJ}
 	${AR} -cr libmix.a ${AESOBJ} ${NETOBJ} ${MISCOBJ}
 	${RANLIB} libmix.a
 
 libmix++.so: mix/net.h ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
-	${GPP} ${CFLAGS} -shared ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP} -o libmix++.so ${CLIB}
+	${GPP} ${CFLAGS} -shared ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP} -o libmix++.so -Wl,-soname,libmix++.so.0 ${LDFLAGS} ${CLIB}
 
 libmix++.a: mix/net.h ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
 	${AR} -cr libmix++.a ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
@@ -116,25 +117,25 @@
 	${GCC} ${CFLAGS} -c misc/exclude.c -o misc/exclude.o
 
 install: mix/mix.h mix/net.h mix/aes.h mix/misc.h libmix.so libmix.a
-	${INSTALL} -d ${INSTALL_INCLUDES_IN}/mix/
-	${INSTALL} -d ${INSTALL_LIBRARY_IN}/
-	${INSTALL} -d ${INSTALL_MANPAGE_IN}/man3/
-	${INSTALL} -m 0644 libmix.3 ${INSTALL_MANPAGE_IN}/man3/libmix.3
-	${INSTALL} -m 0644 mix/misc.h ${INSTALL_INCLUDES_IN}/mix/misc.h
-	${INSTALL} -m 0644 mix/net.h ${INSTALL_INCLUDES_IN}/mix/net.h
-	${INSTALL} -m 0644 mix/aes.h ${INSTALL_INCLUDES_IN}/mix/aes.h
-	${INSTALL} -m 0644 mix/mix.h ${INSTALL_INCLUDES_IN}/mix/mix.h
-	${INSTALL} -m 0644 mix/lmconfig.h ${INSTALL_INCLUDES_IN}/mix/lmconfig.h
-	${INSTALL} -m 0755 libmix.so ${INSTALL_LIBRARY_IN}/libmix.so
-	${INSTALL} -m 0755 libmix.a ${INSTALL_LIBRARY_IN}/libmix.a
-	${INSTALL} -m 0755 libmix++.so ${INSTALL_LIBRARY_IN}/libmix++.so
-	${INSTALL} -m 0755 libmix++.a ${INSTALL_LIBRARY_IN}/libmix++.a
+	${INSTALL} -d $(DESTDIR)/$(includedir)/mix/
+	${INSTALL} -d $(DESTDIR)/$(libdir)/
+	${INSTALL} -d $(DESTDIR)/$(mandir)/man3/
+	${INSTALL} -m 0644 libmix.3 $(DESTDIR)/$(mandir)/man3/libmix.3
+	${INSTALL} -m 0644 mix/misc.h $(DESTDIR)/$(includedir)/mix/misc.h
+	${INSTALL} -m 0644 mix/net.h $(DESTDIR)/$(includedir)/mix/net.h
+	${INSTALL} -m 0644 mix/aes.h $(DESTDIR)/$(includedir)/mix/aes.h
+	${INSTALL} -m 0644 mix/mix.h $(DESTDIR)/$(includedir)/mix/mix.h
+	${INSTALL} -m 0644 mix/lmconfig.h $(DESTDIR)/$(includedir)/mix/lmconfig.h
+	${INSTALL} -m 0755 libmix.so $(DESTDIR)/$(libdir)/libmix.so
+	${INSTALL} -m 0755 libmix.a $(DESTDIR)/$(libdir)/libmix.a
+	${INSTALL} -m 0755 libmix++.so $(DESTDIR)/$(libdir)/libmix++.so
+	${INSTALL} -m 0755 libmix++.a $(DESTDIR)/$(libdir)/libmix++.a
 	@echo ""
 	@echo "Installation complete."
 	@echo ""
 
 uninstall:
-	rm -fr /usr/include/mix /usr/lib/libmix* /usr/local/man/man3/libmix.3
+	rm -fr $(includedir)/mix $(libdir)/libmix* $(mandir)/man3/libmix.3
 
 cleanobj:
 	rm -f ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP} ${AESOBJ} ${NETOBJ} ${MISCOBJ} */core */*~ core *~ *.o libtest
--- configure.in.orig	2002-05-19 10:59:20.000000000 +0200
+++ configure.in	2010-03-20 22:18:22.000000000 +0100
@@ -4,7 +4,7 @@
 AC_CONFIG_HEADER(mix/lmconfig.h)
 
 compileas="0"
-net2="1"
+net2="0"
 
 dnl AC_ARG_WITH(libraries-as-c, 
 dnl 	[  --with-libraries-as-c         Generate LibMix binaries with GCC ],
@@ -24,11 +24,11 @@
 dnl         ]
 dnl )
 
-AC_ARG_WITH(no-net2,
-	[  --with-no-net2		Don't use net2 functions, don't require libnet/libpcap.],
+AC_ARG_WITH(net2,
+	[  --with-net2		Use net2 functions, requires libnet/libpcap.],
 	[
-		if test "x$withval" != "$xno" ; then
-			net2="0"
+		if test "x$withval" = "$xyes" ; then
+			net2="1"
 		fi
 	]
 )
@@ -36,7 +36,7 @@
 AC_PROG_CC
 AC_MSG_CHECKING(accepted compiler flags)
 if test $ac_cv_prog_gcc = yes; then
-    CCOPTS='-I. -Wall -O3 -funroll-loops -ansi -D_LIBMIX_'
+    CCOPTS='-I. -Wall -fPIC -ansi -D_LIBMIX_'
     AC_MSG_RESULT(GNU CC/ANSI (good))
 else
     CCOPTS='-I. -D_LIBMIX_'
@@ -74,6 +74,10 @@
 AC_SUBST(CXAUTO)
 AC_SUBST(AR)
 AC_SUBST(CLIB)
+AC_SUBST(LDFLAGS)
+AC_SUBST(libdir)
+AC_SUBST(mandir)
+AC_SUBST(includedir)
 AC_CHECK_PROGS(AR, ar, @true)
 AC_PROG_RANLIB
 AC_PROG_INSTALL