make compilation on older OSX versios work by removing the # from the librrd.sym...

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1632 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/configure.ac b/configure.ac
index 04f9a11..f08b4e9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -367,7 +367,7 @@ CONFIGURE_PART(Resolve Portability Issues)
 dnl Do we need getopt_long
 
 build_getopt=no
 dnl Do we need getopt_long
 
 build_getopt=no

-RRD_GETOPT_LONG="#"
+RRD_GETOPT_LONG="LIBC_HAS_GETOPT_LONG"

 AC_CHECK_FUNC(getopt_long,[],[
 RRD_GETOPT_LONG="getopt_long"
 build_getopt=yes
 AC_CHECK_FUNC(getopt_long,[],[
 RRD_GETOPT_LONG="getopt_long"
 build_getopt=yes


@@ -873,7 +873,7 @@ AC_CONFIG_FILES([examples/Makefile])
 AC_CONFIG_FILES([doc/Makefile])
 AC_CONFIG_FILES([po/Makefile.in])
 AC_CONFIG_FILES([src/Makefile])
 AC_CONFIG_FILES([doc/Makefile])
 AC_CONFIG_FILES([po/Makefile.in])
 AC_CONFIG_FILES([src/Makefile])

-AC_CONFIG_FILES([src/librrd.sym])
+AC_CONFIG_FILES([src/librrd.sym.in])

 AC_CONFIG_FILES([src/librrd.pc])
 AC_CONFIG_FILES([bindings/Makefile])
 AC_CONFIG_FILES([bindings/tcl/Makefile])
 AC_CONFIG_FILES([src/librrd.pc])
 AC_CONFIG_FILES([bindings/Makefile])
 AC_CONFIG_FILES([bindings/tcl/Makefile])

diff --git a/src/Makefile.am b/src/Makefile.am
index 8a563f5..9c14263 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -115,5 +115,8 @@ pkgconfig_DATA = librrd.pc
 # strftime is here because we do not usually need it. unices have propper
 # iso date support
 EXTRA_DIST= librrd.pc.in strftime.c strftime.h  rrd_getopt.c rrd_getopt1.c rrd_getopt.h \
 # strftime is here because we do not usually need it. unices have propper
 # iso date support
 EXTRA_DIST= librrd.pc.in strftime.c strftime.h  rrd_getopt.c rrd_getopt1.c rrd_getopt.h \

-       win32comp.c  rrd_thread_safe_nt.c get_ver.awk librrd.sym
+       win32comp.c  rrd_thread_safe_nt.c get_ver.awk librrd.sym.in.in

 
 

+
+librrd.sym: librrd.sym.in
+       grep -v LIBC_HAS_GETOPT_LONG librrd.sym.in >$@

diff --git a/src/librrd.sym.in b/src/librrd.sym.in
deleted file mode 100644 (file)
index 6775a80..0000000
--- a/src/librrd.sym.in
+++ /dev/null
@@ -1,61 +0,0 @@
-rrd_clear_error
-rrd_close
-rrd_cmd_flush
-rrd_create
-rrd_create_r
-rrd_dontneed
-rrd_dump
-rrd_dump_r
-rrd_fetch
-rrd_fetch_r
-rrd_first
-rrd_first_r
-rrd_flush
-rrd_free
-rrd_free_context
-rrd_freemem
-rrd_get_context
-rrd_get_error
-rrd_graph
-rrd_graph_v
-rrd_info
-rrd_info_free
-rrd_info_print
-rrd_info_push
-rrd_info_r
-rrd_init
-rrd_last
-rrd_last_r
-rrd_lastupdate
-rrd_lastupdate_r
-rrd_lock
-rrd_new_context
-rrd_open
-rrd_parsetime
-rrd_proc_start_end
-rrd_read
-rrd_resize
-rrd_restore
-rrd_seek
-rrd_set_error
-rrd_set_to_DINF
-rrd_set_to_DNAN
-rrd_strerror
-rrd_strversion
-rrd_tell
-rrd_test_error
-rrd_tune
-rrd_update
-rrd_update_r
-rrd_update_v
-rrd_version
-rrd_write
-rrd_xport
-rrdc_connect
-rrdc_is_connected
-rrdc_disconnect
-rrdc_flush
-rrdc_stats_free
-rrdc_stats_get
-rrdc_update
-@RRD_GETOPT_LONG@

diff --git a/src/librrd.sym.in.in b/src/librrd.sym.in.in
new file mode 100644 (file)
index 0000000..6775a80
--- /dev/null
+++ b/src/librrd.sym.in.in
@@ -0,0 +1,61 @@
+rrd_clear_error
+rrd_close
+rrd_cmd_flush
+rrd_create
+rrd_create_r
+rrd_dontneed
+rrd_dump
+rrd_dump_r
+rrd_fetch
+rrd_fetch_r
+rrd_first
+rrd_first_r
+rrd_flush
+rrd_free
+rrd_free_context
+rrd_freemem
+rrd_get_context
+rrd_get_error
+rrd_graph
+rrd_graph_v
+rrd_info
+rrd_info_free
+rrd_info_print
+rrd_info_push
+rrd_info_r
+rrd_init
+rrd_last
+rrd_last_r
+rrd_lastupdate
+rrd_lastupdate_r
+rrd_lock
+rrd_new_context
+rrd_open
+rrd_parsetime
+rrd_proc_start_end
+rrd_read
+rrd_resize
+rrd_restore
+rrd_seek
+rrd_set_error
+rrd_set_to_DINF
+rrd_set_to_DNAN
+rrd_strerror
+rrd_strversion
+rrd_tell
+rrd_test_error
+rrd_tune
+rrd_update
+rrd_update_r
+rrd_update_v
+rrd_version
+rrd_write
+rrd_xport
+rrdc_connect
+rrdc_is_connected
+rrdc_disconnect
+rrdc_flush
+rrdc_stats_free
+rrdc_stats_get
+rrdc_update
+@RRD_GETOPT_LONG@