Author: sahan
Date: Tue Jun 5 02:49:35 2007
New Revision: 544434
URL: http://svn.apache.org/viewvc?view=rev&rev=544434
Log:
Changes to work on Mac OS X
Modified:
webservices/rampart/trunk/c/autogen.sh
webservices/rampart/trunk/c/configure.ac
webservices/rampart/trunk/c/include/rampart_authn_provider.h
webservices/rampart/trunk/c/include/rampart_credentials.h
webservices/rampart/trunk/c/samples/autogen.sh
webservices/rampart/trunk/c/samples/configure.ac
Modified: webservices/rampart/trunk/c/autogen.sh
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/autogen.sh?view=diff&rev=544434&r1=544433&r2=544434
==============================================================================
--- webservices/rampart/trunk/c/autogen.sh (original)
+++ webservices/rampart/trunk/c/autogen.sh Tue Jun 5 02:49:35 2007
@@ -1,12 +1,20 @@
#!/bin/bash
-
echo -n 'Running libtoolize...'
-if libtoolize --force > /dev/null 2>&1; then
- echo 'done.'
+if [ `uname -s` = Darwin ]
+then
+ LIBTOOLIZE=glibtoolize
+else
+ LIBTOOLIZE=libtoolize
+fi
+
+if $LIBTOOLIZE --force > /dev/null 2>&1; then
+
+ echo 'done.'
else
- echo 'failed.'
- exit 1
+ echo 'failed.'
+ exit 1
fi
+
echo -n 'Running aclocal...'
if aclocal > /dev/null 2>&1; then
Modified: webservices/rampart/trunk/c/configure.ac
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/configure.ac?view=diff&rev=544434&r1=544433&r2=544434
==============================================================================
--- webservices/rampart/trunk/c/configure.ac (original)
+++ webservices/rampart/trunk/c/configure.ac Tue Jun 5 02:49:35 2007
@@ -5,7 +5,9 @@
AC_INIT(rampartc-src, 0.90)
AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([tar-ustar])
+dnl AM_INIT_AUTOMAKE([tar-ustar])
+AM_INIT_AUTOMAKE
+m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
AC_PREFIX_DEFAULT(/usr/local/rampartc)
dnl Checks for programs.
@@ -58,7 +60,7 @@
AC_CHECK_HEADERS([stdio.h stdlib.h string.h])
dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
+dnl AC_C_CONST
dnl Checks for library functions.
AC_FUNC_MALLOC
Modified: webservices/rampart/trunk/c/include/rampart_authn_provider.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_authn_provider.h?view=diff&rev=544434&r1=544433&r2=544434
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_authn_provider.h (original)
+++ webservices/rampart/trunk/c/include/rampart_authn_provider.h Tue Jun 5
02:49:35 2007
@@ -40,7 +40,7 @@
RAMPART_AUTHN_PROVIDER_USER_FOUND,
RAMPART_AUTHN_PROVIDER_USER_NOT_FOUND,
RAMPART_AUTHN_PROVIDER_GENERAL_ERROR
- } rampart_authn_provider_status;
+ };
typedef enum rampart_authn_provider_status rampart_authn_provider_status_t;
Modified: webservices/rampart/trunk/c/include/rampart_credentials.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_credentials.h?view=diff&rev=544434&r1=544433&r2=544434
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_credentials.h (original)
+++ webservices/rampart/trunk/c/include/rampart_credentials.h Tue Jun 5
02:49:35 2007
@@ -39,7 +39,7 @@
RAMPART_CREDENTIALS_USER_FOUND,
RAMPART_CREDENTIALS_USER_NOT_FOUND,
RAMPART_CREDENTIALS_GENERAL_ERROR
- } rampart_credentials_status;
+ };
typedef enum rampart_credentials_status rampart_credentials_status_t;
Modified: webservices/rampart/trunk/c/samples/autogen.sh
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/autogen.sh?view=diff&rev=544434&r1=544433&r2=544434
==============================================================================
--- webservices/rampart/trunk/c/samples/autogen.sh (original)
+++ webservices/rampart/trunk/c/samples/autogen.sh Tue Jun 5 02:49:35 2007
@@ -1,12 +1,20 @@
#!/bin/bash
-
echo -n 'Running libtoolize...'
-if libtoolize --force > /dev/null 2>&1; then
- echo 'done.'
+if [ `uname -s` = Darwin ]
+then
+ LIBTOOLIZE=glibtoolize
+else
+ LIBTOOLIZE=libtoolize
+fi
+
+if $LIBTOOLIZE --force > /dev/null 2>&1; then
+
+ echo 'done.'
else
- echo 'failed.'
- exit 1
+ echo 'failed.'
+ exit 1
fi
+
echo -n 'Running aclocal...'
if aclocal > /dev/null 2>&1; then
Modified: webservices/rampart/trunk/c/samples/configure.ac
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/configure.ac?view=diff&rev=544434&r1=544433&r2=544434
==============================================================================
--- webservices/rampart/trunk/c/samples/configure.ac (original)
+++ webservices/rampart/trunk/c/samples/configure.ac Tue Jun 5 02:49:35 2007
@@ -5,7 +5,9 @@
AC_INIT(rampart-samples-src, 0.90)
AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([tar-ustar])
+dnl AM_INIT_AUTOMAKE([tar-ustar])
+AM_INIT_AUTOMAKE
+m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
AC_PREFIX_DEFAULT(/usr/local/rampart/samples)
dnl Checks for programs.
@@ -57,7 +59,7 @@
AC_CHECK_HEADERS([stdio.h stdlib.h string.h])
dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
+dnl AC_C_CONST
dnl Checks for library functions.
AC_FUNC_MALLOC
