[GNUnet-SVN] r7249 - in freeway: . etc/support/clib native po

[gnunet]

Author: mdonoughe
Date: 2008-06-15 11:30:52 -0600 (Sun, 15 Jun 2008)
New Revision: 7249

Modified:
   freeway/build.sh
   freeway/configure.ac
   freeway/etc/support/clib/Makefile.am
   freeway/native/Makefile.am
   freeway/po/POTFILES
   freeway/po/POTFILES.in
Log:
create jni libraries with the proper extension on Macs
fix a warning about caching in autoconfig
remove org_gnu_freeway_server_CPluginLoader.c from POTFILES(because it doesn't 
exist)


Modified: freeway/build.sh
===================================================================
--- freeway/build.sh    2008-06-15 17:30:45 UTC (rev 7248)
+++ freeway/build.sh    2008-06-15 17:30:52 UTC (rev 7249)
@@ -4,7 +4,5 @@
 #
 
 make || exit 1
-cp native/.libs/lib*.so* etc/support/clib/.libs/*.so* native/.libs/lib*.dylib 
etc/support/clib/.libs/lib*.dylib build/ > /dev/null 2>&1
-mv build/libfreeway-clib.dylib build/libfreeway-clib.jnilib > /dev/null 2>&1
-mv build/libcpluginloader.dylib build/libcpluginloader.jnilib > /dev/null 2>&1
+cp native/.libs/lib*.so* etc/support/clib/.libs/*.so* native/.libs/lib*.jnilib 
etc/support/clib/.libs/lib*.jnilib build/ > /dev/null 2>&1
 exit 0

Modified: freeway/configure.ac
===================================================================
--- freeway/configure.ac        2008-06-15 17:30:45 UTC (rev 7248)
+++ freeway/configure.ac        2008-06-15 17:30:52 UTC (rev 7249)
@@ -72,16 +72,16 @@
 
 # Special check for broken Operating Systems (OS X)
 AC_CACHE_CHECK(whether ${CC-cc} accepts -no-cpp-precomp,
-cv_prog_cc_darwin_cpp_precomp,
+_cv_prog_cc_darwin_cpp_precomp,
 [echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -no-cpp-precomp -c conftest.c 2>&1`"; then
-  cv_prog_cc_darwin_cpp_precomp=yes
+  _cv_prog_cc_darwin_cpp_precomp=yes
 else
-  cv_prog_cc_darwin_cpp_precomp=no
+  _cv_prog_cc_darwin_cpp_precomp=no
 fi
 rm -f conftest*
 ])
-if test $cv_prog_cc_darwin_cpp_precomp = yes; then
+if test $_cv_prog_cc_darwin_cpp_precomp = yes; then
   CFLAGS="$CFLAGS -no-cpp-precomp"
 fi
 
@@ -93,13 +93,16 @@
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
 
+# Check for Darwin where jni libraries have different extensions
+AM_CONDITIONAL(IS_DARWIN, test x`uname` = "xDarwin")
+
 #from gnunet
 
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 
 # Check for headers that are ALWAYS required
-AC_CHECK_HEADERS([fcntl.h math.h errno.h limits.h stdio.h locale.h sys/stat.h 
sys/types.h pthread.h],,AC_MSG_ERROR([Compiling GNUnet requires standard UNIX 
headers files]))
+AC_CHECK_HEADERS([fcntl.h math.h errno.h limits.h stdio.h locale.h sys/stat.h 
sys/types.h pthread.h],,AC_MSG_ERROR([Compiling Freeway requires standard UNIX 
headers files]))
 
 # Checks for headers that are only required on some systems or opional (and 
where we do NOT abort if they are not there)
 AC_CHECK_HEADERS([langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/vfs.h 
arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h 
sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h])

Modified: freeway/etc/support/clib/Makefile.am
===================================================================
--- freeway/etc/support/clib/Makefile.am        2008-06-15 17:30:45 UTC (rev 
7248)
+++ freeway/etc/support/clib/Makefile.am        2008-06-15 17:30:52 UTC (rev 
7249)
@@ -4,8 +4,13 @@
   libfreeway-clib.la
 
 libfreeway_clib_la_LDFLAGS = \
-  -export-dynamic -version-info 0:0:0 
+  -export-dynamic -version-info 0:0:0
 
+if IS_DARWIN
+libfreeway_clib_la_LDFLAGS += \
+  -shrext .jnilib
+endif
+
 BUILT_SOURCES = freeway-clib.h
 
 libfreeway_clib_la_SOURCES = \

Modified: freeway/native/Makefile.am
===================================================================
--- freeway/native/Makefile.am  2008-06-15 17:30:45 UTC (rev 7248)
+++ freeway/native/Makefile.am  2008-06-15 17:30:52 UTC (rev 7249)
@@ -4,7 +4,13 @@
 lib_LTLIBRARIES = libcpluginloader.la
 
 libcpluginloader_la_LDFLAGS = \
-  -export-dynamic -version-info 0:0:0 
+  -export-dynamic -version-info 0:0:0
+
+if IS_DARWIN
+libcpluginloader_la_LDFLAGS += \
+  -shrext .jnilib
+endif
+
 libcpluginloader_la_LIBADD = \
   -lgnunetutil $(LIBINTL)
 

Modified: freeway/po/POTFILES
===================================================================
--- freeway/po/POTFILES 2008-06-15 17:30:45 UTC (rev 7248)
+++ freeway/po/POTFILES 2008-06-15 17:30:52 UTC (rev 7249)
@@ -1 +0,0 @@
-     ../native/org_gnu_freeway_server_CPluginLoader.c

Modified: freeway/po/POTFILES.in
===================================================================
--- freeway/po/POTFILES.in      2008-06-15 17:30:45 UTC (rev 7248)
+++ freeway/po/POTFILES.in      2008-06-15 17:30:52 UTC (rev 7249)
@@ -1,2 +1 @@
 # List of source files which contain translatable strings.
-native/org_gnu_freeway_server_CPluginLoader.c