@@ -27,3 +27,5 @@ subdirs: clean: rm -rf ebin/* + cd googleurl; make clean + Makefile.am @@ -66,10 +66,15 @@ AC_DEFUN([AC_CHECK_ICU], [ AC_MSG_CHECKING(ICU_LIBS) ICU_LIBS=`$ICU_CONFIG --ldflags` AC_MSG_RESULT($ICU_LIBS) + + AC_MSG_CHECKING(ICU_PREFIX) + ICU_PREFIX=`$ICU_CONFIG --prefix` + AC_MSG_RESULT($ICU_PREFIX) else ICU_CFLAGS="" ICU_CXXFLAGS="" ICU_LIBS="" + ICU_PREFIX="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. ifelse([$3], ,echo "can't find ICU >= $1",) @@ -78,6 +83,7 @@ AC_DEFUN([AC_CHECK_ICU], [ AC_SUBST(ICU_CFLAGS) AC_SUBST(ICU_CXXFLAGS) AC_SUBST(ICU_LIBS) + AC_SUBST(ICU_PREFIX) fi if test $succeeded = yes; then configure.ac @@ -1,4 +1,5 @@ +ICU_INCLUDE = $(ICU_PREFIX)/include objects = port.o erl_comm.o gurl.o url_parse.o url_util.o logging.o url_canon_etc.o url_canon_fileurl.o url_canon_host.o url_canon_internal.o url_canon_ip.o url_canon_mailtourl.o url_canon_path.o url_canon_pathurl.o url_canon_query.o url_canon_relative.o url_canon_stdurl.o url_parse_file.o url_canon_icu.o @@ -9,7 +10,7 @@ sources = src/port.cc src/erl_comm.c src/gurl.cc src/url_parse.cc src/url_util.c all: bin/port bin/port: $(objects) bin - g++ -o bin/port -Isrc -I$(ERLANG_LIB_DIR_erl_interface)/include -L$(ERLANG_LIB_DIR_erl_interface)/lib $(ICU_LIBS) -lerl_interface -lei $(objects) + g++ -o bin/port -Isrc -I$(ICU_INCLUDE) -I$(ERLANG_LIB_DIR_erl_interface)/include -L$(ERLANG_LIB_DIR_erl_interface)/lib $(ICU_LIBS) -lerl_interface -lei $(objects) bin: mkdir bin @@ -32,7 +33,7 @@ src/url_file.cc: src/url_parse_internal.h $(objects): $(sources) - g++ -c $(sources) -Isrc -I.. -I$(ERLANG_LIB_DIR_erl_interface)/include + g++ -c $(sources) -Isrc -I.. -I$(ERLANG_LIB_DIR_erl_interface)/include -I$(ICU_INCLUDE) clean: rm $(objects) bin/port googleurl/Makefile.am googleurl/src/unicode/brkiter.h googleurl/src/unicode/caniter.h googleurl/src/unicode/chariter.h googleurl/src/unicode/dbbi.h googleurl/src/unicode/docmain.h googleurl/src/unicode/dtintrv.h googleurl/src/unicode/locid.h googleurl/src/unicode/normlzr.h googleurl/src/unicode/parseerr.h googleurl/src/unicode/parsepos.h googleurl/src/unicode/platform.h googleurl/src/unicode/platform.h.in googleurl/src/unicode/ppalmos.h googleurl/src/unicode/putil.h googleurl/src/unicode/pwin32.h googleurl/src/unicode/rbbi.h googleurl/src/unicode/rep.h googleurl/src/unicode/resbund.h googleurl/src/unicode/schriter.h googleurl/src/unicode/strenum.h googleurl/src/unicode/symtable.h googleurl/src/unicode/ubidi.h googleurl/src/unicode/ubrk.h googleurl/src/unicode/ucasemap.h googleurl/src/unicode/ucat.h googleurl/src/unicode/uchar.h googleurl/src/unicode/uchriter.h googleurl/src/unicode/uclean.h googleurl/src/unicode/ucnv.h googleurl/src/unicode/ucnv_cb.h googleurl/src/unicode/ucnv_err.h googleurl/src/unicode/uconfig.h googleurl/src/unicode/udata.h googleurl/src/unicode/udeprctd.h googleurl/src/unicode/udraft.h googleurl/src/unicode/uenum.h googleurl/src/unicode/uidna.h googleurl/src/unicode/uintrnal.h googleurl/src/unicode/uiter.h googleurl/src/unicode/uloc.h googleurl/src/unicode/umachine.h googleurl/src/unicode/umisc.h googleurl/src/unicode/unifilt.h googleurl/src/unicode/unifunct.h googleurl/src/unicode/unimatch.h googleurl/src/unicode/uniset.h googleurl/src/unicode/unistr.h googleurl/src/unicode/unorm.h googleurl/src/unicode/uobject.h googleurl/src/unicode/uobslete.h googleurl/src/unicode/urename.h googleurl/src/unicode/urep.h googleurl/src/unicode/ures.h googleurl/src/unicode/uscript.h googleurl/src/unicode/uset.h googleurl/src/unicode/usetiter.h googleurl/src/unicode/ushape.h googleurl/src/unicode/usprep.h googleurl/src/unicode/ustring.h googleurl/src/unicode/usystem.h googleurl/src/unicode/utext.h googleurl/src/unicode/utf.h googleurl/src/unicode/utf16.h googleurl/src/unicode/utf32.h googleurl/src/unicode/utf8.h googleurl/src/unicode/utf_old.h googleurl/src/unicode/utrace.h googleurl/src/unicode/utypes.h googleurl/src/unicode/uversion.h 8618016ac50ba05243759d82a8a9251befcbd9a7 xanados bjterry@Benjamin-Terrys-MacBook-Pro-15.local http://github.com/formido/spider/commit/3a73950ffdd60fb1b4ebc92683579bcb68c5fc98 3a73950ffdd60fb1b4ebc92683579bcb68c5fc98 2008-09-14T20:57:43-07:00 2008-09-14T20:57:43-07:00 Hopefully no longer need headers from ICU, since we should be detecting the location of them in our configure.ac. 78c1da463cfa22915b34ec12d584987ffe0eb390 xanados bjterry@Benjamin-Terrys-MacBook-Pro-15.local