projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- cleanup
[oweals/gnunet.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 3caaf253a2708a4e8b33eea7fa8385b683b719d0..3ab772d6a845efbe40b12483790e37c9d52f8184 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-22,13
+22,13
@@
#
AC_PREREQ(2.61)
# Checks for programs.
#
AC_PREREQ(2.61)
# Checks for programs.
-AC_INIT([gnunet], [0.9.
3
],[bug-gnunet@gnu.org])
+AC_INIT([gnunet], [0.9.
4
],[bug-gnunet@gnu.org])
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
AC_CANONICAL_SYSTEM
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([gnunet], [0.9.
3
])
+AM_INIT_AUTOMAKE([gnunet], [0.9.
4
])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_HEADERS([gnunet_config.h])
AH_TOP([#define _GNU_SOURCE 1])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_HEADERS([gnunet_config.h])
AH_TOP([#define _GNU_SOURCE 1])
@@
-598,10
+598,17
@@
AC_ARG_WITH(mysql,
fi
],
[AC_MSG_RESULT([--with-mysql not specified])
fi
],
[AC_MSG_RESULT([--with-mysql not specified])
- LDFLAGS="-L/usr/lib/mysql $LDFLAGS $ZLIBS"
+ if test -d "/usr/lib64/mysql"; then
+ MYSQL_LIBDIR="/usr/lib64/mysql"
+ elif test -d "/usr/lib/mysql"; then
+ MYSQL_LIBDIR="/usr/lib/mysql"
+ else
+ MYSQL_LIBDIR="/usr/lib"
+ fi
+ LDFLAGS="-L$MYSQL_LIBDIR $LDFLAGS $ZLIBS"
AC_CHECK_LIB(mysqlclient, mysql_init,
[AC_CHECK_HEADERS(mysql/mysql.h,
AC_CHECK_LIB(mysqlclient, mysql_init,
[AC_CHECK_HEADERS(mysql/mysql.h,
- MYSQL_LDFLAGS="-L
/usr/lib/mysql
"
+ MYSQL_LDFLAGS="-L
$MYSQL_LIBDIR
"
mysql=true
, [], [$CYGWIN_MYSQL_MAGIC])])
mysql=true
, [], [$CYGWIN_MYSQL_MAGIC])])
@@
-1142,6
+1149,7
@@
src/arm/Makefile
src/arm/arm.conf
src/ats/Makefile
src/ats/ats.conf
src/arm/arm.conf
src/ats/Makefile
src/ats/ats.conf
+src/ats-tool/Makefile
src/block/Makefile
src/chat/Makefile
src/chat/chat.conf
src/block/Makefile
src/chat/Makefile
src/chat/chat.conf
@@
-1201,25
+1209,37
@@
src/vpn/Makefile
src/vpn/vpn.conf
src/integration-tests/Makefile
pkgconfig/Makefile
src/vpn/vpn.conf
src/integration-tests/Makefile
pkgconfig/Makefile
+pkgconfig/gnunetats.pc
pkgconfig/gnunetarm.pc
pkgconfig/gnunetblock.pc
pkgconfig/gnunetcore.pc
pkgconfig/gnunetdatacache.pc
pkgconfig/gnunetdatastore.pc
pkgconfig/gnunetdht.pc
pkgconfig/gnunetarm.pc
pkgconfig/gnunetblock.pc
pkgconfig/gnunetcore.pc
pkgconfig/gnunetdatacache.pc
pkgconfig/gnunetdatastore.pc
pkgconfig/gnunetdht.pc
-pkgconfig/gnunetdhtlog.pc
+pkgconfig/gnunetdns.pc
+pkgconfig/gnunetdnsparser.pc
pkgconfig/gnunetdv.pc
pkgconfig/gnunetfragmentation.pc
pkgconfig/gnunetfs.pc
pkgconfig/gnunetdv.pc
pkgconfig/gnunetfragmentation.pc
pkgconfig/gnunetfs.pc
+pkgconfig/gnunetgns.pc
pkgconfig/gnunethello.pc
pkgconfig/gnunethello.pc
+pkgconfig/gnunetlockmanager.pc
+pkgconfig/gnunetmesh.pc
+pkgconfig/gnunetmysql.pc
+pkgconfig/gnunetnamestore.pc
pkgconfig/gnunetnat.pc
pkgconfig/gnunetnse.pc
pkgconfig/gnunetpeerinfo.pc
pkgconfig/gnunetnat.pc
pkgconfig/gnunetnse.pc
pkgconfig/gnunetpeerinfo.pc
+pkgconfig/gnunetpostgres.pc
pkgconfig/gnunetregex.pc
pkgconfig/gnunetstatistics.pc
pkgconfig/gnunetregex.pc
pkgconfig/gnunetstatistics.pc
+pkgconfig/gnunetstream.pc
+pkgconfig/gnunettestbed.pc
pkgconfig/gnunettesting.pc
pkgconfig/gnunettransport.pc
pkgconfig/gnunettesting.pc
pkgconfig/gnunettransport.pc
+pkgconfig/gnunettun.pc
pkgconfig/gnunetutil.pc
pkgconfig/gnunetutil.pc
+pkgconfig/gnunetvpn.pc
])
AC_OUTPUT
])
AC_OUTPUT