* src/aclocal.m4: Better expat and openssl detection (thanks to

Anton Vanin)

* src/**/Makefile.in: Updated (thanks to Anton Vanin)
* src/configure.ac: Likewise

SVN Revision: 267

src/stringprep/Makefile.in

@@ -1,23 +1,15 @@
 # $Id$
 
-
 CC = @CC@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @ERLANG_CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-
-INCLUDES = @ERLANG_CFLAGS@
-
-LIBDIRS = @ERLANG_LIBS@
+LIBS = @LIBS@ @ERLANG_LIBS@
 
 SUBDIRS = 
 
-
 ERLSHLIBS = ../stringprep_drv.so
 
-
-
 OUTDIR = ..
 EFLAGS = -I .. -pz ..
 OBJS   = \
@@ -28,17 +20,13 @@ all:    $(OBJS) $(ERLSHLIBS)
 $(OUTDIR)/%.beam:       %.erl
 	erlc -W $(EFLAGS) -o $(OUTDIR) $<
 
-
-
 #all:	$(ERLSHLIBS)
 #	erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt
 
 $(ERLSHLIBS):	../%.so:	%.c uni_data.c uni_norm.c
-			gcc -Wall -O2 $(INCLUDES) $(LIBDIRS) \
-			$(subst ../,,$(subst .so,.c,$@)) \
-			-lerl_interface \
-			-lei \
-			-o $@ -fpic -shared \
+			gcc -Wall -O2 $(CFLAGS) $(LDFLAGS) $(INCLUDES) \
+			$(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
+			-o $@ -fpic -shared
 
 clean:
 	rm -f $(OBJS) $(ERLSHLIBS)