Changeset 259

Timestamp:

04/16/09 22:56:16 (3 years ago)

Author:

thaeron

Message:

orthographe : ajout dans les makefiles (anciens + configure)

Location:

trunk

Files:

• configure (modified) (7 diffs)
• src/libtd_bdd/browser/makefile (modified) (1 diff)
• src/libtd_bdd/makefile (modified) (1 diff)
• src/makefile (modified) (1 diff)
• src/modules/makefile (modified) (5 diffs)
• src/modules/makefile.ns (modified) (3 diffs)
• src/modules/makefile.old (modified) (3 diffs)
• src/modules/orthographe.cxx (modified) (1 diff)
• tests/hunspell_test.cxx (added)

trunk/configure

@@ -144 +144 @@
 ENABLE_PYTHON=1
 ENABLE_OPENSSL=1
+ENABLE_HUNSPELL=1
 ENABLE_IPV6=0
 ENABLE_INTERNATIONALIZE=0
@@ -306 +307 @@
                 then
                         ENABLE_PYTHON=0
+                fi
+                
+                if [ "$option" = "--disable-hunspell" ]
+                then
+                        ENABLE_HUNSPELL=0
+                fi
+                
+                if [ "$option" = "--enable-hunspell" ]
+                then
+                        ENABLE_HUNSPELL=1
                 fi
                 
@@ -445 +456 @@
                         OPENSSL_CFLAGS="-DUSE_OPENSSL"
                         OPENSSL_LDFLAGS="-lssl"
+                fi      
+        fi
+        
+        if [ $ENABLE_HUNSPELL -eq 1 ]
+        then
+                echo -n "Checking for hunspell... "
+                if ! ($CXX -O0 tests/hunspell_test.cxx -o /dev/null -lhunspell-1.2 1>/dev/null 2>/dev/null) 2>/dev/null
+                then
+                        echo "Not supported"
+                        ENABLE_HUNSPELL=0
+                else
+                        echo "OK"
+                        HUNSPELL_LDFLAGS="-lhunspell-1.2"
                 fi      
         fi
@@ -490 +514 @@
                 echo "MYSQL LIB      :  $MYSQL_LIBS"
                 echo "MYSQL HEADER   :  $MYSQL_INCLUDES"
+                echo ""
+                echo "OPENSSL CFLAGS :  $OPENSSL_CFLAGS"
+                echo "OPENSSL LDFLAGS :  $OPENSSL_LDFLAGS"
+                echo ""
+                echo "HUNSPELL LDFLAGS :  $HUNSPELL_LDFLAGS"
         fi
 }
@@ -636 +665 @@
                 echo "OPENSSL_LDFLAGS=-lssl" >> makefile
         fi
+        if [ $ENABLE_HUNSPELL -eq 1 ]
+        then
+                echo ENABLE_HUNSPELL=1 >> makefile
+                echo HUNSPELL_LDFLAGS=$HUNSPELL_LDFLAGS >> makefile
+        fi
         if [ $ENABLE_CXX -eq 1 ]
         then
@@ -648 +682 @@
                 echo sock_flag=-lwsock32 >> makefile
                 echo td_flag=-L. -ltd_bdd >> makefile
-        fi
+        fi      
         
         echo "" >> makefile
@@ -677 +711 @@
                         echo "--enable-mysql                 Build modules that use mysql [auto]"
                         echo "--enable-openssl               Enable use of openssl in coding module [auto]"
+                        echo "--enable-hunspell              Build orthographe module that use libhunspell [auto]"
 #                       echo "--with-mysql-lib=path          Path of libmysqlclient (if mysql_config is not present)"
 #                       echo "--with-mysql-header=path       Path of mysql header (if mysql_config is not present)"

trunk/src/libtd_bdd/browser/makefile

@@ -1 +1 @@
 CC=gcc
 CXX=g++
-CFLAGS=-Wall -g
+CFLAGS=-Wall -O3
 LDFLAGS=-Wall -L. -ltd_bdd
 EXT=

trunk/src/libtd_bdd/makefile

@@ -1 +1 @@
 CC=gcc
 CXX=g++
-CFLAGS=-Wall -fPIC -g
+CFLAGS=-Wall -fPIC -O3
 LDFLAGS=-Wall -shared -Wl,-soname,libtd_bdd.so
 EXT=.so

trunk/src/makefile

@@ -1 +1 @@
 CC=gcc
 CXX=g++
-CFLAGS=-Wall -g -DENABLE_NS_MALLOC -DNS_MALLOC_DEV
+CFLAGS=-Wall -O3
 LDFLAGS=-Wall -Wl,--export-dynamic -ldl -L. -ltd_bdd
 ext_bin=

trunk/src/modules/makefile

@@ -1 +1 @@
 CC=gcc
 CXX=g++
-CFLAGS=-Wall -fPIC -g -DENABLE_NS_MALLOC
+CFLAGS=-Wall -fPIC -O3
 LDFLAGS=-Wall -shared
 ext_mod=.so
@@ -12 +12 @@
 OPENSSL_CFLAGS=-DUSE_OPENSSL
 OPENSSL_LDFLAGS=-lssl
+ENABLE_HUNSPELL=1
+HUNSPELL_LDFLAGS=-lhunspell-1.2
 ENABLE_CXX=1
 eval_cflags=-DLONG_DOUBLE
@@ -35 +37 @@
 endif
 
+ifdef ENABLE_HUNSPELL
+        +$(MAKE) orthographe
+endif
+
 #       +$(MAKE) svn-commits
 #       +$(MAKE) nb_users
@@ -310 +316 @@
         $(CC) $(CFLAGS) -c allcompo.c
 
+orthographe.o: orthographe.cxx ../NewSyndrome-module.h admin-public.h
+        $(CXX) $(CFLAGS) $(HUNPSELL_CFLAGS) -c orthographe.cxx
+
 #---
 
@@ -509 +518 @@
 allcompo: allcompo.o requete.o
         $(CC) $(LDFLAGS) -o allcompo$(ext_mod) allcompo.o requete.o $(sock_flag)
+        
+orthographe: orthographe.o
+        $(CXX) $(LDFLAGS) $(HUNSPELL_LDFLAGS) $(cxx_flag) -fPIC -lstdc++ -o orthographe$(ext_mod) orthographe.o

trunk/src/modules/makefile.ns

@@ -19 +19 @@
 .endif
 
+.ifdef ENABLE_HUNSPELL
+        +$(MAKE) orthographe
+.endif
+
 #       +$(MAKE) svn-commits
 #       +$(MAKE) nb_users
@@ -294 +298 @@
         $(CC) $(CFLAGS) -c allcompo.c
 
+orthographe.o: orthographe.cxx ../NewSyndrome-module.h admin-public.h
+        $(CXX) $(CFLAGS) $(HUNPSELL_CFLAGS) -c orthographe.cxx
+
 #---
 
@@ -493 +500 @@
 allcompo: allcompo.o requete.o
         $(CC) $(LDFLAGS) -o allcompo$(ext_mod) allcompo.o requete.o $(sock_flag)
+        
+orthographe: orthographe.o
+        $(CXX) $(LDFLAGS) $(HUNSPELL_LDFLAGS) $(cxx_flag) -fPIC -lstdc++ -o orthographe$(ext_mod) orthographe.o

trunk/src/modules/makefile.old

@@ -21 +21 @@
 endif
 
+ifdef ENABLE_HUNSPELL
+        +$(MAKE) orthographe
+endif
+
+
 #       +$(MAKE) svn-commits
 #       +$(MAKE) nb_users
@@ -233 +238 @@
         $(CC) $(CFLAGS) -c $(INC_MYSQL) idea_mysql.c
 
+orthographe.o: orthographe.cxx ../NewSyndrome-module.h admin-public.h
+        $(CXX) $(CFLAGS) -c orthographe.cxx
+        
 module_mysql.o: module_mysql.c module_mysql.h
         $(CC) $(CFLAGS) -c $(INC_MYSQL) module_mysql.c
@@ -316 +324 @@
         $(CXX) $(LDFLAGS) $(cxx_flag) -fPIC -lstdc++ -lm -o eval$(ext_mod) eval.o 
 
+orthographe: orthographe.o
+        $(CXX) $(LDFLAGS) $(cxx_flag) -fPIC -lstdc++ -lhunspell-1.2 -o orthographe$(ext_mod) orthographe.o 
+
 url_mysql: url_mysql.o module_mysql.o
         $(CC) $(LDFLAGS) -o url_mysql$(ext_mod) url_mysql.o module_mysql.o $(LIB_MYSQL)

trunk/src/modules/orthographe.cxx

@@ -270 +270 @@
         result = (char *) malloc (sizeof (char) * (taille + 1));
         
-        memset (result, 0, taille + 1);
+        result[0] = '\0';
         
         tmp = i->argu[0];