Attachment #224441 for bug #268444




includedir = /usr/@includedir@
libdir = /usr/@libdir@
mandir = @mandir@

# Compiler to produce C/C++ libraries with (autodetected)
GCC = @CCAUTO@

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

	@echo ""

libmix.so: mix/net.h ${AESOBJ} ${NETOBJ} ${MISCOBJ}
	${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 -Wl,-soname,libmix++.so.0 ${LDFLAGS} ${CLIB}

libmix++.a: mix/net.h ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
	${AR} -cr libmix++.a ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}

	${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 $(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 $(includedir)/mix $(libdir)/libmix* $(mandir)/man3/libmix.3

cleanobj:
	rm -f ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP} ${AESOBJ} ${NETOBJ} ${MISCOBJ} */core */*~ core *~ *.o libtest




AC_CONFIG_HEADER(mix/lmconfig.h)

compileas="0"
net2="0"

dnl AC_ARG_WITH(libraries-as-c, 
dnl 	[  --with-libraries-as-c         Generate LibMix binaries with GCC ],

dnl         ]
dnl )

AC_ARG_WITH(net2,
	[  --with-net2		Use net2 functions, requires libnet/libpcap.],
	[
		if test "x$withval" = "$xyes" ; then
			net2="1"
		fi
	]
)

AC_PROG_CC
AC_MSG_CHECKING(accepted compiler flags)
if test $ac_cv_prog_gcc = yes; then
    CCOPTS='-I. -Wall -fPIC -ansi -D_LIBMIX_'
    AC_MSG_RESULT(GNU CC/ANSI (good))
else
    CCOPTS='-I. -D_LIBMIX_'

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

Return to bug 268444

Lines 1-6 Link Here

(-)Makefile.in.orig (-19 / +20 lines)
1	INSTALL_INCLUDES_IN = /usr/include	1	includedir = /usr/@includedir@
2	INSTALL_LIBRARY_IN = /usr/lib	2	libdir = /usr/@libdir@
3	INSTALL_MANPAGE_IN = /usr/local/man	3	mandir = @mandir@
4		4
5	# Compiler to produce C/C++ libraries with (autodetected)	5	# Compiler to produce C/C++ libraries with (autodetected)
6	GCC = @CCAUTO@	6	GCC = @CCAUTO@
Lines 11-16 Link Here
11	INSTALL = @INSTALL@	11	INSTALL = @INSTALL@
12		12
13	CFLAGS = @CFLAGS@	13	CFLAGS = @CFLAGS@
		14	LDFLAGS = @LDFLAGS@
14	CLIB = @CLIB@	15	CLIB = @CLIB@
15		16
16	AESOBJ = aes/aes.o aes/cast-256.o aes/mars.o aes/saferp.o aes/twofish.o aes/rijndael.o aes/md5.o	17	AESOBJ = aes/aes.o aes/cast-256.o aes/mars.o aes/saferp.o aes/twofish.o aes/rijndael.o aes/md5.o
Lines 29-42 Link Here
29	@echo ""	30	@echo ""
30		31
31	libmix.so: mix/net.h ${AESOBJ} ${NETOBJ} ${MISCOBJ}	32	libmix.so: mix/net.h ${AESOBJ} ${NETOBJ} ${MISCOBJ}
32	${GCC} ${CFLAGS} -shared ${AESOBJ} ${NETOBJ} ${MISCOBJ} -o libmix.so ${CLIB}	33	${GCC} ${CFLAGS} -shared ${AESOBJ} ${NETOBJ} ${MISCOBJ} -o libmix.so ${LDFLAGS} -Wl,-soname,libmix.so.0 ${CLIB}
33		34
34	libmix.a: mix/net.h ${AESOBJ} ${NETOBJ} ${MISCOBJ}	35	libmix.a: mix/net.h ${AESOBJ} ${NETOBJ} ${MISCOBJ}
35	${AR} -cr libmix.a ${AESOBJ} ${NETOBJ} ${MISCOBJ}	36	${AR} -cr libmix.a ${AESOBJ} ${NETOBJ} ${MISCOBJ}
36	${RANLIB} libmix.a	37	${RANLIB} libmix.a
37		38
38	libmix++.so: mix/net.h ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}	39	libmix++.so: mix/net.h ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
39	${GPP} ${CFLAGS} -shared ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP} -o libmix++.so ${CLIB}	40	${GPP} ${CFLAGS} -shared ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP} -o libmix++.so -Wl,-soname,libmix++.so.0 ${LDFLAGS} ${CLIB}
40		41
41	libmix++.a: mix/net.h ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}	42	libmix++.a: mix/net.h ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
42	${AR} -cr libmix++.a ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}	43	${AR} -cr libmix++.a ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
Lines 116-140 Link Here
116	${GCC} ${CFLAGS} -c misc/exclude.c -o misc/exclude.o	117	${GCC} ${CFLAGS} -c misc/exclude.c -o misc/exclude.o
117		118
118	install: mix/mix.h mix/net.h mix/aes.h mix/misc.h libmix.so libmix.a	119	install: mix/mix.h mix/net.h mix/aes.h mix/misc.h libmix.so libmix.a
119	${INSTALL} -d ${INSTALL_INCLUDES_IN}/mix/	120	${INSTALL} -d $(DESTDIR)/$(includedir)/mix/
120	${INSTALL} -d ${INSTALL_LIBRARY_IN}/	121	${INSTALL} -d $(DESTDIR)/$(libdir)/
121	${INSTALL} -d ${INSTALL_MANPAGE_IN}/man3/	122	${INSTALL} -d $(DESTDIR)/$(mandir)/man3/
122	${INSTALL} -m 0644 libmix.3 ${INSTALL_MANPAGE_IN}/man3/libmix.3	123	${INSTALL} -m 0644 libmix.3 $(DESTDIR)/$(mandir)/man3/libmix.3
123	${INSTALL} -m 0644 mix/misc.h ${INSTALL_INCLUDES_IN}/mix/misc.h	124	${INSTALL} -m 0644 mix/misc.h $(DESTDIR)/$(includedir)/mix/misc.h
124	${INSTALL} -m 0644 mix/net.h ${INSTALL_INCLUDES_IN}/mix/net.h	125	${INSTALL} -m 0644 mix/net.h $(DESTDIR)/$(includedir)/mix/net.h
125	${INSTALL} -m 0644 mix/aes.h ${INSTALL_INCLUDES_IN}/mix/aes.h	126	${INSTALL} -m 0644 mix/aes.h $(DESTDIR)/$(includedir)/mix/aes.h
126	${INSTALL} -m 0644 mix/mix.h ${INSTALL_INCLUDES_IN}/mix/mix.h	127	${INSTALL} -m 0644 mix/mix.h $(DESTDIR)/$(includedir)/mix/mix.h
127	${INSTALL} -m 0644 mix/lmconfig.h ${INSTALL_INCLUDES_IN}/mix/lmconfig.h	128	${INSTALL} -m 0644 mix/lmconfig.h $(DESTDIR)/$(includedir)/mix/lmconfig.h
128	${INSTALL} -m 0755 libmix.so ${INSTALL_LIBRARY_IN}/libmix.so	129	${INSTALL} -m 0755 libmix.so $(DESTDIR)/$(libdir)/libmix.so
129	${INSTALL} -m 0755 libmix.a ${INSTALL_LIBRARY_IN}/libmix.a	130	${INSTALL} -m 0755 libmix.a $(DESTDIR)/$(libdir)/libmix.a
130	${INSTALL} -m 0755 libmix++.so ${INSTALL_LIBRARY_IN}/libmix++.so	131	${INSTALL} -m 0755 libmix++.so $(DESTDIR)/$(libdir)/libmix++.so
131	${INSTALL} -m 0755 libmix++.a ${INSTALL_LIBRARY_IN}/libmix++.a	132	${INSTALL} -m 0755 libmix++.a $(DESTDIR)/$(libdir)/libmix++.a
132	@echo ""	133	@echo ""
133	@echo "Installation complete."	134	@echo "Installation complete."
134	@echo ""	135	@echo ""
135		136
136	uninstall:	137	uninstall:
137	rm -fr /usr/include/mix /usr/lib/libmix* /usr/local/man/man3/libmix.3	138	rm -fr $(includedir)/mix $(libdir)/libmix* $(mandir)/man3/libmix.3
138		139
139	cleanobj:	140	cleanobj:
140	rm -f ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP} ${AESOBJ} ${NETOBJ} ${MISCOBJ} /core /~ core ~ *.o libtest	141	rm -f ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP} ${AESOBJ} ${NETOBJ} ${MISCOBJ} /core /~ core ~ *.o libtest

Lines 4-10 Link Here

(-)configure.in.orig (-6 / +10 lines)
4	AC_CONFIG_HEADER(mix/lmconfig.h)	4	AC_CONFIG_HEADER(mix/lmconfig.h)
5		5
6	compileas="0"	6	compileas="0"
7	net2="1"	7	net2="0"
8		8
9	dnl AC_ARG_WITH(libraries-as-c,	9	dnl AC_ARG_WITH(libraries-as-c,
10	dnl [ --with-libraries-as-c Generate LibMix binaries with GCC ],	10	dnl [ --with-libraries-as-c Generate LibMix binaries with GCC ],
Lines 24-34 Link Here
24	dnl ]	24	dnl ]
25	dnl )	25	dnl )
26		26
27	AC_ARG_WITH(no-net2,	27	AC_ARG_WITH(net2,
28	[ --with-no-net2 Don't use net2 functions, don't require libnet/libpcap.],	28	[ --with-net2 Use net2 functions, requires libnet/libpcap.],
29	[	29	[
30	if test "x$withval" != "$xno" ; then	30	if test "x$withval" = "$xyes" ; then
31	net2="0"	31	net2="1"
32	fi	32	fi
33	]	33	]
34	)	34	)
Lines 36-42 Link Here
36	AC_PROG_CC	36	AC_PROG_CC
37	AC_MSG_CHECKING(accepted compiler flags)	37	AC_MSG_CHECKING(accepted compiler flags)
38	if test $ac_cv_prog_gcc = yes; then	38	if test $ac_cv_prog_gcc = yes; then
39	CCOPTS='-I. -Wall -O3 -funroll-loops -ansi -D_LIBMIX_'	39	CCOPTS='-I. -Wall -fPIC -ansi -D_LIBMIX_'
40	AC_MSG_RESULT(GNU CC/ANSI (good))	40	AC_MSG_RESULT(GNU CC/ANSI (good))
41	else	41	else
42	CCOPTS='-I. -D_LIBMIX_'	42	CCOPTS='-I. -D_LIBMIX_'
Lines 74-79 Link Here
74	AC_SUBST(CXAUTO)	74	AC_SUBST(CXAUTO)
75	AC_SUBST(AR)	75	AC_SUBST(AR)
76	AC_SUBST(CLIB)	76	AC_SUBST(CLIB)
		77	AC_SUBST(LDFLAGS)
		78	AC_SUBST(libdir)
		79	AC_SUBST(mandir)
		80	AC_SUBST(includedir)
77	AC_CHECK_PROGS(AR, ar, @true)	81	AC_CHECK_PROGS(AR, ar, @true)
78	AC_PROG_RANLIB	82	AC_PROG_RANLIB
79	AC_PROG_INSTALL	83	AC_PROG_INSTALL