[Fedora-directory-commits] ldapserver configure.ac, 1.10, 1.11 configure, 1.11, 1.12 config.h.in, 1.1, 1.2
Author: nhosoi
Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29357
Modified Files: configure.ac configure config.h.in Log Message: Resolves: #215452 Summary: Replacing -D<DEFINE> with AC_DEFINE to reduce the compile command line length
Index: configure.ac =================================================================== RCS file: /cvs/dirsec/ldapserver/configure.ac,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- configure.ac 13 Nov 2006 23:45:42 -0000 1.10 +++ configure.ac 15 Nov 2006 02:07:27 -0000 1.11 @@ -47,29 +47,6 @@ AC_FUNC_VPRINTF AC_CHECK_FUNCS([setrlimit endpwent ftruncate getcwd gethostbyname inet_ntoa localtime_r memmove memset mkdir munmap putenv rmdir socket strcasecmp strchr strcspn strdup strerror strncasecmp strpbrk strrchr strstr strtol tzset])
-# Deal with platform dependent defines -case $host in - *-*-linux*) - platform_defs="-DXP_UNIX -DLinux -DLINUX -DLINUX2_0 -DLINUX2_2 -DLINUX2_4" - platform="linux" - ;; - ia64-hp-hpux*) - platform_defs="-DXP_UNIX -Dhpux -DHPUX -DHPUX11 -DHPUX11_11 -DCPU_ia64 -DOS_hpux -D_PR_NTHREAD" - platform="hpux" - ;; - hppa*-hp-hpux*) - platform_defs="-DXP_UNIX -Dhpux -DHPUX -DHPUX11 -DHPUX11_11 -DCPU_hppa -DOS_hpux -D_PR_NTHREAD" - platform="hpux" - ;; - sparc-sun-solaris*) - platform_defs="-DXP_UNIX -DSVR4 -D__svr4 -D__svr4__ -D_SVID_GETTOD -DSOLARIS -DCPU_sparc -DOS_solaris -Dsunos5 -DOSVERSION=509 -D_REENTRANT" - platform="solaris" - ;; - *) - platform_defs="" - platform="" - ;; -esac AC_SUBST([platform_defs]) AM_CONDITIONAL(SOLARIS,test $platform = solaris)
@@ -159,6 +136,56 @@ # cygnus, mingw, or the like and using cmd.exe as the shell AM_CONDITIONAL([WINNT], false)
+# Deal with platform dependent defines +case $host in + *-*-linux*) + AC_DEFINE([XP_UNIX], [1], [UNIX]) + AC_DEFINE([Linux], [1], [Linux]) + AC_DEFINE([LINUX], [1], [Linux]) + AC_DEFINE([LINUX2_0], [1], [Linux 2.0]) + AC_DEFINE([LINUX2_2], [1], [Linux 2.2]) + AC_DEFINE([LINUX2_4], [1], [Linux 2.4]) + platform="linux" + ;; + ia64-hp-hpux*) + AC_DEFINE([XP_UNIX], [1], [UNIX]) + AC_DEFINE([hpux], [1], [HP-UX]) + AC_DEFINE([HPUX], [1], [HP-UX]) + AC_DEFINE([HPUX11], [1], [HP-UX 11]) + AC_DEFINE([HPUX11_23], [1], [HP-UX 11.23]) + AC_DEFINE([CPU_ia64], [], [cpu type ia64]) + AC_DEFINE([OS_hpux], [1], [OS HP-UX]) + platform="hpux" + ;; + hppa*-hp-hpux*) + AC_DEFINE([XP_UNIX], [1], [UNIX]) + AC_DEFINE([hpux], [1], [HP-UX]) + AC_DEFINE([HPUX], [1], [HP-UX]) + AC_DEFINE([HPUX11], [1], [HP-UX 11]) + AC_DEFINE([HPUX11_11], [1], [HP-UX 11.11]) + AC_DEFINE([CPU_hppa], [], [cpu type pa-risc]) + AC_DEFINE([OS_hpux], [1], [OS HP-UX]) + platform="hpux" + ;; + sparc-sun-solaris*) + AC_DEFINE([XP_UNIX], [1], [UNIX]) + AC_DEFINE([SVR4], [1], [SVR4]) + AC_DEFINE([__svr4], [1], [SVR4]) + AC_DEFINE([__svr4__], [1], [SVR4]) + AC_DEFINE([_SVID_GETTOD], [1], [SVID_GETTOD]) + AC_DEFINE([SOLARIS], [1], [SOLARIS]) + AC_DEFINE([CPU_sparc], [], [cpu type sparc]) + AC_DEFINE([OS_solaris], [1], [OS SOLARIS]) + AC_DEFINE([sunos5], [1], [SunOS5]) + AC_DEFINE([OSVERSION], [509], [OS version]) + AC_DEFINE([_REENTRANT], [1], [_REENTRANT]) + platform="solaris" + ;; + *) + platform_defs="" + platform="" + ;; +esac AC_DEFINE([LDAP_DEBUG], [1], [LDAP debug flag]) AC_DEFINE([LDAP_DONT_USE_SMARTHEAP], [1], [Don't use smartheap])
Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- configure 13 Nov 2006 23:45:42 -0000 1.11 +++ configure 15 Nov 2006 02:07:27 -0000 1.12 @@ -23375,29 +23375,6 @@ done
-# Deal with platform dependent defines -case $host in - *-*-linux*) - platform_defs="-DXP_UNIX -DLinux -DLINUX -DLINUX2_0 -DLINUX2_2 -DLINUX2_4" - platform="linux" - ;; - ia64-hp-hpux*) - platform_defs="-DXP_UNIX -Dhpux -DHPUX -DHPUX11 -DHPUX11_11 -DCPU_ia64 -DOS_hpux -D_PR_NTHREAD" - platform="hpux" - ;; - hppa*-hp-hpux*) - platform_defs="-DXP_UNIX -Dhpux -DHPUX -DHPUX11 -DHPUX11_11 -DCPU_hppa -DOS_hpux -D_PR_NTHREAD" - platform="hpux" - ;; - sparc-sun-solaris*) - platform_defs="-DXP_UNIX -DSVR4 -D__svr4 -D__svr4__ -D_SVID_GETTOD -DSOLARIS -DCPU_sparc -DOS_solaris -Dsunos5 -DOSVERSION=509 -D_REENTRANT" - platform="solaris" - ;; - *) - platform_defs="" - platform="" - ;; -esac
@@ -25069,6 +25046,180 @@ fi
+# Deal with platform dependent defines +case $host in + *-*-linux*) + +cat >>confdefs.h <<_ACEOF +#define XP_UNIX 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define Linux 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define LINUX 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define LINUX2_0 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define LINUX2_2 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define LINUX2_4 1 +_ACEOF + + platform="linux" + ;; + ia64-hp-hpux*) + +cat >>confdefs.h <<_ACEOF +#define XP_UNIX 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define hpux 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define HPUX 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define HPUX11 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define HPUX11_23 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define CPU_ia64 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define OS_hpux 1 +_ACEOF + + platform="hpux" + ;; + hppa*-hp-hpux*) + +cat >>confdefs.h <<_ACEOF +#define XP_UNIX 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define hpux 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define HPUX 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define HPUX11 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define HPUX11_11 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define CPU_hppa +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define OS_hpux 1 +_ACEOF + + platform="hpux" + ;; + sparc-sun-solaris*) + +cat >>confdefs.h <<_ACEOF +#define XP_UNIX 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define SVR4 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define __svr4 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define __svr4__ 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define _SVID_GETTOD 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define SOLARIS 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define CPU_sparc +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define OS_solaris 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define sunos5 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define OSVERSION 509 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define _REENTRANT 1 +_ACEOF + + platform="solaris" + ;; + *) + platform_defs="" + platform="" + ;; +esac
cat >>confdefs.h <<_ACEOF #define LDAP_DEBUG 1
Index: config.h.in =================================================================== RCS file: /cvs/dirsec/ldapserver/config.h.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config.h.in 14 Nov 2006 21:23:45 -0000 1.1 +++ config.h.in 15 Nov 2006 02:07:27 -0000 1.2 @@ -3,6 +3,15 @@ /* Define to 1 if the `closedir' function returns void instead of `int'. */ #undef CLOSEDIR_VOID
+/* cpu type pa-risc */ +#undef CPU_hppa + +/* cpu type ia64 */ +#undef CPU_ia64 + +/* cpu type sparc */ +#undef CPU_sparc + /* Define to 1 if you have the <arpa/inet.h> header file. */ #undef HAVE_ARPA_INET_H
@@ -208,6 +217,18 @@ /* Define to 1 if the system has the type `_Bool'. */ #undef HAVE__BOOL
+/* HP-UX */ +#undef HPUX + +/* HP-UX 11 */ +#undef HPUX11 + +/* HP-UX 11.11 */ +#undef HPUX11_11 + +/* HP-UX 11.23 */ +#undef HPUX11_23 + /* Use FHS layout */ #undef IS_FHS
@@ -217,13 +238,37 @@ /* Don't use smartheap */ #undef LDAP_DONT_USE_SMARTHEAP
+/* Linux */ +#undef LINUX + +/* Linux 2.0 */ +#undef LINUX2_0 + +/* Linux 2.2 */ +#undef LINUX2_2 + +/* Linux 2.4 */ +#undef LINUX2_4 + /* Define to 1 if `lstat' dereferences a symlink specified with a trailing slash. */ #undef LSTAT_FOLLOWS_SLASHED_SYMLINK
+/* Linux */ +#undef Linux + /* Define to 1 if your C compiler doesn't accept -c and -o together. */ #undef NO_MINUS_C_MINUS_O
+/* OS version */ +#undef OSVERSION + +/* OS HP-UX */ +#undef OS_hpux + +/* OS SOLARIS */ +#undef OS_solaris + /* Name of package */ #undef PACKAGE
@@ -245,6 +290,9 @@ /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE
+/* SOLARIS */ +#undef SOLARIS + /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ #undef STAT_MACROS_BROKEN
@@ -254,6 +302,9 @@ /* Define to 1 if strerror_r returns char *. */ #undef STRERROR_R_CHAR_P
+/* SVR4 */ +#undef SVR4 + /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ #undef TIME_WITH_SYS_TIME
@@ -263,12 +314,30 @@ /* Version number of package */ #undef VERSION
+/* UNIX */ +#undef XP_UNIX + +/* _REENTRANT */ +#undef _REENTRANT + +/* SVID_GETTOD */ +#undef _SVID_GETTOD + +/* SVR4 */ +#undef __svr4 + +/* SVR4 */ +#undef __svr4__ + /* Define to empty if `const' does not conform to ANSI C. */ #undef const
/* Define to `int' if <sys/types.h> doesn't define. */ #undef gid_t
+/* HP-UX */ +#undef hpux + /* Define to rpl_malloc if the replacement function should be used. */ #undef malloc
@@ -278,6 +347,9 @@ /* Define to `unsigned' if <sys/types.h> does not define. */ #undef size_t
+/* SunOS5 */ +#undef sunos5 + /* Define to `int' if <sys/types.h> doesn't define. */ #undef uid_t
389-commits@lists.fedoraproject.org
-
Doctor Conrad